--- MPIWGWeb/MPIWGProjects.py	2004/07/08 11:42:31	1.14
+++ MPIWGWeb/MPIWGProjects.py	2005/06/06 14:51:47	1.47.2.10
@@ -1,23 +1,27 @@
 """This contains the class MPIWG Projects
-for organizing and maintaining the different projectspages
+for organizing and maintaining the different project pages
 
 """
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
-
+from Products.ZCatalog.CatalogPathAwareness import CatalogAware
+from Globals import package_home
 import urllib
 import MPIWGStaff
 import string
 import re
+import os
 from types import *
-
+import zLOG
 import xmlhelper # Methoden zur Verwaltung der projekt xmls
 from OFS.SimpleItem import SimpleItem
 from OFS.Folder import Folder
+from Products.ZSQLMethods.SQL import SQLConnectionIDs
 
 from bibliography import *
+import time
 
 definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub']
 
@@ -29,7 +33,11 @@ def sortF(x,y):
     try:
         return cmp(x[1],y[1])
     except:
-        return 0
+        try:
+            return cmp(str(x[1]),str(y[1]))
+        except:           
+            
+            return 0 
     
 def sortI(x,y):
     xsplit=x[1].split(".")
@@ -53,6 +61,98 @@ def sortI(x,y):
     except:
         return cmp(x[1],y[1])
 
