--- MPIWGWeb/MPIWGProjects.py	2004/10/01 12:08:49	1.33
+++ MPIWGWeb/MPIWGProjects.py	2004/10/14 09:01:32	1.37
@@ -6,11 +6,12 @@ from Products.PageTemplates.PageTemplate
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
-
+from Globals import package_home
 import urllib
 import MPIWGStaff
 import string
 import re
+import os
 from types import *
 
 import xmlhelper # Methoden zur Verwaltung der projekt xmls
@@ -57,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"""
@@ -72,6 +141,15 @@ class MPIWGRoot(ZSQLExtendFolder):
     folders=['MPIWGProject','Folder']
     meta_type='MPIWGRoot'
 
+    def upDateSQL(self,fileName):
+        """updates SQL databases using fm.jar"""
+        fmJarPath=os.path.join(package_home(globals()), 'updateSQL/fm.jar')
+        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):
         """patch"""
         projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'])
@@ -356,7 +434,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'},
@@ -390,6 +468,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=[]
@@ -570,6 +670,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                         proj=None
 
                 if proj:
+		    if person =="Otto Sibum" : person="H. Otto Sibum"
+		    if person =="Norton Wise" : person="M. Norton Wise"
                     #ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
                     ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url+"/index.html",person))
                 else:
@@ -860,7 +962,8 @@ class MPIWGProject(Folder):
         #teste ob WEB_project_description und keine führenden p tags
         if (len(text2)>4) and (not text2[0:3]=='<p>') and (field=='WEB_project_description'):
             return "<p>"+text2+"</p>"
-        
+        #if text2=="Otto Sibum":
+		#text2="H. Otto Sibum"
         return text2
     
     def show_html(self):