--- MPIWGWeb/MPIWGProjects.py	2005/04/25 16:58:02	1.46
+++ MPIWGWeb/MPIWGProjects.py	2005/12/22 21:10:14	1.47.2.45
@@ -2,11 +2,16 @@
 for organizing and maintaining the different project pages
 
 """
+#TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaengig vom status publish_the_data
+#TODO: was passiert wenn aenderungen von jochen im filemaker nicht mit den aenderungen im sql uebereinstimmen
+#TODO: in einzelnen projecte steht als pfad auf die bilder noch wwwneu statt www
+
 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 OFS.Image import Image
 from Globals import package_home
 import urllib
 import MPIWGStaff
@@ -15,19 +20,32 @@ import re
 import os
 from types import *
 import zLOG
-import xmlhelper # Methoden zur Verwaltung der projekt xmls
+import xmlhelper # Methoden zur Verwaltung der projekt xml
 from OFS.SimpleItem import SimpleItem
 from OFS.Folder import Folder
 from Products.ZSQLMethods.SQL import SQLConnectionIDs
-
+from AccessControl import ClassSecurityInfo
 from bibliography import *
 import time
+import xml.dom.minidom
+import sys
+from Ft.Xml.XPath import Evaluate
+from Ft.Xml.XPath.Context import Context
+from Ft.Xml.Domlette import NonvalidatingReader,PrettyPrint, Print
+from Ft.Xml import EMPTY_NAMESPACE
 
 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']
 
 checkFields = ['xdata_01']
 
 
+def getTextFromNode(nodename):
+    nodelist=nodename.childNodes
+    rc = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+           rc = rc + node.data
+    return rc
 
 def sortF(x,y):
     try:
@@ -61,11 +79,111 @@ def sortI(x,y):
     except:
         return cmp(x[1],y[1])
 
+class MPIWGLink(SimpleItem):
+    """create a symbolic link to another page"""
+
+    meta_type="MPIWGLink"
+    
+    def isActiveItem(self):
+        """teste ob ausgewaehlt"""
+        #url1 beim link anstelle von url1, da link jeweils index_html als url hat.
+        if self.absolute_url()==self.REQUEST['URL1']:
+            return "aktiv"
+        else:
+            return ""
+
+    def __init__(self,id,link,title='',weight=''):
+        """init mpiwglink"""
+        self.id=id
+        self.link=link
+        self.title=title
+        self.weight=weight
+
+    def getObj(self):
+        """bekomme original"""
+       ##  objpath=self.link.replace("/",".")
+##         if objpath[0]!=".":
+##             objpath="."+objpath
+
+##         print objpath
+##         return eval("self"+objpath)
+
+
+        splitted=self.link.lstrip().split("/")
+        obj=self
+        for x in splitted:
+            if not x=="":
+              obj=getattr(obj,x)
+            
+        return obj
+
+    def getWeight(self):
+        if self.linkWeight and linkWeight!="":
+            return self.linkWeight
+        else:
+            return self.getObj().weight
+
+    manage_options=SimpleItem.manage_options+(
+        {'label':'main config','action':'changeLinkForm'},
+        )
+
+
+    def changeLinkForm(self):
+        """change MPIWG link"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGLinkChange.zpt')).__of__(self)
+        return pt()
+
+    def changeLink(self,link,title,weight,RESPONSE=None):
+        """change links"""
+        self.link=link
+        self.title=title
+        self.weight=weight
+
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage')
+
+    def index_html(self):
+        """index"""
+        
+        return self.getObj().pt_render(extra_context={'here':self})
+                                       
+
+def manage_addMPIWGLinkForm(self):
+    """Form for adding link"""
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGLink.zpt')).__of__(self)
+    return pt()
+
+def manage_addMPIWGLink(self,id,link,title,weight,RESPONSE=None):
+    """add link"""
+    newObj=MPIWGLink(id,link,title,weight)
+
+    self._setObject(id,newObj)
+    
+    if RESPONSE is not None:
+        RESPONSE.redirect('manage_main')
+
+
 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)
 
@@ -81,7 +199,13 @@ class MPIWGTemplate(ZopePageTemplate):
     
         """change form"""
 
-
+    def isActiveItem(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)
@@ -90,7 +214,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]
@@ -125,7 +249,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 ''
 
@@ -136,7 +262,7 @@ class MPIWGRoot(ZSQLExtendFolder):
     fieldLabels={'WEB_title':'WEB_Title','xdata_01':'Responsible Scientists','xdata_02':'Department',
              'xdata_03':'Historical Persons','xdata_04':'Time period',
              'xdata_05':'Sorting number','xdata_06':'Keywords','xdata_07':'Short title',
-             'xdata_08':'Other involved scholars' ,'xdata_09':'Part of','xdata_10':'Covered by',
+             'xdata_08':'Other involved scholars' ,'xdata_09':'Disciplines','xdata_10':'Themes',
              'xdata_11':'Object Digitallibrary','xdata_12':'Cooperation partners',
              'xdata_13':'Funding institutions','WEB_project_header':'WEB_project_header',
              'WEB_project_description':'WEB_project_description','WEB_related_pub':'WEB_related_pub'}