+class MPIWGTemplate(ZopePageTemplate):
+    """Create a layout Template for different purposes"""
+
+    meta_type="MPIWGTemplate"
+
+    manage_options=ZopePageTemplate.manage_options+(
+        {'label':'Change Weight','action':'changeWeightForm'},
+        )
+
+    def changeWeightForm(self):
+        """change weight form"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGTemplateChangeWeight.zpt')).__of__(self)
+        return pt()
+
+    def changeWeight(self,weight,RESPONSE=None):
+        """change weight"""
+        self.weight=weight
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage')
+
+        
+    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 isActive(self):
+        """teste ob ausgewaehlt"""
+        if self.absolute_url()==self.REQUEST['URL']:
+            return "aktiv"
+        else:
+            return ""
+
+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,weight=0,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']
+
+    ob = getattr(self, id)
+    ob.weight=weight
+    
+    REQUEST.RESPONSE.redirect(u+'/manage_main')
+    return ''
+
     
 class MPIWGRoot(ZSQLExtendFolder):
     """Stammordner für den Web-Server"""
@@ -65,35 +165,122 @@ 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 getKategory(self,url):
+	"""kategorie"""
+	splitted=url.split("/")
+	return splitted[4]
+
+    def generateUrlProject(self,url,project=None):
+        """erzeuge aus absoluter url, relative des Projektes"""
+
+        splitted=url.split("/")
+        length=len(splitted)
+        short=splitted[length-2:length]
+	if project:
+        	base=self.REQUEST['URL3']+"/"+"/".join(short)
+	else:
+		base=self.REQUEST['URL1']+"/"+"/".join(short)
+        return base
+    
+    def isNewCapital(self,text=None,reset=None):
+        if reset:
+            self.REQUEST['capital']="A"
+            return True
+        else:
+            if len(text)>0 and not (text[0]==self.REQUEST['capital']):
+                self.REQUEST['capital']=text[0]
+                return True
+            else:
+                return False
+        
+    def subNav(self,id):
+        """return subnav elemente"""
+        def sortWeight(x,y):
+            x1=int(getattr(x[1],'weight','0'))
+            y1=int(getattr(y[1],'weight','0'))
+            return cmp(x1,y1)
+        if hasattr(self,id):
+            subs=self.ZopeFind(getattr(self,id),obj_metatypes=['MPIWGTemplate'])
+            subret=[]
+            for x in subs:
+                if not(x[1].title==""):
+                    subret.append(x)
+            subret.sort(sortWeight)
+            return subret
+        else:
+            return None
+    def isActive(self,name):
+        """teste ob subnavigation aktiv"""
+        for part in self.REQUEST['URL'].split("/"):
+            if part==name:
+                return True
+        return False
+        
+        
+    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)
+        zLOG.LOG("MPIWG Web",zLOG.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath))
+        ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()
+	zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret)
+        return 1
+    
+    def patchProjects(self,RESPONSE):
+        """patch"""
+        projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'])
+        for project in projects:
+		tmp=project[1].WEB_project_description[0].replace("/CD/projects/","")[0:]
+            	setattr(project[1],'WEB_project_description',[tmp[0:]])
+            	RESPONSE.write("<p>%s</p>\n"%project[0])
+            
     def replaceNotEmpty(self,format,field):
         """replace not empty"""
-        if field and (not field==''):
+        if field and (not field.lstrip()==''):
             return format%field
         else:
             return ""
         
+
+    def isActual(self,project):
+        """checke if project is actual"""
+        actualTime=time.localtime()
+        obj= project.getObject()
+        
+        if getattr(obj,'archiveTime',actualTime)< actualTime:
+            return False
+        else:
+            return True
+        
+    def redirectIndex_html(self,request):
+        #return request['URL1']+'/index_html'
         
+        return urllib.urlopen(request['URL1']+'/index_html').read()
+
+    
     def formatBibliography(self,here,found):
         """format"""
         return formatBibliography(here,found)
     
-    def getValue(self,field):
+    def getValue(self,fieldStr):
         """Inhalt des Feldes"""
-
-        if type(field)==StringType:
-            try:
-                if field[len(field)-1]==";":
-                    field=field[0:len(text)-1]
-            except:
-                    """nothing"""
-            
-            return field.encode('utf-8')
         
+        if type(fieldStr)==StringType:
+            field=fieldStr
         else:
-            return field[0].encode('utf-8')
+            field=fieldStr[0]
+        try:
+            if field[len(field)-1]==";":
+                field=field[0:len(field)-1]
+        except:
+
+            """nothing"""
+        field=re.sub(r';([^\s])','; \g<1>',field)
+        return field.encode('utf-8')
+
 
     
     def sortedNames(self,list):
@@ -188,7 +375,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                             list[urllib.quote(personNormal)]=(personNormal,[project[1]])
 
             except:
-                print "ERROR",project
+                zLOG.LOG("MPIWG Web (harvestHistoricalPerson)",zLOG.ERROR,"cannot annalyize: %s"%repr(project))
+
                 
         return list
 
@@ -219,34 +407,40 @@ class MPIWGRoot(ZSQLExtendFolder):
 
     def showHistoricalPersons(self):
         """show persons"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showHistoricalPersons')).__of__(self)
         return pt()
 
         
     def editHistoricalPersonsForm(self):
         """edit historical persons for consistency"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/editHistoricalPersonsForm').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editHistoricalPersonsForm')).__of__(self)
         return pt()
 
     def getProjectsByFieldContent(self,fieldName,fieldContentsEntry):
         """gib alle Projekte aus mit Value von field mit fieldName enthält ein Element der Liste fieldContents"""
-        if type(fieldContentsEntry) is StringType:
+        def sort(x,y):
+		return cmp(x.WEB_title[0],y.WEB_title[0])
+
+	if type(fieldContentsEntry) is StringType:
             fieldContents=[fieldContentsEntry]
         else:
             fieldContents=fieldContentsEntry
             
         projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' OR')})
         #print projects
-        return projects
+	ret=[x for x in projects]
+	ret.sort(sort)
+        return ret
 
     def changeMPIWGRootForm(self):
         """edit"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/changeMPIWGRootForm').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeMPIWGRootForm')).__of__(self)
         return pt()
 
-    def changeMPIWGRoot(self,title,disciplineList,themesList,RESPONSE=None):
+    def changeMPIWGRoot(self,title,disciplineList,themesList,connection_id,RESPONSE=None):
         """change"""
         self.title=title
+        self.connection_id=connection_id
         self.disciplineList=disciplineList
         self.themesList=themesList
 
@@ -290,34 +484,29 @@ class MPIWGRoot(ZSQLExtendFolder):
                         ret.append(project)
         return ret
     
