--- MPIWGWeb/MPIWGProjects.py 2005/05/26 14:37:50 1.47.2.3
+++ MPIWGWeb/MPIWGProjects.py 2005/05/27 09:12:24 1.47.2.6
@@ -168,6 +168,18 @@ class MPIWGRoot(ZSQLExtendFolder):
folders=['MPIWGProject','Folder','ECHO_Navigation']
meta_type='MPIWGRoot'
+ 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"
@@ -661,7 +673,7 @@ class MPIWGRoot(ZSQLExtendFolder):
department=element[3].getContent('xdata_05')
ret+="""
%s: """%(department,departmentName[department])
- ret+="""%s"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+ ret+="""%s"""%(self.generateUrlProject(element[3].absolute_url())+"/index.html",element[3].getContent('WEB_title'))
return ret
def formatElementForOverview(self,element):
@@ -1135,7 +1147,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''
@@ -1167,12 +1179,40 @@ class MPIWGProject(CatalogAware,Folder):
if (text2=='') and (field=='WEB_project_header'):
return self.getContent('WEB_title')
+ if filter:
+ splitted=text2.split("""
""") + if len(splitted)>1: + tmp=splitted[1].split("
") + self.REQUEST.SESSION['image']=tmp[0].split("\"")[1].encode('utf-8') + split2="".join(tmp[1:]) + + text3=splitted[0]+split2 + + splitted=text3.split("""""") + if len(splitted)>1: + tmp=splitted[1].split("
") + self.REQUEST.SESSION['imagecap']=tmp[0].encode('utf-8') + split4="".join(tmp[1:]) + + text5=splitted[0]+split4 + else: + #keine caption + text5=text3 + else: + #kein bild + text5=text2 + else: + text5=text2 + #teste ob WEB_project_description und keine führenden p tags - if (len(text2)>4) and (not text2[0:3]=='') and (field=='WEB_project_description'): - return "
"+text2+"
" + if (len(text5)>4) and (not text5[0:3]=='') and (field=='WEB_project_description'): + return "
"+text5+"
" - return text2.encode('utf-8') + #filter image + + + return text5.encode('utf-8') def show_html(self): """simple index"""