Changeset 2331

Timestamp:

8 Oct 2007, 16:28:55 (17 years ago)

Author:

joachim

Message:

fix reimporting of catalogs

File:

• WAeUP_SRP/base/PatchCatalogToolXMLAdapter.py (modified) (2 diffs)

WAeUP_SRP/base/PatchCatalogToolXMLAdapter.py

@@ -19 +19 @@
         self._purgeColumns()
     columns = []
-    for col in self._extractColumns()._get_childNodes():
-        columns.append(col.attributes.items()[0][1])
+    # for col in self._extractColumns()._get_childNodes():
+    #     columns.append(col.attributes.items()[0][1])
+    for col in self.context.schema():
+        columns.append(col)
     inds = {}
-    for ind in self._extractIndexes()._get_childNodes():
-        inds[ind.attributes.items()[1][1]] = ind.attributes.items()[0][1]
+    # for ind in self._extractIndexes()._get_childNodes():
+    #     inds[ind.attributes.items()[1][1]] = ind.attributes.items()[0][1]
+    for ind in self.context.getIndexObjects():
+        inds[ind.getId()] = ind.meta_type
     if meta_type in ('CMF Catalog',"WAeUP Table"):
+        self._logger.info("Working on %s"  % na[1][1])
         for ch in node._get_childNodes():
             if ch.nodeName in ('index',):
@@ -44 +49 @@
                 continue
     if something_changed :
+        #import pdb;pdb.set_trace()
         self._logger.info("Catalog tool %s cleared."  % na[1][1])
         self._logger.info("%s modified." % na[1][1])
         self._initProperties(node)
-        self._initObjects(node)
         if new_indexes and len(self.context()) == 0: #disable creation of new indexes if records in the table
+            self._initObjects(node)
             self._initIndexes(node)
         self._initColumns(node)