-    def getProjectFields(self,fieldName,folder=None,sort=None):
+    def getProjectFields(self,fieldName,actual="yes",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"
+    
+        objects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'],search_sub=0)
+
+                
+        for object in objects:
+            obj=object[1]
+            
+            if (not getattr(obj,'invisible',None)) and (obj.isActual()):
+                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=fieldName
-                    
-                    ret.append((obj,obj.getContent(fieldNameTmp)))
+                        fieldNameTmp="xdata_07"
+                else:
+                    fieldNameTmp=fieldName
 
-                if obj.meta_type in self.folders:
-                    
-                    ret += self.getProjectFields(fieldName,obj)
+                ret.append((obj,obj.getContent(fieldNameTmp)))
 
+        
         if sort=="int":
             ret.sort(sortI)
         else:
@@ -336,7 +525,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'},
@@ -344,7 +533,7 @@ class MPIWGRoot(ZSQLExtendFolder):
     
     def importNamesForm(self):
         """Form"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGNamesForm.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGNamesForm.zpt')).__of__(self)
         return pt()
 
     def importNames(self,fileupload,folderName,RESPONSE=None):
@@ -356,20 +545,59 @@ class MPIWGRoot(ZSQLExtendFolder):
             
             
             splitted=line.split(",")
-            print splitted
+           # print splitted
         
             if not (splitted[0]==""):
                 newObj=MPIWGStaff.MPIWGStaff(splitted[0],splitted[1],splitted[2])
                 
                 try:
                     project._setObject(splitted[0],newObj)
-                    print "done:",splitted[0]
+                    #print "done:",splitted[0]
                 except:
-                    print "not done:",splitted[0]
+                    zLOG.LOG("MPIWG Web (importNames)",zLOG.INFO,"cannot import: %s"%splitted[0])
+
+                    
+        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',publish_the_data='yes')
+        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))
+
+
+        #delete non existing
+
+
+        foundUserNames=[x.username for x in founds]
+        for member in self.ZopeFind(self,obj_metatypes=["MPIWGStaff"],search_sub=1):            
+            
+            if member[1].getId() not in foundUserNames:
+                member[1].aq_parent.manage_delObjects(ids=[member[1].getId()])
+                RESPONSE.write("<p>deleted:%s</p>\n"%member[1].getId())
+        try:
+            self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+        except:
+            pass
+        self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+    
                     
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+        
     def getAllMembers(self):
         """give list of all members"""
         ret=[]
@@ -381,7 +609,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
                                ret.append(x[1].title.decode('utf-8'))
             
-        #ret.sort()
+        ret.sort()
         #print ret
   
         return ret
@@ -407,6 +635,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         """generate Tree from project list"""
         returnList=[]
         for project in self.getProjectFields('xdata_05',sort="int"): # get Projects sorted by xdata_05
+
             for idNr in project[1].split(";"): # more than one number
                 if not idNr=="":
                     splittedId=idNr.split(".")
@@ -415,11 +644,70 @@ class MPIWGRoot(ZSQLExtendFolder):
                     #title=project[0].WEB_title
                     title=[project[0].getContent('WEB_title')]
                     #print title
-                    
                     returnList.append((depth,nr,title,project[0]))
         
         return returnList
 
+    def formatElementsAsList(self,elements):
+        """formatiere tree als liste"""
+        
+        actualDepth=0
+        ret=""
+        for element in elements:
+            if (element[0]>actualDepth):
+                #fuege soviele ul ein wie unterschied in tiefe
+                if element[0]==1:
+                    ret+="""<div class="dept">\n<ul class="liste">\n"""
+                else:
+                    for i in range(element[0]-actualDepth):
+                        ret+="""<ul class="liste">\n"""
+                    
+                actualDepth=element[0]
+                
+            elif (element[0]<actualDepth):
+                #fuege soviele /ul ein wie unterschied in tiefe
+                for i in range(-element[0]+actualDepth):
+                    ret+="<br><br>\n</li>\n</ul>\n</li>\n"
+
+                if element[0]==1:
+                    department=int(element[3].getContent('xdata_05'))-1
+                    
+                    ret+="""</ul></div>\n"""
+                    ret+="""<div class="bildspalte"><img src="../grafik/dept%i.jpg" width="160" height="120" vspace="40"></div>
+                    <div class="dept">\n<ul class="liste">\n
+                    """%department
+            
+                actualDepth=element[0]
+            else:
+                ret+="""\n</li>\n"""
+            ret+="""<li>\n"""
+            
+            if actualDepth==1:
+                departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'NWG','5':'NWG'} 
+                department=element[3].getContent('xdata_05')
+                ret+="""<a href="#top"><img src="../grafik/totop.gif" vspace="10" border="0"></a><br><a name="dept%s"></a>%s: """%(department,departmentName[department])
+
+            ret+="""<a href="%s">%s</a>"""%(self.generateUrlProject(element[3].absolute_url())+"/index.html",element[3].getContent('WEB_title'))
+        return ret
+    
+    def formatElementForOverview(self,element):
+        """format the element for output in overview"""
+        if element[0]==1: #department
+            #print element[3].getContent('xdata_05')
+            if element[3].getContent('xdata_05') == "4":
+                return """<h2 class="hier"><a href="%s">Ind. Research Group I: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+            if element[3].getContent('xdata_05') == "5":
+                return """<h2 class="hier"><a href="%s">Ind. Research Group II: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+            
+            return """<h2 class="hier"><a href="%s">Department %s: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))
+
+        elif element[0]==2: #mainprojects
+            return """<h3 class="hier"><a href="%s">%s</a></h3><p>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+
+        elif element[0]==3:
+            return """<p class="hier"><a href="%s">%s</a></p>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+
+        
     def changePosition(self,treeId,select,RESPONSE=None):
         """Change Postion Entry"""
         numbers=[]
