--- MPIWGWeb/Attic/MPIWGRoot.py	2008/09/12 15:10:49	1.1.2.19
+++ MPIWGWeb/Attic/MPIWGRoot.py	2010/02/15 19:04:24	1.1.2.26
@@ -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,15 +386,22 @@ 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]
 
 
+    def getMPIWGRoot(self):
+        """returns the MPIWG root"""
+        return self
+
     def MPIWGrootURL(self):
         """returns the URL to the root"""
         return self.absolute_url()
@@ -596,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:
@@ -626,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
 
     
@@ -769,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
@@ -920,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 (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2])
+            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 (reindexCatalog: fulltextProjectsMembers)",logging.WARNING," %s %s"%sys.exc_info()[:2])
             
         
     
@@ -941,7 +966,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                     
         results=self.MembersCatalog({'isPublished':True})
        
-        ret=[(", ".join([proj.lastName, proj.firstName]).decode('utf-8'),proj.getKey) for proj in results]
+        ret=[(unicodify(", ".join([proj.lastName, proj.firstName])), proj.getKey) for proj in results]
         
         ret.sort(sorter)
         return ret
@@ -1094,7 +1119,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                 else:
                     fields[nr][3].setActiveFlag(False)
                     
-                #nummer hat sich geŠndert
+                #nummer hat sich geaendert
                 
                 entryChanged = False;
                 
@@ -1474,4 +1499,4 @@ def manage_addMPIWGRoot(self,id,title,co
     setattr(ob,'connection_id',connection_id)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
-        
\ No newline at end of file
+