--- MPIWGWeb/Attic/MPIWGRoot.py	2008/09/08 08:40:05	1.1.2.18
+++ MPIWGWeb/Attic/MPIWGRoot.py	2010/02/10 18:25:45	1.1.2.25
@@ -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
@@ -343,36 +345,20 @@ class MPIWGRoot(ZSQLExtendFolder):
         return subret
     
     def subNav(self,obj):
-        """return subnav elemente"""
-        #if obj.meta_type in ['MPIWGTemplate','MPIWGLink']:
-        #    id=obj.aq_parent.getId()
-        #else:
-
-        #id=obj.getId()
-
-        
-        #suche die zweite ebene
-        
-        if not obj.aq_parent.getId() in ['de','en']:
-            obj=obj.aq_parent
-        
-        while not self.ZopeFind(self,obj_ids=[obj.getId()]):
-            obj=obj.aq_parent
-        
-      
-        if hasattr(self,obj.getId()):
-            
-            subs=self.ZopeFind(getattr(self,obj.getId()),obj_metatypes=self.nav_meta_types)
-            subret=[]
-
-            for x in subs:
-                if not(x[1].title==""):
-                    subret.append(x)
-            subret.sort(sortWeight)
-            return subret
-        else:
-            return None
-
+        """return sub-navigation elements i.e. below sections"""
+        # get section -> parent should be MPIWGRoot
+        p = obj
+        sec = None
+        # descend parents to the root (and remember the last id)
+        while p is not None and p.meta_type != 'MPIWGRoot':
+            sec = p
+            p = p.aq_parent
+    
+        subsecs = sec.objectItems(self.nav_meta_types)
+        subsecs = [s for s in subsecs if s[1].title != ""]
+        subsecs.sort(sortWeight)
+        return subsecs
+                
     def isType(self,object,meta_type):
         """teste ob ein object vom meta_type ist."""
         return (object.meta_type==meta_type)
@@ -400,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()
@@ -612,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:
@@ -642,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
 
     
@@ -785,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
@@ -936,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 (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2])
+            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 (reindexCatalog: fulltextProjectsMembers)",logging.WARNING," %s %s"%sys.exc_info()[:2])
             
         
     
@@ -957,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
@@ -1490,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
+