@@ -478,6 +766,35 @@ class MPIWGRoot(ZSQLExtendFolder):
         
             
         
+    def getRelativeUrlFromPerson(self,list):
+        """get urls to person list"""
+        ret=[]
+        persons=list.split(";")
+        for person in persons:
+            
+            if len(person)>1: #nicht nur Trennzeichen
+                splitted=person.split(",")
+                if len(splitted)==1:
+                    splitted=person.split(" ")
+                splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
+                if splittedNew[0]=='':
+                    del splittedNew[0]
+                search=string.join(splittedNew,' AND ')
+                
+                if not search=='':
+
+                    try:
+                        proj=self.MembersCatalog({'title':search})
+                    except:
+                        proj=None
+
+                if proj:
+                    #ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
+                    ret.append("<a href=%s >%s</a>"%('members/'+proj[0].id+'/index.html',person))
+                else:
+                    #ret.append("%s"%person.encode('utf-8'))
+                    ret.append("%s"%person)
+        return string.join(ret,";")
         
             
     def getUrlFromPerson(self,list):
@@ -489,7 +806,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             if len(person)>1: #nicht nur Trennzeichen
                 splitted=person.split(",")
                 if len(splitted)==1:
-                    splitted=person.split(" ")
+                    splitted=person.lstrip().rstrip().split(" ")
                 splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
                 if splittedNew[0]=='':
                     del splittedNew[0]
@@ -503,8 +820,10 @@ 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,person))
+                    ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url+"/index.html",person))
                 else:
                     #ret.append("%s"%person.encode('utf-8'))
                     ret.append("%s"%person)
@@ -517,42 +836,60 @@ class MPIWGRoot(ZSQLExtendFolder):
         #return str(members)
         for x in members:
             ret+=self.getProjectsOfMember(name=x)
-
+            
         return ret
 
     def getProjectsOfMember(self,name=None,email=None):
         """get project of a member"""
         def sortP(x,y):
             """sort by sorting number"""
-            
-            return cmp(x.xdata_05,y.xdata_05)
+            #print x.xdata_05,y.xdata_05
+            return cmp(x.WEB_title,y.WEB_title)
         
- 
+       
         ret=[]
         splitNeu=[]
         if email:
-            members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email])
+            print "IIII:",self.getId()
+            members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)
             name =  members[0][1].title.decode('utf-8')
 
         y=name
-        splitted=y.split(",")  
-        for s in splitted:
-            splitNeu.append("\""+s+"\"")
+        splitted=y.split(",")
+        #XXXX
+        splitNeu=["\'"+splitted[1]+" "+splitted[0]+"\'"]
+        
+        #for s in splitted:
+        #    splitNeu.append("\""+s+"\"")
         search=string.join(splitNeu,' AND ')
