fix path-search in nontop volumes

This commit is contained in:
ed 2022-02-12 16:00:14 +01:00
parent 0b1e483c53
commit 686c7defeb

View file

@ -139,7 +139,8 @@ class U2idx(object):
is_date = True is_date = True
elif v == "path": elif v == "path":
v = "up.rd" v = "trim(?||up.rd,'/')"
va.append("\nrd")
elif v == "name": elif v == "name":
v = "up.fn" v = "up.fn"
@ -237,13 +238,13 @@ class U2idx(object):
thr.start() thr.start()
if not uq or not uv: if not uq or not uv:
q = "select * from up" uq = "select * from up"
v = () uv = ()
else: else:
q = "select up.* from up " + uq uq = "select up.* from up " + uq
v = tuple(uv) uv = tuple(uv)
self.log("qs: {!r} {!r}".format(q, v)) self.log("qs: {!r} {!r}".format(uq, uv))
ret = [] ret = []
lim = 1000 lim = 1000
@ -255,9 +256,17 @@ class U2idx(object):
self.active_cur = cur self.active_cur = cur
vuv = []
for v in uv:
if v == "\nrd":
v = vtop + "/"
vuv.append(v)
vuv = tuple(vuv)
sret = [] sret = []
fk = flags.get("fk") fk = flags.get("fk")
c = cur.execute(q, v) c = cur.execute(uq, vuv)
for hit in c: for hit in c:
w, ts, sz, rd, fn, ip, at = hit w, ts, sz, rd, fn, ip, at = hit
lim -= 1 lim -= 1