Changeset 1935

Timestamp:

19 Jun 2007, 08:53:23 (17 years ago)

Author:

joachim

Message:

avoid clearing of portal_catalog_real

Location:

WAeUP_SRP/trunk

Files:

• PatchCatalogToolXMLAdapter.py (modified) (5 diffs)
• WAeUPTables.py (modified) (2 diffs)
• exportimport.py (modified) (1 diff)
• profiles/default/toolset.xml (modified) (1 diff)

WAeUP_SRP/trunk/PatchCatalogToolXMLAdapter.py

@@ -7 +7 @@
     """Import the object from the DOM node.
     """
-    #import pdb;pdb.set_trace()
+    na = node.attributes.items()
+    not_found = False
+    new_indexes = []
+    new_columns = []
+    meta_type = na[0][1]
+    name = na[1][1]
+    print name,meta_type,len(self.context())        
     if self.environ.shouldPurge():
+        #import pdb;pdb.set_trace()
         self._purgeProperties()
         self._purgeObjects()
@@ -21 +28 @@
         inds[ind.attributes.items()[1][1]] = ind.attributes.items()[0][1]
         #print ind.attributes.items()
-    #from pdb import set_trace; set_trace()
-    na = node.attributes.items()
-    not_found = True
-    new_indexes = []
-    new_columns = []
-    if na[0][1] in ("CMF Catalog","WAeUP Table"):
-        #print na[1][1]
-        not_found = False
+    if meta_type in ("WAeUP Table") and name != "portal_catalog_real":
         for ch in node._get_childNodes():
             if ch.nodeName in ('index',):
@@ -37 +37 @@
                     continue
                 new_indexes.append(iname)
+                not_found = True
             elif ch.nodeName in ('column',):
                 cha = ch.attributes.items()
@@ -43 +44 @@
                     continue
                 new_columns.append(iname)
+                not_found = True
             else:
                 continue
-            not_found = True
-    if not_found:
+    if not_found :
+        self._logger.info("Catalog tool %s cleared."  % na[1][1])
         self._logger.info("%s modified." % na[1][1])
         self._initProperties(node)
@@ -55 +57 @@
         #self._refreshCatalog()
 
-    self._logger.info("Catalog tool %s imported."  % na[1][1])
+    self._logger.info("Catalog tooool %s imported."  % na[1][1])
     
 from Products.CPSCore.exportimport.catalog import CatalogToolXMLAdapter

WAeUP_SRP/trunk/WAeUPTables.py

@@ -46 +46 @@
     return ob
 
-class RealCatalogTool(CatalogTool):
-    meta_type = 'Catalog Tool Real'
-    name = id = "portal_catalog_real"
-
-
 class WAeUPTable(ZCatalog): ###(
 
@@ -146 +141 @@
         current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
         open("%s/import/%s-%s.csv" % (i_home,self.getId(),current),"w+").write('\n'.join(csv))
-
-###)
+    ###)
 
 class AccommodationTable(WAeUPTable): ###(

WAeUP_SRP/trunk/exportimport.py

@@ -125 +125 @@
     importWAeUPTable(site.returning_import, '', context,'returning_import')
     importWAeUPTable(site.results_import, '', context,'results_import')
-    importWAeUPTable(site.students_catalog, '', context,'students_catalog')
+    importWAeUPTable(site.portal_catalog_real, '', context,'portal_catalog_real')
 
 from Products.CPSCore.exportimport.catalog import CatalogToolXMLAdapter

WAeUP_SRP/trunk/profiles/default/toolset.xml

@@ -2 +2 @@
 <tool-setup>
  <required tool_id="portal_catalog_real"
-           class="Products.WAeUP_SRP.WAeUPTables.RealCatalogTool"/>
+           class="Products.CMFCore.CatalogTool.CatalogTool"/>
  <required tool_id="portal_accommodation"
            class="Products.WAeUP_SRP.WAeUPTables.AccommodationTable"/>