-            
+        
         proj=self.ProjectCatalog({'xdata_01':search})
+
         if proj:
-            proj2=[x for x in proj]
-            proj2.sort(sortP)
-            ret.append((y,proj2))
+            proj2=[]
+            for x in proj:
 
+                if not getattr(x.getObject(),'invisible',None):
+                    if not((splitted[1]==" Christoph") and (splitted[0]=="Hoffmann") and (str(x.WEB_title).find('Einstein')>0)):
+                       proj2.append(x)
+
+        else:
+            proj2=[]
+            
         proj=self.ProjectCatalog({'xdata_08':search})
         if proj:
-            proj2=[x for x in proj]
-            proj2.sort(sortP)
+            names=[x.WEB_title for x in proj]
+            for x in proj:
+
+                if not x.WEB_title in names:
+                    proj2.append(x)
+
+
+        proj2.sort(sortP)
+
+        if len(proj2)>0:
             ret.append((y,proj2))
 
-        
         return ret
      
     def givePersonList(self,name):
@@ -560,8 +897,9 @@ class MPIWGRoot(ZSQLExtendFolder):
         
         splitted=name.split(",")
         if len(splitted)==1:
-            splitted=name.split(" ")
-        splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
+            splitted=name.lstrip().rstrip().split(" ")
+        splittedNew=[split.lstrip() for split in splitted]
+        
         if splittedNew[0]=='':
             del splittedNew[0]
         search=string.join(splittedNew,' AND ')
@@ -633,23 +971,80 @@ class MPIWGRoot(ZSQLExtendFolder):
         
 def manage_addMPIWGRootForm(self):
     """form for adding the root"""
-    pt=PageTemplateFile('Products/MPIWGWeb/zpt/addMPIWGRootForm.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGRootForm.zpt')).__of__(self)
     return pt()
 
-def manage_addMPIWGRoot(self,id,title,RESPONSE=None):
+def manage_addMPIWGRoot(self,id,title,connection_id="",RESPONSE=None):
     """add a root folder"""
     newObj=MPIWGRoot(id,title)
     self._setObject(id,newObj)
-
+    ob=getattr(self,id)
+    setattr(ob,'connection_id',connection_id)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
         
 
-class MPIWGProject(Folder):
+class MPIWGProject(CatalogAware,Folder):
     """Class for Projects"""
 
     meta_type='MPIWGProject'
