From f53850f9b9d8071258091d66b4c781f2f4399d72 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Oct 2014 17:41:40 +0200
Subject: [PATCH] =?utf8?q?R=C3=A9indexation=20des=20memberdata.=20Refactor?=
 =?utf8?q?ing.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 _zctl/rebuild-catalog.py | 57 ++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/_zctl/rebuild-catalog.py b/_zctl/rebuild-catalog.py
index 29a948b..1436969 100644
--- a/_zctl/rebuild-catalog.py
+++ b/_zctl/rebuild-catalog.py
@@ -6,9 +6,11 @@ from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
 import transaction
 
 count = 0
+errorLog = None
 
 def checkContents(ob) :
     global count
+    global errorLog
     try :
         print ob.absolute_url()
     except Exception, e:
@@ -18,7 +20,8 @@ def checkContents(ob) :
         print >> errorLog
     
     if isinstance(aq_base(ob), CMFCatalogAware) :
-        assert ob._getCatalogTool()
+        ctool = ob._getCatalogTool()
+        assert ctool
         try :
             ctool.indexObject(ob)
             count = count + 1
@@ -35,23 +38,37 @@ def checkContents(ob) :
             checkContents(v)
 
 
-parser = ArgumentParser(description="Rebuild entire catalog by walking contents tree.")
-parser.add_argument('portal_path')
-parser.add_argument('--error-log', help='Error log file. Default: ~/catalog-rebuild-error.log',
-                    default='~/catalog-rebuild-error.log', required=False, dest='errorLogPath')
-
-args = parser.parse_args()
-portal = app.unrestrictedTraverse(args.portal_path)
-setSite(portal)
-ctool = portal.portal_catalog
-errorLogPath = os.path.expanduser(args.errorLogPath)
-errorLog = open(errorLogPath, 'w')
-
-try :
-    checkContents(portal)
-    transaction.commit()
-    print count
-    print 'Done.'
-finally :
-    errorLog.close()
+def indexMemberdata(portal) :
+    mtool = portal.portal_membership
+    ctool = portal.portal_catalog
+    for m in mtool.getOtherMembers([]) :
+        ctool.indexObject(m)
+
+def main(path) :
+    portal = app.unrestrictedTraverse(path)
+    setSite(portal)
+    errorLogPath = os.path.expanduser(args.errorLogPath)
+    global errorLog
+    errorLog = open(errorLogPath, 'w')
+
+    try :
+        checkContents(portal)
+        transaction.commit()
+        indexMemberdata(portal)
+        transaction.commit()
+        print count
+        print 'Done.'
+    finally :
+        errorLog.close()
+    
+
+
+if __name__ == '__main__':
+    parser = ArgumentParser(description="Rebuild entire catalog by walking contents tree.")
+    parser.add_argument('portal_path')
+    parser.add_argument('--error-log', help='Error log file. Default: ~/catalog-rebuild-error.log',
+                        default='~/catalog-rebuild-error.log', required=False, dest='errorLogPath')
+
+    args = parser.parse_args()
+    main(args.portal_path)
     
-- 
2.20.1