@@ -144,22 +270,134 @@ class MPIWGRoot(ZSQLExtendFolder):
     folders=['MPIWGProject','Folder','ECHO_Navigation']
     meta_type='MPIWGRoot'
 
+    def versionHeaderEN(self):
+        """version header text"""
+        
+        date= self.REQUEST.get('date',None)
+        if date:
+            txt="""<h2>This pages shows the project which existed at %s</h2>"""%str(date)
+            return txt
+        return ""
+
+    def versionHeaderDE(self):
+        """version header text"""
+        date= self.REQUEST.get('date',None)
+        if date:
+            txt="""<h2>Auf dieser Seite finden Sie die Projekte mit Stand vom %s</h2>"""%str(date)
+        return ""
+    
+        
+    def createOrUpdateId_raw(self):
+        """create sequence to create ids for bibliography"""
+        debug=None
+        #suche groesste existierende id
+        founds=self.ZSQLQuery("select id from bibliography")
+        
+        if founds:
+            ids=[int(x.id[1:]) for x in founds]
+            maximum=max(ids)
+            
+            id_raw=self.ZSQLQuery("select nextval('id_raw')",debug=debug)
+            
+            if id_raw:
+                self.ZSQLQuery("drop sequence id_raw",debug=debug)
+            
+            self.ZSQLQuery("create sequence id_raw start %i"%(maximum+1),debug=debug)
+        
+    
+    def queryLink(self,link):
+        """append querystring to the link"""
+        return "%s?%s"%(link,self.REQUEST.get('QUERY_STRING',''))
+
+    def getKategory(self,url):
+        """kategorie"""
+        splitted=url.split("/")
+        return splitted[4]
+
+    def generateUrlProject(self,url,project=None):
+        """erzeuge aus absoluter url, relative des Projektes"""
+        if project:
+            splitted=url.split("/")
+            length=len(splitted)
+            short=splitted[length-2:length]
+            
+            base=self.REQUEST['URL3']+"/"+"/".join(short)
+
+        else:
+            findPart=url.find("/projects/")
+            base=self.REQUEST['URL1']+"/"+url[findPart:]
+
+                
+        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,obj):
+        """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 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=['MPIWGTemplate','MPIWGLink'])
+            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)
+        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])
+                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"""
@@ -299,7 +537,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                             list[urllib.quote(personNormal)]=(personNormal,[project[1]])
 
             except:
-                zLOG.LOG("MPIWG Web (harvestHistoricalPerson)",zLOG.ERROR,"cannot annalyize: %s"%repr(project))
+                zLOG.LOG("MPIWG Web (harvestHistoricalPerson)",zLOG.ERROR,"cannot analyize: %s"%repr(project))
 
                 
         return list
@@ -340,16 +578,32 @@ class MPIWGRoot(ZSQLExtendFolder):
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editHistoricalPersonsForm')).__of__(self)
         return pt()
 
-    def getProjectsByFieldContent(self,fieldName,fieldContentsEntry):
+    def getProjectsByFieldContent(self,fieldName,fieldContentsEntry, date=None):
         """gib alle Projekte aus mit Value von field mit fieldName enthält ein Element der Liste fieldContents"""
+        def sort(x,y):
+                return cmp(x.WEB_title[0],y.WEB_title[0])
+
         if type(fieldContentsEntry) is StringType:
-            fieldContents=[fieldContentsEntry]
+            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=[]
+        for x in projects:
+            obj=x.getObject()
+            obj=obj.getActualVersion(date)
+            if obj and (not getattr(obj,'invisible',None)):
+                #if not (x in ret):
+                    ret.append(x)
+
+        ret.sort(sort)
+        return ret
 
     def changeMPIWGRootForm(self):
         """edit"""
