--- MPIWGWeb/MPIWGProjects.py 2004/07/29 16:39:20 1.18
+++ MPIWGWeb/MPIWGProjects.py 2004/09/30 20:00:40 1.31
@@ -72,6 +72,13 @@ class MPIWGRoot(ZSQLExtendFolder):
folders=['MPIWGProject','Folder']
meta_type='MPIWGRoot'
+ def patchProjects(self,RESPONSE):
+ """patch"""
+ projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'])
+ for project in projects:
+ project[1].WEB_project_description[0]=project[1].WEB_project_description[0].replace("/CD/projects/einstein/","")
+ RESPONSE.write("
%s
\n"%project[0])
+
def replaceNotEmpty(self,format,field):
"""replace not empty"""
if field and (not field==''):
@@ -79,25 +86,33 @@ class MPIWGRoot(ZSQLExtendFolder):
else:
return ""
+
+ def redirectIndex_html(self,request):
+ #return request['URL1']+'/index_html'
+ return urllib.urlopen(request['URL1']+'/index_html').read()
+
+
def formatBibliography(self,here,found):
"""format"""
return formatBibliography(here,found)
- def getValue(self,field):
+ def getValue(self,fieldStr):
"""Inhalt des Feldes"""
-
- if type(field)==StringType:
- try:
- if field[len(field)-1]==";":
- field=field[0:len(text)-1]
- except:
- """nothing"""
-
- return field.encode('utf-8')
+ if type(fieldStr)==StringType:
+ field=fieldStr
else:
- return field[0].encode('utf-8')
+ field=fieldStr[0]
+ try:
+ if field[len(field)-1]==";":
+ field=field[0:len(field)-1]
+ except:
+
+ """nothing"""
+ field=re.sub(r';([^\s])','; \g<1>',field)
+ return field.encode('utf-8')
+
def sortedNames(self,list):
@@ -360,14 +375,14 @@ class MPIWGRoot(ZSQLExtendFolder):
splitted=line.split(",")
- print splitted
+ # print splitted
if not (splitted[0]==""):
newObj=MPIWGStaff.MPIWGStaff(splitted[0],splitted[1],splitted[2])
try:
project._setObject(splitted[0],newObj)
- print "done:",splitted[0]
+ #print "done:",splitted[0]
except:
print "not done:",splitted[0]
@@ -426,13 +441,19 @@ class MPIWGRoot(ZSQLExtendFolder):
def formatElementForOverview(self,element):
"""format the element for output in overview"""
if element[0]==1: #department
- return "Department %s: %s
"%(element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))
+ #print element[3].getContent('xdata_05')
+ if element[3].getContent('xdata_05') == "4":
+ return """"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+ if element[3].getContent('xdata_05') == "5":
+ return """"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
+
+ return """"""%(element[3].absolute_url()+"/index.html",element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))
elif element[0]==2: #mainprojects
- return "%s
"%(element[3].getContent('WEB_title'))
+ return """
"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
elif element[0]==3:
- return "
%s"%(element[3].getContent('WEB_title'))
+ return """
%s
"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
def changePosition(self,treeId,select,RESPONSE=None):
"""Change Postion Entry"""
@@ -516,7 +537,7 @@ class MPIWGRoot(ZSQLExtendFolder):
if proj:
#ret.append("%s"%(proj[0].absolute_url,person.encode('utf-8')))
- ret.append("%s"%('members/'+proj[0].id,person))
+ ret.append("%s"%('members/'+proj[0].id+'/index.html',person))
else:
#ret.append("%s"%person.encode('utf-8'))
ret.append("%s"%person)
@@ -532,7 +553,7 @@ class MPIWGRoot(ZSQLExtendFolder):
if len(person)>1: #nicht nur Trennzeichen
splitted=person.split(",")
if len(splitted)==1:
- splitted=person.split(" ")
+ splitted=person.lstrip().rstrip().split(" ")
splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
if splittedNew[0]=='':
del splittedNew[0]
@@ -547,7 +568,7 @@ class MPIWGRoot(ZSQLExtendFolder):
if proj:
#ret.append("%s"%(proj[0].absolute_url,person.encode('utf-8')))
- ret.append("%s"%(proj[0].absolute_url,person))
+ ret.append("%s"%(proj[0].absolute_url+"/index.html",person))
else:
#ret.append("%s"%person.encode('utf-8'))
ret.append("%s"%person)
@@ -578,14 +599,24 @@ class MPIWGRoot(ZSQLExtendFolder):
name = members[0][1].title.decode('utf-8')
y=name
- splitted=y.split(",")
- for s in splitted:
- splitNeu.append("\""+s+"\"")
+ splitted=y.split(",")
+ #XXXX
+ splitNeu=["\'"+splitted[1]+" "+splitted[0]+"\'"]
+
+ #for s in splitted:
+ # splitNeu.append("\""+s+"\"")
search=string.join(splitNeu,' AND ')
-
+
proj=self.ProjectCatalog({'xdata_01':search})
+
if proj:
- proj2=[x for x in proj]
+ proj2=[]
+ 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)
+ proj2.append(x)
# proj2.sort(sortP)
# ret.append((y,proj2))
else:
@@ -611,8 +642,9 @@ class MPIWGRoot(ZSQLExtendFolder):
splitted=name.split(",")
if len(splitted)==1:
- splitted=name.split(" ")
- splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
+ splitted=name.lstrip().rstrip().split(" ")
+ splittedNew=[split.lstrip() for split in splitted]
+
if splittedNew[0]=='':
del splittedNew[0]
search=string.join(splittedNew,' AND ')
@@ -793,17 +825,29 @@ class MPIWGProject(Folder):
text=x.decode('latin-1').encode('utf-8')
#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].encode('utf-8')
+ text=text[0:len(text)-1]
+
+
except:
"""nothing"""
- if (type(text)==StringType) or (type(text)==UnicodeType):
- return text
- else:
- return text[0]
+ 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')
+ #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+"
"
+
+ return text2
def show_html(self):
"""simple index"""
@@ -818,7 +862,7 @@ class MPIWGProject(Folder):
def editMPIWGProject(self,RESPONSE=None):
"""edit the project"""
-
+
#return self.REQUEST
for x in definedFields:
if self.REQUEST.has_key(x):
@@ -916,15 +960,15 @@ def manage_addMPIWGProjectForm(self):
def manage_addMPIWGProject(self,id,RESPONSE=None):
"""method to add a project"""
#print argv
- if self.REQUEST.has_key('fileupload'):
- fileupload=self.REQUEST['fileupload']
- if fileupload:
- file_name=fileupload.filename
- filedata=fileupload.read()
-
- argv=xmlhelper.proj2hash(filedata)
-
- #print argv
+ fileupload=self.REQUEST.get('fileupload',None)
+ if fileupload:
+ print fileupload
+ file_name=fileupload.filename
+ filedata=fileupload.read()
+
+ argv=xmlhelper.proj2hash(filedata)
+
+ #print argv
newObj=MPIWGProject(id,argv)
else:
newObj=MPIWGProject(id)