Switch to unified view

a/src/mediaserver/cdplugins/uprcl/uprcl-app.py b/src/mediaserver/cdplugins/uprcl/uprcl-app.py
...
...
21
import json
21
import json
22
import posixpath
22
import posixpath
23
import re
23
import re
24
import conftree
24
import conftree
25
import cmdtalkplugin
25
import cmdtalkplugin
26
import urllib
26
27
27
import uprclfolders
28
import uprclfolders
28
import uprclsearch
29
import uprclsearch
29
from uprclutils import *
30
from uprclutils import *
30
31
...
...
74
@dispatcher.record('trackuri')
75
@dispatcher.record('trackuri')
75
def trackuri(a):
76
def trackuri(a):
76
    msgproc.log("trackuri: [%s]" % a)
77
    msgproc.log("trackuri: [%s]" % a)
77
    if 'path' not in a:
78
    if 'path' not in a:
78
        raise Exception("trackuri: no 'path' in args")
79
        raise Exception("trackuri: no 'path' in args")
79
    path = a['path']
80
    path = urllib.quote(a['path'])
80
    media_url = rclpathtoreal(path, pathprefix, uprclhost, pathmap)
81
    media_url = rclpathtoreal(path, pathprefix, uprclhost, pathmap)
81
    msgproc.log("trackuri: returning: %s" % media_url)
82
    msgproc.log("trackuri: returning: %s" % media_url)
82
    return {'media_url' : media_url}
83
    return {'media_url' : media_url}
83
84
84
85
...
...
129
    if re.match('0\$uprcl\$', objid) is None:
130
    if re.match('0\$uprcl\$', objid) is None:
130
        raise Exception("bad objid [%s]" % objid)
131
        raise Exception("bad objid [%s]" % objid)
131
132
132
    upnps = a['origsearch']
133
    upnps = a['origsearch']
133
134
134
    entries = uprclsearch.search(rclconfdir, objid, upnps, g_myprefix, httphp, pathprefix)
135
    entries = uprclsearch.search(rclconfdir, objid, upnps, g_myprefix,
136
                                 httphp, pathprefix)
135
    
137
    
136
    encoded = json.dumps(entries)
138
    encoded = json.dumps(entries)
137
    return {"entries" : encoded}
139
    return {"entries" : encoded}
138
140
139
uprcl_init()
141
uprcl_init()