@@ -368,29 +622,32 @@ 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"""
         return self.getProjectsByFieldContent('xdata_09',['biology'])[0].absolute_url
 
-    def getContexts(self,childs=None,parents=None,depth=None):
+    def getContexts(self,childs=None,parents=None,depth=None,date=None):
         """childs alle childs, alle parents"""
         ret=[]
+        
         if parents:
             splitted=parents.split(".")
             parentId=string.join(splitted[0:len(splitted)-1],".")
         
-            for project in self.getProjectFields('xdata_05',sort='int'):
+            for project in self.getProjectFields('xdata_05',sort='int',date=date):
                 if project[1]==parentId:
                     ret.append(project)
 
         if childs:
-            for project in self.getProjectFields('xdata_05',sort='int'):
+            for project in self.getProjectFields('xdata_05',sort='int',date=date):
                 searchStr=childs+"(\..*)"
                 if re.match(searchStr,project[1]):
                     
@@ -403,7 +660,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                         ret.append(project)
         return ret
     
-    def getProjectFields(self,fieldName,folder=None,sort=None):
+    def getProjectFields(self,fieldName,date=None,folder=None,sort=None):
         """getListofFieldNames"""
         ret=[]
     
@@ -412,8 +669,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                 
         for object in objects:
             obj=object[1]
-
-            if not getattr(obj,'invisible',None):
+            obj=obj.getActualVersion(date)
+            if obj and (not getattr(obj,'invisible',None)):
                 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
@@ -436,7 +693,7 @@ class MPIWGRoot(ZSQLExtendFolder):
     def showNewProjects(self):
         projects=[]
         for objs in self.getProjectFields('WEB_title_or_short'): # Get all Projets
-            if objs[0].xdata_05[0] == "":
+            if objs[0].xdata_05 and (objs[0].xdata_05[0] == ""):
                 
                 projects.append(objs)
                 
@@ -444,10 +701,11 @@ class MPIWGRoot(ZSQLExtendFolder):
     
         
     manage_options = Folder.manage_options+(
-        {'label':'Update Personal Homepages','action':'updateHomepages'},
+        {'label':'Update personal homepages','action':'updateHomepages'},
+        {'label':'Reindex catalogs','action':'reindexCatalogs'},
         {'label':'Main config','action':'changeMPIWGRootForm'},
-        {'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'},
-        {'label':'Store Historical Persons','action':'storeHistoricalPersons'},
+        #{'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'},
+        #{'label':'Store Historical Persons','action':'storeHistoricalPersons'},
         )
     
     def importNamesForm(self):
@@ -479,9 +737,165 @@ class MPIWGRoot(ZSQLExtendFolder):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
-    def updateHomepages(self,RESPONSE):
-        """lege members an"""
+    def updatePublicationDB(self,personId=None):
+        """updates the publication db, i.e. copy year into the main table"""
+        
+        if personId:
+            founds = self.ZSQLInlineSearch(_table="publications",id_main=personId)
+        else:
+            founds = self.ZSQLInlineSearch(_table="publications")
+            
+        for found in founds:
+                        
+            if found.id_institutsbibliographie and (not found.id_institutsbibliographie =="") and (not found.id_institutsbibliographie =="0"):
+                
+                entries = self.ZSQLInlineSearch(_table="institutsbiblio",id=found.id_institutsbibliographie)
+                for entry in entries:
+                    self.ZSQLChange(_table='publications',_identify='oid=%s' % found.oid,year=entry.year,referencetype=entry.reference_type)
+                    
+            if found.id_gen_bib and (not found.id_gen_bib ==""):
+                entries = self.ZSQLInlineSearch(_table="bibliography",id=found.id_gen_bib)
+                for entry in entries:
+                    self.ZSQLChange(_table='publications',_identify='oid=%s' % found.oid,year=entry.year,referencetype=entry.reference_type)
+                    
+        return True        
+        
+    def updateHomepages(self,RESPONSE=None):
+        """ update"""
+        
+        RESPONSE.setHeader('Content-type', 'text/html')
+        RESPONSE.write("<html><body>\n")
+        url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=20000&-findall"
+        dom = NonvalidatingReader.parseUri(url)
+        #fh=urllib.urlopen(url)
+        #dom=xml.dom.minidom.parse(fh)
+        RESPONSE.write("got_xml_File\n")
+        
+        
+        memberFolder=getattr(self,'members')
+        members=memberFolder.ZopeFind(memberFolder,obj_metatypes=["MPIWGStaff"])
+        
+        memberList=[x[0] for x in members]
+        #print dom
+        #ctx=Context(dom,processorNss={EMPTY_NAMESPACE:'http://www.filemaker.com/fmpdsoresult'})
+        # Evaluate(u".//dn:ROW",contextNode=dom,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
+        #print dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
+        for row in dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}):
+        
+            username=getTextFromNode(row.xpath('./dn:username',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            id=getTextFromNode(row.xpath('./dn:ID',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            name=getTextFromNode(row.xpath('./dn:Name',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            vorname=getTextFromNode(row.xpath('./dn:Vorname',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            title=getTextFromNode(row.xpath('./dn:Title',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            position=getTextFromNode(row.xpath('./dn:Position',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            e_mail=getTextFromNode(row.xpath('./dn:e_mail',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            e_mail_p=getTextFromNode(row.xpath('./dn:e_mail_p',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            date_from=getTextFromNode(row.xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            date_to=getTextFromNode(row.xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            abteilung=getTextFromNode(row.xpath('./dn:Abteilung',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            heimat_inst=getTextFromNode(row.xpath('./dn:heimat_inst',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            funded_by=getTextFromNode(row.xpath('./dn:funded_by',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            e_mail2=getTextFromNode(row.xpath('./dn:e_mail2',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            publish_the_data=getTextFromNode(row.xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            stay_at_mpiwg=getTextFromNode(row.xpath('./dn:stay_at_mpiwg',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+            #cwNode=row.xpath('./dn:current_work.current',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]
+            cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
+            if cw:
+                txt=getTextFromNode(cw[0])
+            else:
+                txt=""
+           
+            #cwNode=row.xpath('.//dn:current_work.publish',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]
+            cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
+
+            if cw:
+                txt_p=getTextFromNode(cw[0])
+            else:
+                txt_p=""
+             
+            project=getattr(self,'members')
+            
+            if not (username in memberList):#neuer eintrag
+                
+                try:
+                    newObj=MPIWGStaff.MPIWGStaff(str(username),name.encode('utf-8'),vorname.encode('utf-8'))
+                    memberFolder._setObject(str(username),newObj)
+                    RESPONSE.write("<p>new:%s</p>\n"%username.encode('utf-8'))
+                    obj=getattr(memberFolder,username)
+                    ret=obj.createNewDBEntry(publish_the_data,id,name,
+                                          vorname,username,title,position,e_mail,
+                                          e_mail_p,date_from,date_to,
+                                          abteilung,heimat_inst,funded_by,
+                                          e_mail2,txt,txt_p)
+                    RESPONSE.write("""<p>%s</p>"""%ret[1].encode('utf-8'))
+                except:
+                    RESPONSE.write("<p>ERROR:%s %s %s</p>\n"%(username.encode('utf-8'),name.encode('utf-8'),vorname.encode('utf-8')))
+                    RESPONSE.write("<p>      : %s %s"%sys.exc_info()[:2])
+            else:
+                RESPONSE.write("<p>update:%s</p>\n"%username.encode('utf-8'))
+                
+                xquery=".//dn:ROW[dn:username='%s']"%username
+                results=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
+                if len(results)>1:
+                    RESPONSE.write("<p>WARNING (update): username %s not unique</p>\n"%username.encode('utf-8'))
+                    xquery=".//dn:ROW[dn:publish_the_data='yes' and dn:username='%s']"%username
+                    rd=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) 
+                    if len(rd)>1:#mehrere published
+                        RESPONSE.write("<p>ERROR (update): username %s not unique and more then one date  set to be published</p>\n"%username.encode('utf-8'))
+#                    elif len(rd)==1:#nur einer published, kein published dann mache nichts
+#                        publish_the_data=getTextFromNode(rd[0].xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+#                        date_from=getTextFromNode(rd[0].xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+#                        date_to=getTextFromNode(rd[0].xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
+#              
+
+                obj=getattr(memberFolder,username)
+                
+                done= obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data,
+                                   date_from=date_from,
+                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
+                if not done and (publish_the_data=='yes'):
+                        
+                    ret=obj.createNewDBEntry(publish_the_data,id,name,
+                                          vorname,username,title,position,e_mail,
+                                          e_mail_p,date_from,date_to,
+                                          abteilung,heimat_inst,funded_by,
+                                          e_mail2,txt,txt_p)
+                    if not ret[0]:
+
+                            RESPONSE.write("<p>Error: %s</p>\n"%repr(ret[1]))
+                    else:
+                        RESPONSE.write("<p>New: %s</p>\n"%repr(ret[1]))
+
+        #TODO: reindexCatlogs and updatePublications wieder einbaue
+        #self.reindexCatalogs(RESPONSE)
+    
+        #self.updatePublicationDB()
+ 
+        self.ZSQLResetConnection()
+        RESPONSE.write("<h2>Done</h2></body></html>")
+                   
+        return True
+     
+    def reindexCatalogs(self,RESPONSE=None):
+        """reindex members and project catalog"""
+        
+        
+        try:
+            self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+            self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
+        except:
+            zLOG.LOG("MPIWG Root (updatehomepage)",zLOG.WARNING," %s %s"%sys.exc_info()[:2])
+            
+        
+    
+           
+        if RESPONSE:
+            RESPONSE.redirect('manage_main')
+
+        
         
+    def updateHomepages_old(self,RESPONSE):
+        """lege members an, alte version vollstaendige kopie aller fm-dateien per fm.jar"""
         self.upDateSQL('personalwww.xml')
         founds=self.ZSQLInlineSearch(_table='personal_www',publish_the_data='yes')
         project=getattr(self,'members')
@@ -496,6 +910,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                 except:
                     RESPONSE.write("<p>old:%s (%s,%s)</p>\n"%(found.username,found.name,found.vorname))
 
+                
 
         #delete non existing
 
@@ -512,7 +927,8 @@ class MPIWGRoot(ZSQLExtendFolder):
             pass
         self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
     
-                    
+        self.updatePublicationDB() 
+           
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -526,6 +942,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         #    ret.append(x.title.decode('utf-8'))
 
         for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
+            if x[1].isPublished():
                                ret.append(x[1].title.decode('utf-8'))
             
         ret.sort()
@@ -550,10 +967,11 @@ class MPIWGRoot(ZSQLExtendFolder):
             return entry
 
 
-    def getTree(self):
+    def getTree(self,date=None):
         """generate Tree from project list"""
+
         returnList=[]
-        for project in self.getProjectFields('xdata_05',sort="int"): # get Projects sorted by xdata_05
+        for project in self.getProjectFields('xdata_05',sort="int",date=date): # get Projects sorted by xdata_05
 
             for idNr in project[1].split(";"): # more than one number
                 if not idNr=="":
@@ -563,11 +981,65 @@ 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','6':'Research Network'} 
+                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])
 
+            if self.REQUEST.has_key('date'):
+                ret+="""<a href="%s?date=%s">%s</a>"""%(self.generateUrlProject(element[3].absolute_url())+"/index.html",self.REQUEST['date'],element[3].getContent('WEB_title'))
+            else:
+                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
@@ -576,6 +1048,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                 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'))
+            if element[3].getContent('xdata_05') == "6":
+                return """<h2 class="hier"><a href="%s">Research Network "History of Scientific Objects": %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'))
 