+    default_catalog='ProjectCatalog'
+    
+    def PrincipiaSearchSource(self):
+        """Return cataloguable key for ourselves."""
+        return str(self)
+
+    def versionHeader(self):
+        """version Header, gibt header text entsprechend der aktuellen version aus"""
+        
+        actualTime=time.localtime()
+        retTXT="""<h2>This is an outdated version, for the actual version please refer to <a href="%s">%s</a></h2>"""
+        s=self.aq_parent.absolute_url()
+        #print getattr(self,'archiveTime',actualTime)
+        if getattr(self,'archiveTime',actualTime)< actualTime:
+            return retTXT%(s,s)
+        else:
+            return ""
+    def isActual(self):
+        """gibt 1 zurueck wenn aktuell, 0 sonst"""
+        actualTime=time.localtime()
+        
+        
+        #print getattr(self,'archiveTime',actualTime)
+        if getattr(self,'archiveTime',actualTime)< actualTime:
+            return 0
+        else:
+            return 1
+        
+    def copyObjectToArchive(self):
+        """kopiere aktuelles objekt ins archiv"""
+        cb=self.aq_parent.manage_copyObjects(self.getId())
+        self.manage_pasteObjects(cb)
+        actualTime=time.localtime()
+        
+        self.manage_renameObject(self.getId(),self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime))
+        obj=getattr(self,self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime))
+        obj.setArchiveTime(time.strftime("%Y%m%d%H%M%S",actualTime))
+        ids=[x[0] for x in self.ZopeFind(obj,obj_metatypes=['MPIWGProject'])]
+        obj.manage_delObjects(ids)
+        
+    def setArchiveTime(self,time):
+        """set Archive Time"""
+        self.archiveTime=time[0:]
+        
+    def versionManageForm(self):
+        """version Manage form:currently only set to invisible"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_versionManageForm.zpt')).__of__(self)
+        return pt()
+
+    def versionManage(self,invisible=None,RESPONSE=None):
+        """version Manage form:currently only set to invisible"""
+        self.invisible=invisible
 
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+   
     def crossLinker(self):
         """experimental crosslinker"""
         splitted=self.WEB_project_description[0].split()
@@ -706,13 +1101,55 @@ class MPIWGProject(Folder):
         {'label':'Edit BasisInfo','action':'editMPIWGBasisForm'},
         {'label':'Edit Publications','action':'editMPIWGRelatedPublicationsForm'},
         {'label':'Edit Themes & Disciplines','action':'editMPIWGDisciplinesThemesForm'},
+        {'label':'Versionmanager','action':'versionManageForm'},
         )
 
+
+    def checkDate(self,date):
+        """teste ob zum Zeitpunkt date eine andere version existierte"""
+        
+
+        def sortProjectsByTime(x,y):
+            return cmp(x[1].archiveTime,y[1].archiveTime)
+        
+        finds=self.ZopeFind(self,obj_metatypes=['MPIWGProject'])
+        if not finds:
+            return self.absolute_url()
+        else:
+            finds.sort(sortProjectsByTime)
+
+        for find in finds:
+            if int(find[1].archiveTime) > int(date):
+                return find[1].absolute_url()
+
+        return self.absolute_url()
+        
+            
+            
+    def index_html(self):
+        """show homepage"""
+        
+        if self.REQUEST.has_key('date') and self.REQUEST.SESSION.get('MPI_redirected',None)==None:
+            self.REQUEST.SESSION['MPI_redirected']=1
+            self.REQUEST.RESPONSE.redirect(self.checkDate(self.REQUEST['date']))
+        else:
+            self.REQUEST.SESSION['MPI_redirected']=None
+        
+	ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])
+
+        if ext:
+            return getattr(self,ext[0][1].getId())()
+
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','project_main')).__of__(self)
+        return pt()
+
+    
     def getDataFields(self):
         """giveListofDatafields"""
         ret=[]
         for x in range(1,14):
-            ret.append('xdata_%02i'%x)
+            if not x in [6,10,9]: # not used fields
+                ret.append('xdata_%02i'%x)
         return ret
             
     def getDefinedFields(self):
@@ -724,58 +1161,114 @@ class MPIWGProject(Folder):
         """get attrbiute"""
         return getattr(self,field)
 
-    def getContent(self,field):
+    def getContent(self,field,filter=None):
         """Inhalt des Feldes"""
         
         text=u''
-        #print "FIELD",field
+
         for x in getattr(self,field):
-            #print "HIHIIII"
             
             try:
-                text +=x.encode('utf-8')
+                text +=x
             except:
-                try:
-                    text =x.encode('utf-8')
-                except:
-                    text=x.decode('latin-1').encode('utf-8')
+                text = x
+            
         
-        #delete separator (;) if  is there is one
+
         try:
             if text[len(text)-1]==";":
-                text=text[0:len(text)-1].encode('utf-8')
+                text=text[0:len(text)-1]
+          
+                
         except:
-            """nothing"""
-            
-        return text
+            pass
+        
+        if text=='':
+            text2=text
+        else:
+            text2=re.sub(r';([^\s])','; \g<1>',text)
 
-    
+        #teste ob ergebnis leer und header dann nehme title
+        
+        if (text2=='') and (field=='WEB_project_header'):
+            return self.getContent('WEB_title')
+
+        if filter:
+            splitted=text2.split("""<p class="picture">""")
+            if len(splitted)>1:
+                tmp=splitted[1].split("</p>")
+		#return repr(splitted[1])
+                try:
+			self.REQUEST.SESSION['image']=tmp[0].split("\"")[1].encode('utf-8')
+		except:
+			self.REQUEST.SESSION['image']=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')
+                split2="</p>".join(tmp[1:])
+
+                text3=splitted[0]+split2
+
+                splitted=text3.split("""<p class="picturetitle">""")
+                if len(splitted)>1:
+                    tmp=splitted[1].split("</p>")
+                    self.REQUEST.SESSION['imagecap']=tmp[0].encode('utf-8')
+                    split4="".join(tmp[1:])
+
+                    text5=splitted[0]+split4
+                else:
+                    #keine caption
+                    text5=text3
+            else:
+                #kein bild
+                text5=text2
+        else:
+            text5=text2
+
+        #teste ob WEB_project_description und keine führenden p tags
+        if (len(text5)>4) and (not text5[0:3]=='<p>') and (field=='WEB_project_description'):
+            return "<p>"+text5+"</p>"
+
+
+        #filter image
+        
+      
+        return text5.encode('utf-8')
+
+    def showImagesOfPage(self,imageUrl=None):
+        """show Images of project"""
+        self.getContent('WEB_project_description',filter='yes') #get the content and store image infos into session
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','projectImageView.zpt')).__of__(self)
+        return pt()
+        
+        
     def show_html(self):
         """simple index"""
         #return "HI"
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGProject_index.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_index.zpt')).__of__(self)
         return pt()
 
     def editMPIWGProjectForm(self):
         """editform"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGProject.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProject.zpt')).__of__(self)
         return pt()
 
     def editMPIWGProject(self,RESPONSE=None):
