Changeset 2615

Timestamp:

09/28/08 23:41:03 (3 years ago)

Author:

jukka

Message:

Trying to fix #1816. See if updating reference catalogs helps.

Files:

• trunk/Extensions/Install.py (modified) (3 diffs)
• trunk/Resources.py (modified) (1 diff)
• trunk/version.txt (modified) (1 diff)

trunk/Extensions/Install.py

@@ -311 +311 @@
-                if o:
-                    o.reindexObject()
+                    o.reindexSecondaryCatalogs()
-                    u+=1
+                    print >>out, 'u',
-                    print 'u',
-                else:
-                    #u+=1 # force transaction commits even if nothing is done, flushes latest objects from memory
+                    print >>out, '.',
-                    print '.',
-            if u==200:
@@ -330 +333 @@
-    print '**** Commiting transaction & finishing, c=%s ****' % str(c) 
-    transaction.get().commit()
+
+
+
-
-
@@ -1027 +1033 @@
-    #updateArchetypes(self, ['Piece'], start=5000, end=9000, out=out)
-    #reindexObjects(self, ['MultimediaMaterial'], start=0, end=3000, out=out)
-
+
+
+
+
-
-

trunk/Resources.py

@@ -251 +251 @@
-        self.initializeLayers(item, container)        
-
+
+    security.declareProtected(MODIFY_CONTENT, 'reindexSecondaryCatalogs')
+    def reindexSecondaryCatalogs(self):
+        """ Update reference catalog and uid catalog """
+        # method to catalog all references recursively
+        item=self
+        def catalogRefs(item, uc, rc):
+            if hasattr(item, '_getReferenceAnnotations'):
+                annotations = item._getReferenceAnnotations()
+            else:
+                return
+            if annotations:
+                for ref in annotations.objectValues():
+                    url = str(getRelURL(uc, ref.getPhysicalPath()))
+                    ZCatalog.catalog_object(uc, ref, url)
+                    ZCatalog.catalog_object(rc, ref, url)
+                    catalogRefs(ref, uc, rc)
+
+        # from Referenceable manage_afterAdd:
+        # these add indexes to uid_catalog and reference_catalog
+        rc = getToolByName(self, 'reference_catalog')
+        uc = getToolByName(self, 'uid_catalog')
+        self._register(reference_manager=rc)
+        # path needs to be fixed to str, sometimes it is unicode and this results a CatalogError
+        url = str(getRelURL(self, item.getPhysicalPath())) 
+        ZCatalog.catalog_object(uc, item, url)
+        ZCatalog.catalog_object(rc, item, url)
+        catalogRefs(item, uc, rc)
+    
-
-

trunk/version.txt

@@ -1 @@
-
+.1
-