--- MPIWGWeb/MPIWGProjects.py 2005/10/13 18:00:36 1.47.2.29
+++ MPIWGWeb/MPIWGProjects.py 2005/10/14 16:41:27 1.47.2.32
@@ -296,12 +296,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):
@@ -536,7 +536,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
@@ -700,10 +700,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):
@@ -744,8 +745,9 @@ class MPIWGRoot(ZSQLExtendFolder):
founds = self.ZSQLInlineSearch(_table="publications")
for found in founds:
-
- if found.id_institutsbibliographie and (not found.id_institutsbibliographie ==""):
+
+ 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)
@@ -757,14 +759,16 @@ class MPIWGRoot(ZSQLExtendFolder):
return True
- def updateHomepage_neu(self,RESPONSE=None):
+ 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)
#fh=urllib.urlopen(url)
#dom=xml.dom.minidom.parse(fh)
-
+ RESPONSE.write("got_xml_File\n")
memberFolder=getattr(self,'members')
@@ -810,8 +814,9 @@ class MPIWGRoot(ZSQLExtendFolder):
project=getattr(self,'members')
if not (username in memberList):#neuer eintrag
+
try:
- newObj=MPIWGStaff.MPIWGStaff(str(username),name,vorname)
+ newObj=MPIWGStaff.MPIWGStaff(str(username),name.encode('utf-8'),vorname.encode('utf-8'))
memberFolder._setObject(str(username),newObj)
RESPONSE.write("new:%s
\n"%username.encode('utf-8'))
obj=getattr(memberFolder,username)
@@ -820,7 +825,7 @@ class MPIWGRoot(ZSQLExtendFolder):
e_mail_p,date_from,date_to,
abteilung,heimat_inst,funded_by,
e_mail2,txt,txt_p)
- RESPONSE.write("""%s
"""%ret[1])
+ RESPONSE.write("""%s
"""%ret[1].encode('utf-8'))
except:
RESPONSE.write("ERROR:%s %s %s
\n"%(username.encode('utf-8'),name.encode('utf-8'),vorname.encode('utf-8')))
RESPONSE.write(" : %s %s"%sys.exc_info()[:2])
@@ -847,11 +852,34 @@ class MPIWGRoot(ZSQLExtendFolder):
date_from=date_from,
date_to=date_to)
+ self.reindexCatalogs(RESPONSE)
+
+ self.updatePublicationDB()
+
+ RESPONSE.write("
Done
")
+
+
+
+ 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])
+
+
+
- return True
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
+
- def updateHomepages(self,RESPONSE):
- """lege members an"""
+
+ 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')
@@ -898,6 +926,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()
@@ -1125,7 +1154,7 @@ class MPIWGRoot(ZSQLExtendFolder):
except:
proj=None
- if proj:
+ 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("%s"%(proj[0].absolute_url,person.encode('utf-8')))