-        """edit the project"""
+        """edit the project and archive the old version"""
         
-        #return self.REQUEST
+        self.copyObjectToArchive() # archive the object
+
+
         for x in definedFields:
             if self.REQUEST.has_key(x):
                 
                 setattr(self,x,[self.REQUEST[x].decode('utf-8')])
-            
+
+
+        
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
     def editMPIWGDisciplinesThemesForm(self):
         """edit the disciplines and themes Form"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGDisciplinesThemes.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGDisciplinesThemes.zpt')).__of__(self)
         return pt()
 
     def editMPIWGDisciplinesThemes(self,disciplines=None,themes=None,RESPONSE=None):
@@ -801,15 +1294,14 @@ class MPIWGProject(Folder):
 
     def isChecked(self,wert,list):
         """check if wert is in ; seperated list"""
-        print "W:",wert
-        print "L:",list,type(list)
+
         #felder sind manchmnal als liste mit einem element definiert
         if type(list) is StringType or UnicodeType: 
             splitted=list.split(";")
         else:
             splitted=list[0].split(";")
 
-        print splitted
+
         for x in splitted:
             if (not x==u'') and x in wert:
                 return 1
@@ -817,17 +1309,17 @@ class MPIWGProject(Folder):
     
     def editMPIWGBasisForm(self):
         """editform"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGBasis.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)
         return pt()
     def editMPIWGRelatedPublicationsForm(self):
         """Edit related Publications"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGRelatedPublications.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)
         return pt()
         
     
     def loadNewFileForm(self):
         """Neues XML-File einlesen"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGProject_newfile.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_newfile.zpt')).__of__(self)
         return pt()
 
     def loadNewFile(self,RESPONSE=None):
@@ -855,21 +1347,21 @@ class MPIWGProject(Folder):
 
 def manage_addMPIWGProjectForm(self):
     """form for adding the project"""
-    pt=PageTemplateFile('Products/MPIWGWeb/zpt/addMPIWGProjectForm.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGProjectForm.zpt')).__of__(self)
     return pt()
 
 def manage_addMPIWGProject(self,id,RESPONSE=None):
     """method to add a project"""
     #print argv
-    if self.REQUEST.has_key('fileupload'):
-        fileupload=self.REQUEST['fileupload']
-        if fileupload:
-            file_name=fileupload.filename
-            filedata=fileupload.read()
+    fileupload=self.REQUEST.get('fileupload',None)
+    if fileupload:
 
-            argv=xmlhelper.proj2hash(filedata)
-
-            #print argv
+        file_name=fileupload.filename
+        filedata=fileupload.read()
+        
+        argv=xmlhelper.proj2hash(filedata)
+        
+        #print argv
         newObj=MPIWGProject(id,argv)
     else:
         newObj=MPIWGProject(id)