Changeset 3625

Timestamp:

17/10/08 18:06:52 (3 months ago)

Author:

dmeyer

Message:

fix directory query for non monitored directories

Location:

trunk/beacon

Files:

• bin/beacon-search (modified) (1 diff)
• src/db.py (modified) (2 diffs)

trunk/beacon/bin/beacon-search

@@ -265 +265 @@
     t1 = time.time()
     if 'dirname' in query:
-        async = kaa.beacon.get(query['dirname'])
-        if isinstance(async, kaa.InProgress):
-            yield async
-            directory = async.get_result()
+        directory = yield kaa.beacon.get(query['dirname'])
         if 'recursive' in query:
             result = yield directory.list(recursive=True)

trunk/beacon/src/db.py

@@ -202 +202 @@
         if 'id' in query and qlen == 1:
             return kaa.InProgress().execute(self._db_query_id, query['id'])
+        if 'recursive' in query and not query.get('recursive'):
+            del query['recursive']
+            qlen -= 1
         if 'parent' in query and 'recursive' in query and qlen == 2:
             if not query['parent']._beacon_isdir:
@@ -366 +369 @@
         while directories:
             parent = directories.pop(0)
-            if not parent._beacon_id:
-                continue
-            for i in self._db.query(parent = parent._beacon_id):
+            for i in (yield self._db_query_dir(parent)):
                 if i['type'] == 'dir':
                     child = create_directory(i, parent)