--- MPIWGWeb/Attic/MPIWGRoot.py	2008/09/12 15:54:49	1.1.2.20
+++ MPIWGWeb/Attic/MPIWGRoot.py	2009/04/29 07:53:35	1.1.2.24
@@ -80,6 +80,8 @@ class MPIWGRoot(ZSQLExtendFolder):
         ret=[] # nimmt das Array auf, dass spaeter zurueckgegeben wird
         ranges=[] #Array mit tupeln x,y wobei x die Position des Anfang und y des Endes der i-ten Umgebung angiebt
         
+        wordStr=wordStr.lstrip().rstrip()
+        
         def isInRanges(nr,length):
             """test ob eine gegeben Position nr schon irgendwo in einer Umgebung ist, gibt den Index des ersten Wertes aus ranges zurueck, 
             -1, wenn kein Treffer
@@ -384,11 +386,14 @@ class MPIWGRoot(ZSQLExtendFolder):
         else:
             return style    
 
-    def getFeatures(self):
-        """returns a list of all Features"""
+    def getFeatures(self, num=None):
+        """returns a list of the last num Features"""
         dir = getattr(self, 'features')
         features = dir.objectItems(['MPIWGFeature'])
         features.sort(sortWeight)
+        if num is not None:
+            # take only the last num elements
+            features = features[-num:]
         # return pure list of objects
         return [f[1] for f in features]
 
@@ -600,7 +605,7 @@ class MPIWGRoot(ZSQLExtendFolder):
     def getContexts(self,childs=None,parents=None,depth=None,date=None,onlyActive=True):
         """childs alle childs, alle parents"""
         ret=[]
-        
+    
         if parents:
             pnums=parents.split(".")
             while len(pnums) > 1:
@@ -630,6 +635,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                             ret.append(project)
         
         #logging.debug("getContexts: childs=%s parents=%s depth=%s => %s"%(childs,parents,depth,repr(ret)))
+     
         return ret
 
     
@@ -773,9 +779,9 @@ class MPIWGRoot(ZSQLExtendFolder):
         
         
         result,msg=MPIWGStaff.createNewDBEntry(self,data['publish_the_data'],data['key'],data['last_name'],
-                                  data['first_name'],data['title'],data['status'],"",
+                                  data['first_name'],data['titles_new'],data['status'],"",
                                   "",data['date_from'],data['date_to'],
-                                  data['department'],data['home_inst'],data['funded_by'],
+                                  data['department'],'',data['funded_by'],
                                   data['e_mail2'],data['current_work'],"yes",data['date_stay_at_mpiwg'],data['group'],"no",data['current_work'])
         
         return result,msg
@@ -924,8 +930,23 @@ class MPIWGRoot(ZSQLExtendFolder):
         try:
             
             self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+            logger("MPIWG Root (reindexCatalog: projects)",logging.INFO,"DONE")
+        except:
+            logger("MPIWG Root (reindexCatalog: projects)",logging.WARNING," %s %s"%sys.exc_info()[:2])
+        
+        try:
+            
+            self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+            logger("MPIWG Root (reindexCatalog: members)",logging.INFO,"DONE")
+        except:
+            logger("MPIWG Root (reindexCatalog: members)",logging.WARNING," %s %s"%sys.exc_info()[:2])
+        
+        try:
+            
+            self.fulltextProjectsMembers.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+            logger("MPIWG Root (reindexCatalog: fulltextProjectsMembers)",logging.INFO,"DONE")
         except:
-            logger("MPIWG Root (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2])
+            logger("MPIWG Root (reindexCatalog: fulltextProjectsMembers)",logging.WARNING," %s %s"%sys.exc_info()[:2])