--- MPIWGWeb/MPIWGProjects.py	2004/10/21 14:28:09	1.39
+++ MPIWGWeb/MPIWGProjects.py	2005/06/14 12:35:55	1.47.2.13
@@ -1,11 +1,12 @@
 """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
@@ -13,12 +14,14 @@ 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']
 
@@ -33,7 +36,7 @@ def sortF(x,y):
         try:
             return cmp(str(x[1]),str(y[1]))
         except:           
-            print "error",x[1],y[1]
+            
             return 0 
     
 def sortI(x,y):
@@ -63,6 +66,22 @@ class MPIWGTemplate(ZopePageTemplate):
 
     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)
 
@@ -78,7 +97,13 @@ class MPIWGTemplate(ZopePageTemplate):
     
         """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)
@@ -87,7 +112,7 @@ def manage_addMPIWGTemplateForm(self):
 from urllib import quote
 
 
-def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,REQUEST=None):
+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]
@@ -122,7 +147,9 @@ def manage_addMPIWGTemplate(self, MPIWGT
             except AttributeError:
                 u = REQUEST['URL1']
 
-            
+    ob = getattr(self, id)
+    ob.weight=weight
+    
     REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
 
@@ -141,13 +168,65 @@ class MPIWGRoot(ZSQLExtendFolder):
     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)
-
-        os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()
-
+        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):
@@ -160,12 +239,22 @@ class MPIWGRoot(ZSQLExtendFolder):
             
     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'
         
@@ -286,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
 
@@ -317,34 +407,43 @@ 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:
-            fieldContents=[fieldContentsEntry]
+        def sort(x,y):
+		return cmp(x.WEB_title[0],y.WEB_title[0])
+
+	if type(fieldContentsEntry) is StringType:
+            fieldContentsTmp=[fieldContentsEntry]
         else:
-            fieldContents=fieldContentsEntry
-            
-        projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' OR')})
+            fieldContentsTmp=fieldContentsEntry
+
+        fieldContents=[]
+        for x in fieldContentsTmp:
+            fieldContents.append(" AND ".join(x.split()))
+        projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' AND')})
         #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
 
@@ -353,11 +452,13 @@ class MPIWGRoot(ZSQLExtendFolder):
 
     def getDisciplineList(self):
         """get disciplines as list"""
-        return self.disciplineList.split("\n")
+        list= self.disciplineList.split("\n")
+        return [x.rstrip().lstrip() for x in list]
     
     def getThemeList(self):
         """get themes as list"""
-        return self.themesList.split("\n")
+        list= self.themesList.split("\n")
+        return [x.rstrip().lstrip() for x in list]
     
     def test(self):
         """test"""
@@ -388,25 +489,27 @@ 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=[]
     
-        objects=self.ZopeFind(self,obj_metatypes=['MPIWGProject'],search_sub=1)
+        objects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'],search_sub=0)
 
                 
         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"
+            
+            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="xdata_07"
                 else:
-                    fieldNameTmp="xdata_07"
-            else:
-                fieldNameTmp=fieldName
-                    
-            ret.append((obj,obj.getContent(fieldNameTmp)))
+                    fieldNameTmp=fieldName
+
+                ret.append((obj,obj.getContent(fieldNameTmp)))
 
         
         if sort=="int":
@@ -435,7 +538,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):
@@ -456,7 +559,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                     project._setObject(splitted[0],newObj)
                     #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')
@@ -488,9 +592,11 @@ class MPIWGRoot(ZSQLExtendFolder):
             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())
-
-        self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
-
+        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:
@@ -534,6 +640,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(".")
@@ -542,11 +649,62 @@ class MPIWGRoot(ZSQLExtendFolder):
                     #title=project[0].WEB_title
                     title=[project[0].getContent('WEB_title')]
                     #print title
-                    returnList.append((depth,nr,title,project[0]))
+		    if idNr[0]!="x":
+                       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):
+                        if i>0:
+                            ret+="<li>"
+                        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></li></ul>\n"
+
+                    #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"""
+		    if department==4: #hack
+			department=3
+
+                    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':'Ind. Research Group','5':'Ind. Research Group'} 
+                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
@@ -707,8 +865,8 @@ class MPIWGRoot(ZSQLExtendFolder):
         ret=[]
         splitNeu=[]
         if email:
-            #print "IIII:",self.getId()
-            members=self.ZopeFind(self,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)
+            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
@@ -725,13 +883,11 @@ class MPIWGRoot(ZSQLExtendFolder):
         if proj:
             proj2=[]
             for x in proj:
-             
-                if not((splitted[1]==" Christoph") and (splitted[0]=="Hoffmann") and (str(x.WEB_title).find('Einstein')>0)):
-                       
-                       #print repr(splitted[1]),repr(splitted[0]),repr(x.WEB_title)
+
+                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)
-        #    proj2.sort(sortP)
-        #    ret.append((y,proj2))
+
         else:
             proj2=[]
             
@@ -739,6 +895,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         if proj:
             names=[x.WEB_title for x in proj]
             for x in proj:
+
                 if not x.WEB_title in names:
                     proj2.append(x)
 
@@ -829,22 +986,78 @@ 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):
@@ -903,17 +1116,46 @@ 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('Products/MPIWGWeb/zpt/project_main').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','project_main')).__of__(self)
         return pt()
 
     
@@ -934,74 +1176,116 @@ 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:
-##             print text, text[len(text)-1]
-##         except:
-##             print "error:",text
+
         try:
             if text[len(text)-1]==";":
                 text=text[0:len(text)-1]
           
                 
         except:
-            """nothing"""
+            pass
+        
+        if text=='':
+            text2=text
+        else:
+            text2=re.sub(r';([^\s])','; \g<1>',text)
 
-        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.imageURL=tmp[0].split("\"")[1].encode('utf-8')
+		except:
+			self.imageURL=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.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(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
-    
+        if (len(text5)>4) and (not text5[0:3]=='<p>') and (field=='WEB_project_description'):
+            text5= "<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"""
+        
+        self.copyObjectToArchive() # archive the object
+
 
-        #return self.REQUEST
         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):
@@ -1027,15 +1311,15 @@ 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
+        splitted=[y.rstrip().lstrip() for y in splitted]
+        
         for x in splitted:
             if (not x==u'') and x in wert:
                 return 1
@@ -1043,17 +1327,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):
@@ -1081,7 +1365,7 @@ 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):
@@ -1089,7 +1373,7 @@ def manage_addMPIWGProject(self,id,RESPO
     #print argv
     fileupload=self.REQUEST.get('fileupload',None)
     if fileupload:
-        print fileupload
+
         file_name=fileupload.filename
         filedata=fileupload.read()