@@ -626,8 +1100,9 @@ class MPIWGRoot(ZSQLExtendFolder):
 
         
         for idNr in form.keys():
-            fields[int(idNr)][3].xdata_05=form[idNr]
-
+            if not (fields[int(idNr)][3].xdata_05==form[idNr]):
+                fields[int(idNr)][3].xdata_05=form[idNr]
+                fields[int(idNr)][3].copyObjectToArchive()
         
 
         if RESPONSE is not None:
@@ -697,9 +1172,9 @@ class MPIWGRoot(ZSQLExtendFolder):
                     except:
                         proj=None
 
-                if proj:
-		    if person =="Otto Sibum" : person="H. Otto Sibum"
-		    if person =="Norton Wise" : person="M. Norton Wise"
+                if proj and (proj[0].getObject().isPublished()):
+                    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:
@@ -707,17 +1182,17 @@ class MPIWGRoot(ZSQLExtendFolder):
                     ret.append("%s"%person)
         return string.join(ret,";")
                          
-    def getProjectsOfMembers(self):
+    def getProjectsOfMembers(self,date=None):
         """give tuple member /projects"""
         ret=[]
         members=self.getAllMembers()
         #return str(members)
         for x in members:
-            ret+=self.getProjectsOfMember(name=x)
+            ret+=self.getProjectsOfMember(name=x,date=date)
             
         return ret
 
-    def getProjectsOfMember(self,name=None,email=None):
+    def getProjectsOfMember(self,name=None,email=None,date=None):
         """get project of a member"""
         def sortP(x,y):
             """sort by sorting number"""
@@ -728,8 +1203,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)
+            
+            members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)
             name =  members[0][1].title.decode('utf-8')
 
         y=name
@@ -746,8 +1221,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         if proj:
             proj2=[]
             for x in proj:
-
-                if not getattr(x.getObject(),'invisible',None):
+                if (not getattr(x.getObject(),'invisible',None)) and (getattr(x.getObject(),'archiveTime','')==''):
                     if not((splitted[1]==" Christoph") and (splitted[0]=="Hoffmann") and (str(x.WEB_title).find('Einstein')>0)):
                        proj2.append(x)
 
@@ -758,8 +1232,8 @@ class MPIWGRoot(ZSQLExtendFolder):
         if proj:
             names=[x.WEB_title for x in proj]
             for x in proj:
-
-                if not x.WEB_title in names:
+                
+                if (not x.WEB_title in names) and (getattr(x.getObject(),'archiveTime','')==''):
                     proj2.append(x)
 
 
@@ -843,9 +1317,6 @@ class MPIWGRoot(ZSQLExtendFolder):
         
         return (fieldname in checkFields)
 
-
-    
-    
         
 def manage_addMPIWGRootForm(self):
     """form for adding the root"""
@@ -862,12 +1333,258 @@ def manage_addMPIWGRoot(self,id,title,co
         RESPONSE.redirect('manage_main')
         
 
+class MPIWGProject_publication(SimpleItem):
+    """publications object fuer project"""
+
+    meta_type="MPIWGProject_publication"
+
+    def editPublication(self,text=None,RESPONSE=None):
+        """edit a publication"""
+
+        if (not text):
+            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_publicationForm.zpt')).__of__(self)
+            return pt()
+
+       
+        self.text=text[0:]
+
+        if RESPONSE:
+            RESPONSE.redirect("../managePublications")
+            
+class MPIWGProject_image(Image):
+    """Images for Projects"""
+
+    meta_type="MPIWGProject_image"
+
+    def showImage(self,imageUrl=None):
+        """show Images at an extra page"""
+        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 editImage(self,file=None,caption=None,RESPONSE=None):
+        """edit the Image"""
+        if (not file) and (not caption):
+            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_imageForm.zpt')).__of__(self)
+            return pt()
+
+        if file and (not file.filename.lstrip().rstrip()==""):
+            self.manage_upload(file)
+
+        if caption:
+            self.caption=caption[0:]
+
+        if RESPONSE:
+            RESPONSE.redirect("../manageImages")
+
 class MPIWGProject(CatalogAware,Folder):
     """Class for Projects"""
 
+
+    security=ClassSecurityInfo()
     meta_type='MPIWGProject'
     default_catalog='ProjectCatalog'
+
+    def sortedByPlace(self,metatype):
+        """find metatype and sort by place"""
+        def sort(x,y):
+            return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))
+
+        founds=self.ZopeFind(self,obj_metatypes=[metatype]);
+        
+        founds.sort(sort)
+        
+        return founds
+    
+
+    def copyPublicationsToList(self,RESPONSE=None):
+        """copy publications in to list"""
+
+        publicationTxt=self.getContent('WEB_related_pub')
+
+        pubSplits=publicationTxt.split("<p>")
+
+        for pubSplit in pubSplits:
+            pubSplit=pubSplit.replace("</p>","")
+            self.addPublication(pubSplit)
+
+        if RESPONSE:
+            RESPONSE.redirect('managePublications')
+        
     
