--- MPIWGWeb/MPIWGProjects.py 2008/08/22 06:09:28 1.47.2.87
+++ MPIWGWeb/MPIWGProjects.py 2008/09/02 12:00:06 1.47.2.97
@@ -7,17 +7,18 @@ $author dwinter - last change 26.06.2
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
+from Products.MPIWGBibliography.BibliographyManager import BibliographyManager
from OFS.Image import Image
from Globals import package_home
import urllib
import re
-import os
+import os
from types import *
import logging
import xmlhelper # Methoden zur Verwaltung der projekt xml
from OFS.SimpleItem import SimpleItem
from OFS.Folder import Folder
-
+from OFS.Image import Image
from AccessControl import ClassSecurityInfo
from bibliography import *
import time
@@ -38,7 +39,7 @@ import MPIWGRoot
import MPIWGLink
import MPIWGTemplate
-# die folgenden Klassen sind jetzt in einzelne Files ausgelagert aus KompatibilitŠtsgrŸnden, bleiben die Klassen hier noch drin.
+# die folgenden Klassen sind jetzt in einzelne Files ausgelagert aus Kompatibilitaetsgruenden, bleiben die Klassen hier noch drin.
# Sonst funktionieren die alten Webseiten nicht mehr.
class MPIWGRoot(MPIWGRoot.MPIWGRoot):
@@ -50,21 +51,37 @@ class MPIWGLink(MPIWGLink.MPIWGLink):
class MPIWGTemplate(MPIWGTemplate.MPIWGTemplate):
"""depricated"""
-class MPIWGProject_publication(SimpleItem):
+class MPIWGProject_publication(Folder):
"""publications object fuer project"""
meta_type="MPIWGProject_publication"
- def editPublication(self,text=None,RESPONSE=None):
+ def editPublication(self,text=None,image1=None,image2=None,description=None,RESPONSE=None):
"""edit a publication"""
- if (not text):
+ if (not text) and (not description):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_publicationForm.zpt')).__of__(self)
return pt()
self.text=text[0:]
-
+ self.description=description
+
+ if image1:
+ if hasattr(self,'publicationImage1'):
+ self.publicationImage1.manage_upload(image1)
+ else:
+ nO = Image('publicationImage1','',image1)
+ self._setObject('publicationImage1',nO)
+
+ if image2:
+ if hasattr(self,'publicationImage2'):
+ self.publicationImage2.manage_upload(image2)
+ else:
+ nO = Image('publicationImage2','',image2)
+ self._setObject('publicationImage2',nO)
+
+
if RESPONSE:
RESPONSE.redirect("../managePublications")
@@ -256,7 +273,30 @@ class MPIWGProject(CatalogAware,Folder):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_managePublicationsForm.zpt')).__of__(self)
return pt()
+ def hasExtendedPublicationList(self):
+ """test if extended publication list exists"""
+ if not hasattr(self,"publicationList"):
+ return False
+ else:
+ return True
+
+ def createExtendedPublicationList(self,RESPONSE=None):
+ """erzeuge erweiterte publications liste"""
+ pl = BibliographyManager("publicationList","","institutsbiblio",self.connection_id)
+ self._setObject("publicationList", pl)
+
+
+ zt=ZopePageTemplate('index.html')
+ pl._setObject('index.html',zt)
+ default_content_fn = os.path.join(package_home(globals()),
+ 'zpt/showExtendedProjectBibliography.zpt')
+ text = open(default_content_fn).read()
+ zt.pt_edit(text, 'text/html')
+
+ if RESPONSE:
+ RESPONSE.redirect("managePublications")
+
def getPublications(self):
"""get all Publications"""
def sort_images(x,y):
@@ -551,9 +591,9 @@ class MPIWGProject(CatalogAware,Folder):
def setCompletedAt(self,date):
"""set the date of completion, date should be in the form DD.MM.YYYY or MM.YYYY or YYYY"""
- logging.info("DATE:"+repr(date))
+ #logging.info("DATE:"+repr(date))
transformedDate=self.transformDate(date);
- logging.info("transformed"+repr(transformedDate))
+ #logging.info("transformed"+repr(transformedDate))
if transformedDate is not None:
setattr(self,"completedAt",transformedDate)
return True;
@@ -562,9 +602,9 @@ class MPIWGProject(CatalogAware,Folder):
def setStartedAt(self,date):
"""set the date of start, date should be in the form DD.MM.YYYY or MM.YYYY or YYYY"""
- logging.info("DATE:"+repr(date))
+ #logging.info("DATE:"+repr(date))
transformedDate=self.transformDate(date);
- logging.info("transformed"+repr(transformedDate))
+ #logging.info("transformed"+repr(transformedDate))
if transformedDate is not None:
setattr(self,"startedAt",transformedDate)
return True;
@@ -576,6 +616,12 @@ class MPIWGProject(CatalogAware,Folder):
if date:
return self.reTransformDate(date);
else:
+ # test ob parent abgeschlossen ist
+
+ ct=self.getContexts(parents=self.getContent('xdata_05'),depth=1)
+ if (len(ct)>0): #is there are parent
+
+ return ct[0][0].getCompletedAt()
return '';
def getStartedAt(self):
@@ -848,7 +894,7 @@ class MPIWGProject(CatalogAware,Folder):
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'):
@@ -899,9 +945,9 @@ class MPIWGProject(CatalogAware,Folder):
if (text5=="
") or (text5=="
"):
text5=""
- logging.debug("getcontent: field=%s filter=%s -> %s"%(field,filter,repr(text5)))
- #return unicodify(text5)
- return utf8ify(text5) # return as utf-8 byte string
+ #logging.debug("getcontent: field=%s filter=%s -> %s"%(field,filter,repr(text5)))
+ return unicodify(text5)
+ #return utf8ify(text5) # return as utf-8 byte string
def showImagesOfPage(self,imageUrl=None):
@@ -963,6 +1009,53 @@ class MPIWGProject(CatalogAware,Folder):
else:
return style
+ def getLabel(self):
+ """returns label (or title) of this project"""
+ l = self.getContent('xdata_07')
+ if l:
+ return l
+ l = self.getContent('WEB_title')
+ if l:
+ return l
+ return self.title
+
+ def getBreadcrumbs(self):
+ """return list of breadcrumbs from here to the root"""
+ crumbs = []
+ # skip direct parent Folder /projects/
+ parent = self.aq_parent.aq_parent
+ # get parents breadcrumbs
+ if hasattr(parent, 'getBreadcrumbs'):
+ crumbs = parent.getBreadcrumbs()
+
+ # try to get acquisition URL from parent
+ if hasattr(parent, 'absolute_url'):
+ baseUrl = "%s/%s/"%(parent.absolute_url(), 'projects')
+ else:
+ baseUrl = "/en/research/projects/"
+
+ # add in the internal project hierarchy
+ ct=self.getContexts(parents=self.getContent('xdata_05'))
+ # start with grandparents
+ ct.reverse()
+ for c in ct:
+ label = shortenString(c[0].getLabel(), 13)
+ crumbs.append((label, baseUrl+c[0].getId(), c[0]))
+
+ # add this project
+ crumbs.append((self.getLabel(), baseUrl+self.getId(), self))
+
+ return crumbs
+
+ def getRootProject(self):
+ """returns the current root (=top level) project"""
+ ct=self.getContexts(parents=self.getContent('xdata_05'))
+ if len(ct) > 0:
+ return ct[-1][0]
+ else:
+ return self
+
+
def preview(self,description):
"""preview"""
tmpPro=getattr(self,"previewTemplate",None)
@@ -1014,28 +1107,42 @@ class MPIWGProject(CatalogAware,Folder):
#logging.info("XXXXXXXXXXXXX"+repr(self.responsibleScientistsList))
- keys = [x[1] for x in getattr(self,"responsibleScientistsList",[])]
-
- if key in keys:
+ keys = [unicodify(x[1]) for x in getattr(self,"responsibleScientistsList",[])]
+ #logging.error("RESP. SCIEN:%s"%getattr(self,"responsibleScientistsList",[]))
+ #logging.error("RESP. SCIEN:%s"%unicodify(key))
+
+ if unicodify(key) in keys:
return True
else:
return False
def getPersonKeyList(self):
- """gibt die key Lister der beteiligten Personen zurŸck"""
- return [x[1] for x in getattr(self,'responsibleScientistsList',[])]
-
+ """gibt die key Liste der beteiligten Personen zurŸck (utf8 codiert)"""
+ #logging.error("getPersonKeyList:%s"%getattr(self,'responsibleScientistsList',[]))
+ try:
+ return [utf8ify(x[1]) for x in getattr(self,'responsibleScientistsList',[])]
+ except:
+ return[]
-
+ def myCapitalize(self,txt):
+ """kapitalisiere auch Namen mit -"""
+ splitted=[x.capitalize() for x in txt.split("-")]
+ return "-".join(splitted)
+
def identifyNames(self,nameList):
"""Bekommt eine Komma oder Semikolon getrennte Liste mit Name der Form Vorname MittelName(n) Nachname
und ordnet diese dann Mitarbeiter IDs zu falls es schone eine Liste gibt wird im Projekte gibt wird diese Upgedated.
@param nameList
"""
- nameList=nameList.replace(";",",") # falls ; als Trenner ersetze
- names=nameList.split(",")
+ if nameList.find(";")>-1: # rate Trenner ist ;
+ names=nameList.split(";")
+
+ else:
+ names=nameList.split(",")
+
+ ##nameList=nameList.replace(";",",") # falls ; als Trenner ersetze
returnNamesDict={}
@@ -1051,10 +1158,15 @@ class MPIWGProject(CatalogAware,Folder):
lastname=nameSplitted[0]
#finde Mitarbeiter mit den entsprechenden Name
- logging.info("Search: %s %s %s"%(name,firstname,lastname))
- firstname=firstname.capitalize()
- lastname=lastname.capitalize()
- cataloggedNames=self.MembersCatalog(firstName=firstname,lastName=lastname)
+
+ firstname=self.myCapitalize(firstname).encode('utf-8')
+ lastname=self.myCapitalize(lastname).encode('utf-8')
+ logging.info("Search: %s %s %s"%(name,repr(firstname),repr(lastname)))
+ try:
+ cataloggedNames=self.MembersCatalog({'firstName':firstname,'lastName':lastname})
+ except:
+ cataloggedNames=[]
+ logging.error("ERROR: identifyNames %s %s"%sys.exc_info()[0:2])
#Teste ob die ensprechenden Namen schon der Liste zu geordnet sind
#if not hasattr(self,'responsibleScientistsList'):
@@ -1114,13 +1226,13 @@ class MPIWGProject(CatalogAware,Folder):
keys[nr]=self.REQUEST[key]
- for nr in names.keys():
- tmpList.append((names[nr],keys.get(nr,"")))
+ for nr in names.keys():#schreibe keys und namen in die Liste, stelle ausserdem sicher, dass name unicode
+ tmpList.append((unicodify(names[nr]),unicodify(keys.get(nr,""))))
self.responsibleScientistsList=tmpList
if fromEdit and (RESPONSE is not None):
#RESPONSE.redirect('./editMPIWGBasisEditor')
- return self.editMPIWGBasisEditor(identifiedNames=self.identifyNames(self.REQUEST.get('xdata_01','')))
+ return self.editMPIWGBasisEditor(identifiedNames=self.identifyNames(self.decode(self.REQUEST.get('xdata_01',''))))
else:
if RESPONSE is not None:
@@ -1190,7 +1302,8 @@ class MPIWGProject(CatalogAware,Folder):
if not identifiedNames:
identifiedNames=self.identifyNames(self.getContent('xdata_01'))
# identifiedNames=self.getFullNameEntries()
-
+
+ logging.error("IdentifiedNames: %s"% repr(identifiedNames))
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasisNeu.zpt')).__of__(self)
return pt(identifiedNames=identifiedNames)