--- MPIWGWeb/MPIWGProjects.py 2005/12/22 20:33:45 1.47.2.43 +++ MPIWGWeb/MPIWGProjects.py 2006/04/21 17:58:45 1.47.2.51 @@ -765,7 +765,7 @@ class MPIWGRoot(ZSQLExtendFolder): 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=20000&name=Laubichler&-find" + url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=20000&-findall" dom = NonvalidatingReader.parseUri(url) #fh=urllib.urlopen(url) #dom=xml.dom.minidom.parse(fh) @@ -826,7 +826,7 @@ class MPIWGRoot(ZSQLExtendFolder): vorname,username,title,position,e_mail, e_mail_p,date_from,date_to, abteilung,heimat_inst,funded_by, - e_mail2,txt,txt_p) + e_mail2,txt,txt_p,stay_at_mpiwg) 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'))) @@ -852,26 +852,27 @@ class MPIWGRoot(ZSQLExtendFolder): done= obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data, date_from=date_from, - date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position) - if not done and (publish_the_data=='yes'): - + date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung) + if not done and (publish_the_data=='yes'): + ret=obj.createNewDBEntry(publish_the_data,id,name, vorname,username,title,position,e_mail, e_mail_p,date_from,date_to, abteilung,heimat_inst,funded_by, - e_mail2,txt,txt_p) + e_mail2,txt,txt_p,stay_at_mpiwg) if not ret[0]: - RESPONSE.write("Error: %s
\n"%repr(ret[1])) - else: - RESPONSE.write("New: %s
\n"%repr(ret[1])) + RESPONSE.write("Error: %s
\n"%repr(ret[1])) + else: + RESPONSE.write("New: %s
\n"%repr(ret[1])) #TODO: reindexCatlogs and updatePublications wieder einbaue #self.reindexCatalogs(RESPONSE) - #self.updatePublicationDB() - - RESPONSE.write("