+    def copyImageToMargin(self,RESPONSE=None):
+        #TODO: copy more than one image
+        """copy inline images to marginal images"""
+        self.getContent('WEB_project_description',filter='yes')
+
+        filename=self.imageURL.split("/")[-1]
+        #lege neues images object an, mit leerem bild
+
+        if self.ZopeFind(self,obj_ids=[filename]):
+            #existiert das bild schon, dann neueun filenamen
+            filename="project_image_"+filename
+            
+        self.addImage(None,self.imagecap,filename=filename)
+        #hole die bilddaten aus der url
+        url=self.absolute_url()+"/"+self.imageURL
+        #url=self.absolute_url()+"/"+filename
+        
+        try:#relative url
+            data=urllib.urlopen(url).read()
+        except:
+            try:#absolute
+                data=urllib.urlopen(self.imageURL).read()
+            except:
+                zLOG.LOG("MPIWG Project",zLOG.ERROR,"can't open: %s"%url)
+            
+        obj=getattr(self,filename)
+        obj.update_data(data)
+        
+        if RESPONSE:
+            RESPONSE.redirect('manageImages')
+            
+    def manageImages(self,imageName=None,op=None):
+        """managage images"""
+
+
+        if imageName and op:
+            if op=='up':
+                images=self.getImages()
+                for image in images:
+                    if image[0]==imageName:
+                        nr=images.index(image)
+                        if not nr==0:
+                            images[nr-1][1].place+=1
+                            images[nr][1].place-=1
+                        pass
+            elif op=='down':
+                images=self.getImages()
+                for image in images:
+                    if image[0]==imageName:
+                        nr=images.index(image)
+                        if not (nr==len(images)-1):
+                            images[nr+1][1].place-=1
+                            images[nr][1].place+=1
+                        pass
+
+
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_manageImagesForm.zpt')).__of__(self)
+        return pt()
+
+    def managePublications(self,pubName=None,op=None):
+        """managage images"""
+
+
+        if pubName and op:
+            if op=='up':
+                publications=self.getPublications()
+                for publication in publications:
+                    if publication[0]==pubName:
+                        nr=publications.index(publication)
+                        if not nr==0:
+                            publications[nr-1][1].place+=1
+                            publications[nr][1].place-=1
+                        pass
+            elif op=='down':
+                publications=self.getPublications()
+                for publication in publications:
+                    if publication[0]==pubName:
+                        nr=publications.index(publication)
+                        if not (nr==len(publications)-1):
+                            publications[nr+1][1].place-=1
+                            publications[nr][1].place+=1
+                        pass
+
+
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_managePublicationsForm.zpt')).__of__(self)
+        return pt()
+
+    def getPublications(self):
+        """get all Publications"""
+        def sort_images(x,y):
+            return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))
+
+        publications=self.ZopeFind(self,obj_metatypes=['MPIWGProject_publication'])
+        
+        publications.sort(sort_images)
+        return publications
+
+    def addPublication(self,text,RESPONSE=None):
+        """add an MPIWG_Publication"""
+
+        name="publication_"+str(self.getLastPublicationNumber()+1)
+        
+        newPublication=MPIWGProject_publication(name)
+
+        self._setObject(name,newPublication)
+        obj=getattr(self,name)
+        obj.text=text[0:]
+        obj.enabled=True;
+        obj.place=self.getLastPublicationNumber()+1
+        obj.id=name
+        
+        if RESPONSE is not None:
+            RESPONSE.redirect('managePublications')
+
+ 
+    def getLastPublicationNumber(self):
+        publications=self.getPublications()
+        
+        if not publications:
+            return 0
+        else:
+            return getattr(publications[-1][1],'place',0)
+        
+    def deletePublication(self,id,RESPONSE=None):
+        """delete Publication id"""
+        self.manage_delObjects([id])
+        if RESPONSE:
+            RESPONSE.redirect('managePublications')
+
+    def getImages(self):
+        """get all Images"""
+        def sort_images(x,y):
+            return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))
+
+        images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image'])
+        
+        images.sort(sort_images)
+        return images
+
+    def getLastImageNumber(self):
+        images=self.getImages()
+        
+        if not images:
+            return 0
+        else:
+            return getattr(images[-1][1],'place',0)
+        
+    def deleteImage(self,id,RESPONSE=None):
+        """delete Image id"""
+        self.manage_delObjects([id])
+        if RESPONSE:
+            RESPONSE.redirect('manageImages')
+
+    def addImage(self,fileHd,caption,RESPONSE=None,filename=None):
+        """add an MPIWG_Project_image"""
+
+        if not filename:
+            filename=fileHd.filename
+
+        if not fileHd:
+            fileHd=file(os.path.join(package_home(globals()),'blank.gif'))
+            
+        newImage=MPIWGProject_image(filename,filename,fileHd)
+
+        self._setObject(filename,newImage)
+        obj=getattr(self,filename)
+        obj.caption=caption[0:]
+        obj.enabled=True;
+        obj.place=self.getLastImageNumber()+1
+        
+        if RESPONSE is not None:
+            RESPONSE.redirect('manageImages')
+
     def PrincipiaSearchSource(self):
         """Return cataloguable key for ourselves."""
         return str(self)
@@ -883,6 +1600,47 @@ class MPIWGProject(CatalogAware,Folder):
             return retTXT%(s,s)
         else:
             return ""
