Commit 3eaaf456 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

ckpt

parent bb9259eb
......@@ -40,6 +40,7 @@ def _rcl2folders(docs, confdir):
rclconf = rclconfig.RclConfig(confdir)
topdirs = [os.path.expanduser(d) for d in
shlex.split(rclconf.getConfParam('topdirs'))]
topdirs = [d.rstrip('/') for d in topdirs]
dirvec.append({})
dirvec[0][".."] = (0, -1)
......
......@@ -99,6 +99,7 @@ def upnpsearchtorecoll(s):
i,c = _getchar(s, i)
if not c:
break
#uplog("upnpsearchtorecoll: nextchar: <%s>" % c)
if c.isspace():
continue
......@@ -125,8 +126,8 @@ def upnpsearchtorecoll(s):
else:
i -= 1
i,w = _readword(s, i)
#uplog("_readword returned <%s>" % w)
#print("Got word [%s]" % w)
if w == 'contains':
out.append(':')
oper = ':'
......@@ -158,7 +159,10 @@ def upnpsearchtorecoll(s):
# use parentheses
out.append('OR')
else:
field = upnp2rclfields[w]
try:
field = upnp2rclfields[w]
except:
field = w
out.append(field)
oper = ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment