--- MPIWGWeb/MPIWGProjects.py 2005/10/14 15:21:22 1.47.2.30
+++ MPIWGWeb/MPIWGProjects.py 2005/10/17 10:59:06 1.47.2.34
@@ -4,6 +4,7 @@ for organizing and maintaining the diffe
"""
#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
@@ -296,12 +297,12 @@ class MPIWGRoot(ZSQLExtendFolder):
ids=[int(x.id[1:]) for x in founds]
maximum=max(ids)
- id_raw=self.ZSQLQuery("select nextval('id_raw_test')",debug=debug)
+ id_raw=self.ZSQLQuery("select nextval('id_raw')",debug=debug)
if id_raw:
- self.ZSQLQuery("drop sequence id_raw_test",debug=debug)
+ self.ZSQLQuery("drop sequence id_raw",debug=debug)
- self.ZSQLQuery("create sequence id_raw_test start %i"%(maximum+1),debug=debug)
+ self.ZSQLQuery("create sequence id_raw start %i"%(maximum+1),debug=debug)
def queryLink(self,link):
@@ -761,6 +762,8 @@ class MPIWGRoot(ZSQLExtendFolder):
def updateHomepages(self,RESPONSE=None):
""" update"""
+ #FIXME: seite wird hinter apache mehrfach ausgefŸhrt
+ RESPONSE.setHeader('Content-type', 'text/html')
RESPONSE.write("
\n")
url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=10000&-findall"
dom = NonvalidatingReader.parseUri(url)
@@ -853,13 +856,10 @@ class MPIWGRoot(ZSQLExtendFolder):
self.reindexCatalogs(RESPONSE)
self.updatePublicationDB()
-
- if RESPONSE:
- RESPONSE.redirect('manage_main')
-
-
- return True
+ RESPONSE.write("Done
")
+
+
def reindexCatalogs(self,RESPONSE=None):
"""reindex members and project catalog"""
@@ -1396,6 +1396,7 @@ class MPIWGProject(CatalogAware,Folder):
def copyImageToMargin(self,RESPONSE=None):
+ #TODO: copy more than one image
"""copy inline images to marginal images"""
self.getContent('WEB_project_description',filter='yes')
@@ -1408,8 +1409,17 @@ class MPIWGProject(CatalogAware,Folder):
self.addImage(None,self.imagecap,filename=filename)
#hole die bilddaten aus der url
- data=urllib.urlopen(self.absolute_url()+"/"+self.imageURL).read()
-
+ 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)
@@ -1906,7 +1916,7 @@ class MPIWGProject(CatalogAware,Folder):
return True
- security.declareProtected('View managment screens','edit')
+ security.declareProtected('View management screens','edit')
def edit(self,western=None):
"""Edit pages"""
if western:
@@ -2033,6 +2043,7 @@ class MPIWGProject(CatalogAware,Folder):
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
@@ -2043,13 +2054,13 @@ class MPIWGProject(CatalogAware,Folder):
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)