+
+    def getActualVersion(self,date=None):
+        """actuelle version"""
+        def sortProjectsByTime(x,y):
+            return cmp(x[1].archiveTime,y[1].archiveTime)
+
+        if not date:
+            if self.isActual():
+                return self
+            else:
+                return None
+
+        #suche ob aeltere versionen vorhanden sind
+
+        finds=self.ZopeFind(self,obj_metatypes=['MPIWGProject'])
+        if not finds: #wenn nicht dann teste ob die aktuelle version schon existiert hat.
+            ad=getattr(self,'creationTime','20050101000000')
+            if int(date)>int(ad):
+                return self
+            else:
+                return None
+
+
+        else:
+            finds.sort(sortProjectsByTime)
+
+        for find in finds:
+            #gehe durch die alten Projekte und finde das entprechende
+            if (int(find[1].archiveTime) > int(date)) and (int(date)>int(getattr(find[1],'creationTime','20050101000000'))):
+                return find[1]
+
+        #kein passendes gefunden, dann teste ob das aktuelle in frage kommt
+        ad=getattr(self,'creationTime','20050101000000')
+        
+        if int(date)>int(ad):
+        
+            return self
+        else:
+            return None
+          
+        
     def isActual(self):
         """gibt 1 zurueck wenn aktuell, 0 sonst"""
         actualTime=time.localtime()
@@ -959,16 +1717,17 @@ class MPIWGProject(CatalogAware,Folder):
             RESPONSE.redirect('manage_main')
             
     def __init__(self, id, argv=None):
-        """initieriere classe"""
-        
+        """initiere classe"""
+
+        self.creationTime=time.strftime("%Y%m%d%H%M%S",time.localtime())[0:]
         self.id=id
         self.title=id
         if argv:
             for arg in definedFields:
-		try:
-                	setattr(self,arg,argv[arg])
-		except:
-			setattr(self,arg,"")
+                try:
+                        setattr(self,arg,argv[arg])
+                except:
+                        setattr(self,arg,"")
         else:
             for arg in definedFields:
                 setattr(self,arg,'')
@@ -989,36 +1748,59 @@ class MPIWGProject(CatalogAware,Folder):
 
         def sortProjectsByTime(x,y):
             return cmp(x[1].archiveTime,y[1].archiveTime)
-        
+
+        #suche ob aeltere versionen vorhanden sind
+
         finds=self.ZopeFind(self,obj_metatypes=['MPIWGProject'])
-        if not finds:
-            return self.absolute_url()
+        if not finds: #wenn nicht dann teste ob die aktuelle version schon existiert hat.
+            ad=getattr(self,'creationTime','20050101000000')
+            if int(date)>int(ad):
+                return self.REQUEST['URL1']+"/"+self.getId()
+            else:
+                return self.REQUEST['URL1']+"/no_project"
+
+
         else:
             finds.sort(sortProjectsByTime)
 
         for find in finds:
-            if int(find[1].archiveTime) > int(date):
-                return find[1].absolute_url()
+            #gehe durch die alten Projekte und finde das entprechende
+            if (int(find[1].archiveTime) > int(date)) and (int(date)>int(getattr(find[1],'creationTime','20050101000000'))):
+                return self.REQUEST['URL1']+"/"+find[1].getId()
 
-        return self.absolute_url()
+        #kein passendes gefunden, dann teste ob das aktuelle in frage kommt
+        ad=getattr(self,'creationTime','20050101000000')
         
-            
-            
-    def index_html(self):
-        """show homepage"""
+        if int(date)>int(ad):
         
-        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']))
+            return self.REQUEST['URL1']+"/"+self.getId()
         else:
-            self.REQUEST.SESSION['MPI_redirected']=None
+            return self.REQUEST['URL1']+"/no_project"
         
-	ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])
-
+            
+    def no_project(self):
+        """warnung: project noch nicht existent"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','no_project')).__of__(self)
+        return pt()
+    
+    def index_html(self,request=True,context=None):
+        """show homepage"""
+        if not context:
+            context=self
+        if request:
+            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'])+"?date="+self.REQUEST['date'])
+            else:
+                self.REQUEST.SESSION['MPI_redirected']=None
+        
+        #ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])
+        ext=getattr(self,"project_main",None)
         if ext:
-            return getattr(self,ext[0][1].getId())()
+            return getattr(self,ext.getId())()
+
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','project_main')).__of__(context)    
 
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','project_main')).__of__(self)
         return pt()
 
     
@@ -1039,7 +1821,7 @@ class MPIWGProject(CatalogAware,Folder):
         """get attrbiute"""
         return getattr(self,field)
 
-    def getContent(self,field):
+    def getContent(self,field,filter=None):
         """Inhalt des Feldes"""
         
         text=u''
@@ -1071,12 +1853,53 @@ class MPIWGProject(CatalogAware,Folder):
         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 (len(text5)>4) and (not text5[0:3]=='<p>') and (field=='WEB_project_description'):
+            text5= "<p>"+text5+"</p>"
 
 
-        return text2.encode('utf-8')
+        #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"""
@@ -1084,12 +1907,100 @@ class MPIWGProject(CatalogAware,Folder):
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_index.zpt')).__of__(self)
         return pt()
 
