--- MPIWGWeb/MPIWGProjects.py	2004/10/11 14:49:46	1.35
+++ MPIWGWeb/MPIWGProjects.py	2004/10/19 11:22:09	1.38
@@ -58,6 +58,74 @@ def sortI(x,y):
     except:
         return cmp(x[1],y[1])
 
+class MPIWGTemplate(ZopePageTemplate):
+    """Create a layout Template for different purposes"""
+
+    meta_type="MPIWGTemplate"
+
+    def __init__(self, id, text=None, content_type=None,MPIWGType=None):
+        self.id = str(id)
+
+
+
+        self.ZBindings_edit(self._default_bindings)
+        if text is None:
+            self._default_content_fn = os.path.join(package_home(globals()),
+                                               'zpt/MPIWG_%s_template_standard.zpt'%MPIWGType)
+            text = open(self._default_content_fn).read()
+        self.pt_edit(text, content_type)
+
+    
+        """change form"""
+
+
+def manage_addMPIWGTemplateForm(self):
+    """Form for adding"""
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGTemplate.zpt')).__of__(self)
+    return pt()
+
+from urllib import quote
+
+
+def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,REQUEST=None):
+    "Add a Page Template with optional file content."
+    if type(MPIWGType)==StringType:
+        MPIWGTypes=[MPIWGType]
+    else:
+        MPIWGTypes=MPIWGType
+        
+    for singleType in MPIWGTypes:
+
+
+        if REQUEST is None:
+            self._setObject(id, MPIWGTemplate(id, text,EchoType=singleType))
+            ob = getattr(self, id)
+            
+            if title:
+                ob.pt_setTitle(title)
+            return ob
+        else:
+            file = REQUEST.form.get('file')
+            headers = getattr(file, 'headers', None)
+            if headers is None or not file.filename:
+                zpt = MPIWGTemplate(id,MPIWGType=singleType)
+            else:
+                zpt = MPIWGTemplate(id, file, headers.get('content_type'))
+
+            self._setObject(id, zpt)
+            ob = getattr(self, id)
+            if title:
+                ob.pt_setTitle(title)
+
+            try:
+                u = self.DestinationURL()
+            except AttributeError:
+                u = REQUEST['URL1']
+
+            
+    REQUEST.RESPONSE.redirect(u+'/manage_main')
+    return ''
+
     
 class MPIWGRoot(ZSQLExtendFolder):
     """Stammordner für den Web-Server"""
@@ -70,7 +138,7 @@ class MPIWGRoot(ZSQLExtendFolder):
              'xdata_13':'Funding institutions','WEB_project_header':'WEB_project_header',
              'WEB_project_description':'WEB_project_description','WEB_related_pub':'WEB_related_pub'}
     
-    folders=['MPIWGProject','Folder']
+    folders=['MPIWGProject','Folder','ECHO_Navigation']
     meta_type='MPIWGRoot'
 
     def upDateSQL(self,fileName):
@@ -79,6 +147,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         xmlPath=os.path.join(package_home(globals()), "updateSQL/%s"%fileName)
 
         os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()
+
         return 1
     
     def patchProjects(self,RESPONSE):
@@ -322,31 +391,24 @@ class MPIWGRoot(ZSQLExtendFolder):
     def getProjectFields(self,fieldName,folder=None,sort=None):
         """getListofFieldNames"""
         ret=[]
-        #print "FN",fieldName
-        if not folder:
-            folder=self
-        for object in folder.__dict__:
-
-            obj=getattr(folder,object)
-            if hasattr(obj,'meta_type'):
-                #print obj.meta_type
-                if obj.meta_type=='MPIWGProject':
-                    if fieldName=="WEB_title_or_short":
-                        #print "HI!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-                        #print len(obj.getContent('xdata_07'))
-                        if len(obj.getContent('xdata_07'))<3: # hack weil z.Z. manchmal noch ein Trennzeichen ; oder , im Feld statt leer
-                            fieldNameTmp="WEB_title"
-                        else:
-                            fieldNameTmp="xdata_07"
-                    else:
-                        fieldNameTmp=fieldName
-                    
-                    ret.append((obj,obj.getContent(fieldNameTmp)))
+    
+        objects=self.ZopeFind(self,obj_metatypes=['MPIWGProject'],search_sub=1)
 
-                if obj.meta_type in self.folders:
+                
+        for object in objects:
+            obj=object[1]
+            if fieldName=="WEB_title_or_short":
+                      
+                if len(obj.getContent('xdata_07'))<3: # hack weil z.Z. manchmal noch ein Trennzeichen ; oder , im Feld statt leer
+                    fieldNameTmp="WEB_title"
+                else:
+                    fieldNameTmp="xdata_07"
+            else:
+                fieldNameTmp=fieldName
                     
-                    ret += self.getProjectFields(fieldName,obj)
+            ret.append((obj,obj.getContent(fieldNameTmp)))
 
+        
         if sort=="int":
             ret.sort(sortI)
         else:
@@ -365,7 +427,7 @@ class MPIWGRoot(ZSQLExtendFolder):
     
         
     manage_options = Folder.manage_options+(
-        {'label':'Import Persons','action':'importNamesForm'},
+        {'label':'Update Personal Homepages','action':'updateHomepages'},
         {'label':'Main config','action':'changeMPIWGRootForm'},
         {'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'},
         {'label':'Store Historical Persons','action':'storeHistoricalPersons'},
@@ -399,6 +461,28 @@ class MPIWGRoot(ZSQLExtendFolder):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+    def updateHomepages(self,RESPONSE):
+        """lege members an"""
+        self.upDateSQL('personalwww.xml')
+        founds=self.ZSQLInlineSearch(_table='personal_www')
+        project=getattr(self,'members')
+        for found in founds:
+            
+            if not (found.e_mail==""):
+                newObj=MPIWGStaff.MPIWGStaff(found.username,found.name,found.vorname)
+                
+                try:
+                    project._setObject(found.username,newObj)
+                    RESPONSE.write("<p>new:%s</p>\n"%found.username)
+                except:
+                    RESPONSE.write("<p>old:%s (%s,%s)</p>\n"%(found.username,found.name,found.vorname))
+
+
+                    
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+        
     def getAllMembers(self):
         """give list of all members"""
         ret=[]
@@ -609,7 +693,8 @@ class MPIWGRoot(ZSQLExtendFolder):
         ret=[]
         splitNeu=[]
         if email:
-            members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email])
+            #print "IIII:",self.getId()
+            members=self.ZopeFind(self,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)
             name =  members[0][1].title.decode('utf-8')
 
         y=name
@@ -747,6 +832,7 @@ class MPIWGProject(Folder):
 
     meta_type='MPIWGProject'
 
+   
     def crossLinker(self):
         """experimental crosslinker"""
         splitted=self.WEB_project_description[0].split()
@@ -816,6 +902,7 @@ class MPIWGProject(Folder):
         pt=PageTemplateFile('Products/MPIWGWeb/zpt/project_main').__of__(self)
         return pt()
 
+    
     def getDataFields(self):
         """giveListofDatafields"""
         ret=[]