Changeset 2266 for WAeUP_SRP

Timestamp:

21 Sep 2007, 19:02:23 (17 years ago)

Author:

Henrik Bettermann

Message:

catalog_objects ignored immediate_indexes - fixed

File:

• WAeUP_SRP/base/PatchQueueCatalogProcessQueue.py (modified) (6 diffs)

WAeUP_SRP/base/PatchQueueCatalogProcessQueue.py

@@ -11 +11 @@
 from Products.QueueCatalog.CatalogEventQueue import SAFE_POLICY, ALTERNATIVE_POLICY
 from Products.QueueCatalog.QueueCatalog import cataloged
-from Products.QueueCatalog.QueueCatalog import QueueCatalog 
+from Products.QueueCatalog.QueueCatalog import QueueCatalog
 from ZODB.POSException import ConflictError
 from ZEO.Exceptions import ClientDisconnected
@@ -17 +17 @@
 security = ClassSecurityInformation()
 
-def __init__(self, 
-             buckets=1009, 
+def __init__(self,
+             buckets=1009,
              conflict_policy=SAFE_POLICY,
              bypass = False,
@@ -44 +44 @@
     # update metadata during queue processing, rather than immediately
 
-    # similarly, limiting the idxs only limits the immediate indexes.  If 
+    # similarly, limiting the idxs only limits the immediate indexes.  If
     # any work needs to be done in the queue processing, it will all be
-    # done: we have not implemented partial indexing during queue 
-    # processing.  The only way to avoid any of it is to avoid all of it 
-    # (i.e., update metadata immediately and don't have any indexes to 
+    # done: we have not implemented partial indexing during queue
+    # processing.  The only way to avoid any of it is to avoid all of it
+    # (i.e., update metadata immediately and don't have any indexes to
     # update on the queued side).
 
@@ -76 +76 @@
     # (non-undo) conflicts of add events. This will slow things
     # down a bit, but adds should be relatively infrequent.
-    bypass_queue = self.getBypassQueue()    
+    bypass_queue = self.getBypassQueue()
     # Now, try to decide if the catalog has the uid (path).
     already_cataloged = cataloged(catalog, uid)
@@ -85 +85 @@
             self._queues[hash(uid) % self._buckets].getEvent(uid) in
             ADDED_EVENTS)
+            
     if idxs and already_cataloged:
         # if not already_cataloged, we index the whole thing
@@ -99 +100 @@
             self._update(uid, already_cataloged and CHANGED or ADDED)
         # Update some of the indexes immediately.
-    elif immediate_indexes:
+    if immediate_indexes:
         # Update some of the indexes immediately.
         catalog.catalog_object(