+    def saveFromPreview(self):
+        """save content aus preview"""
+        self.WEB_project_description=self.previewTemplate.WEB_project_description[0:]
+        self.REQUEST.RESPONSE.redirect("./index.html")
+        
+    def saveEditedContent(self,kupu=None,preview=None):
+        """save Edited content"""
+
+        if preview:
+            kupu=preview
+        #find content of body tags
+        start=kupu.find("<body>")
+        end=kupu.find("</body>")
+        newcontent= kupu[start+6:end]
+        
+        if preview:
+            
+            return self.preview(newcontent)
+
+        self.copyObjectToArchive()
+        self.WEB_project_description=newcontent[0:]
+
+        self.REQUEST.RESPONSE.redirect("./index.html")
+        
+        return True
+
+    security.declareProtected('View management screens','edit')
+    def edit(self,western=None):
+        """Edit pages"""
+        if western:
+            self.REQUEST.RESPONSE.setCookie("MP_debug_code","western",path="/")
+
+            
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProjectNeu.zpt')).__of__(self)
+        return pt()
+    
+    edit_MPIWGProject_main = PageTemplateFile('zpt/edit_MPIWGProject_main', globals())
+
+    def getPathStyle(self, path, selected, style=""):
+        """returns a string with the given style + 'sel' if path == selected."""
+
+        if path == selected:
+            return style + 'sel'
+        else:
+            return style    
+
+    def preview(self,description):
+        """preview"""
+        tmpPro=getattr(self,"previewTemplate",None)
+        if not tmpPro:
+            tmpPro=MPIWGProject("previewTemplate")
+            self._setObject("previewTemplate",tmpPro)
+        for field in definedFields:
+            setattr(tmpPro,field,getattr(self,field))
+        tmpPro.WEB_project_description=description[0:]
+        tmpPro.invisible=True
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','previewFrame.zpt')).__of__(self)
+        return pt()
+
+        #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+"/previewTemplate")
+        
+
+    def getWebProject_description(self):
+        """get description"""
+        debug= self.REQUEST.cookies.get("MP_debug_code",None)
+        
+        if debug and debug=="western":
+            return """
+            <html>
+            <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+            </head>
+            <body>%s
+            </html></body>
+            """%self.WEB_project_description[0]
+        
+        return """
+            <html>
+            <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+            </head>
+            <body>%s
+            </html></body>
+            """%self.getContent('WEB_project_description')
+        
+        
+        
     def editMPIWGProjectForm(self):
         """editform"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProject.zpt')).__of__(self)
         return pt()
 
-    def editMPIWGProject(self,RESPONSE=None):
+    
+    def editMPIWGProject(self,RESPONSE=None,fromEdit=None):
         """edit the project and archive the old version"""
         
         self.copyObjectToArchive() # archive the object
@@ -1100,17 +2011,29 @@ class MPIWGProject(CatalogAware,Folder):
                 
                 setattr(self,x,[self.REQUEST[x].decode('utf-8')])
 
+        if fromEdit and (RESPONSE is not None):
+            RESPONSE.redirect('./editMPIWGBasisEditor')
+
+        else:
+            if RESPONSE is not None:
+                RESPONSE.redirect('manage_main')
+
 
-        
-        if RESPONSE is not None:
-            RESPONSE.redirect('manage_main')
 
+    security.declareProtected('View managment screens','editMPIWGDisciplinesThemesEditor')
+    def editMPIWGDisciplinesThemesEditor(self):
+        """edit from edit"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGDisciplinesThemesNeu.zpt')).__of__(self)
+        return pt()
+        
+    
     def editMPIWGDisciplinesThemesForm(self):
         """edit the disciplines and themes Form"""
+     
         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):
+    def editMPIWGDisciplinesThemes(self,disciplines=None,themes=None,RESPONSE=None,fromEdit=None):
         """edit disciplin and form"""
         if disciplines:
             if type(disciplines) is StringType:
@@ -1126,9 +2049,13 @@ class MPIWGProject(CatalogAware,Folder):
                 self.xdata_10=string.join(themes,";")
         else:
             self.xdata_10=""
-            
-        if RESPONSE is not None:
-            RESPONSE.redirect('manage_main')
+
+        if fromEdit and (RESPONSE is not None):
+            RESPONSE.redirect('./editMPIWGDisciplinesThemesEditor')
+
+        else:
+            if RESPONSE is not None:
+                RESPONSE.redirect('manage_main')
 
 
     def isChecked(self,wert,list):
@@ -1140,16 +2067,27 @@ class MPIWGProject(CatalogAware,Folder):
         else:
             splitted=list[0].split(";")
 
-
+        splitted=[y.rstrip().lstrip() for y in splitted]
+        
         for x in splitted:
+            x=re.sub(r"[^A-z ]","",x)
             if (not x==u'') and x in wert:
                 return 1
         return 0
-    
+
+    security.declareProtected('View management screens','editMPIWGBasisEditor')
+    def editMPIWGBasisEditor(self):
+        """editform"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasisNeu.zpt')).__of__(self)
+        return pt()
+
+    security.declareProtected('View management screens','editMPIWGBasisForm')
     def editMPIWGBasisForm(self):
         """editform"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)
         return pt()
+
+    security.declareProtected('View management screens','editMPIWGRelatedPublicationsForm')
     def editMPIWGRelatedPublicationsForm(self):
         """Edit related Publications"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)
@@ -1207,6 +2145,6 @@ def manage_addMPIWGProject(self,id,RESPO
 
     self._setObject(id,newObj)
 
-
+    
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')