put back previous version

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6082 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/ERP5Site.py

@@ -755,9 +755,8 @@ class ERP5Generator(PortalGenerator):
         LOG('setupTools, create',0,kw)
         id = str(id)
         portal = self.klass(id=id)
-        # We should make sure that we do not setup uids before
-        # calling catalog_clear
-        setattr(portal,'isIndexable',0)
+        if reindex==0:
+          setattr(portal,'isIndexable',0)
         parent._setObject(id, portal)
         # Return the fully wrapped object.
         p = parent.this()._getOb(id)
@@ -872,8 +871,8 @@ class ERP5Generator(PortalGenerator):
             # FIXME: addDefaultSQLMethods should be removed.
             portal_catalog.addDefaultSQLMethods('erp5_mysql')
 
-        # Clear Catalog   
-        portal_catalog.manage_catalogClear()
+            # Clear Catalog
+            portal_catalog.manage_catalogClear()
 
         # Add ERP5Form Tools
         addTool = p.manage_addProduct['ERP5Form'].manage_addTool
@@ -964,13 +963,13 @@ class ERP5Generator(PortalGenerator):
 
     def setupIndex(self, p, **kw):
         # Make sure all tools and folders have been indexed
-        setattr(p,'isIndexable',1)
         if kw.has_key('reindex') and kw['reindex']==0:
           return
         skins_tool = getToolByName(p, 'portal_skins', None)
         if skins_tool is None:
           return
         portal_catalog = p.portal_catalog
+        portal_catalog.manage_catalogClear()
         skins_tool["erp5_core"].ERP5Site_reindexAll()
 
     def setupUserFolder(self, p):