--- MPIWGWeb/MPIWGProjects.py 2007/03/23 14:16:48 1.47.2.70 +++ MPIWGWeb/MPIWGProjects.py 2007/04/18 10:03:13 1.47.2.71 @@ -19,7 +19,7 @@ import string import re import os from types import * -import zLOG +import logging import xmlhelper # Methoden zur Verwaltung der projekt xml from OFS.SimpleItem import SimpleItem from OFS.Folder import Folder @@ -34,12 +34,18 @@ from Ft.Xml.XPath.Context import Context from Ft.Xml.Domlette import NonvalidatingReader,PrettyPrint, Print from Ft.Xml import EMPTY_NAMESPACE import copy +import updatePersonalWWW +import MPIWGStaff definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub'] checkFields = ['xdata_01'] - +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + def getTextFromNode(nodename): nodelist=nodename.childNodes rc = "" @@ -143,7 +149,7 @@ class MPIWGLink(SimpleItem): return obj def getWeight(self): - if self.linkWeight and linkWeight!="": + if self.linkWeight and self.linkWeight!="": return self.linkWeight else: return self.getObj().weight @@ -245,7 +251,7 @@ def manage_addMPIWGTemplateForm(self): from urllib import quote -def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,weight=0,REQUEST=None): +def manage_addMPIWGTemplate(self, MPIWGType,id, text="",title=None,weight=0,REQUEST=None): "Add a Page Template with optional file content." if type(MPIWGType)==StringType: MPIWGTypes=[MPIWGType] @@ -519,9 +525,9 @@ class MPIWGRoot(ZSQLExtendFolder): """updates SQL databases using fm.jar""" fmJarPath=os.path.join(package_home(globals()), 'updateSQL/fm.jar') xmlPath=os.path.join(package_home(globals()), "updateSQL/%s"%fileName) - zLOG.LOG("MPIWG Web",zLOG.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath)) + logger("MPIWG Web",logging.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath)) ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read() - zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret) + logger("MPIWG Web",logging.INFO,"result convert: %s"%ret) return 1 def patchProjects(self,RESPONSE): @@ -690,19 +696,7 @@ class MPIWGRoot(ZSQLExtendFolder): if RESPONSE is not None: RESPONSE.redirect('manage_main') - def getDisciplineList(self): - """get disciplines as list""" - list= self.disciplineList.split("\n") - return [x.rstrip().lstrip() for x in list] - - def getThemeList(self): - """get themes as list""" - list= self.themesList.split("\n") - return [x.rstrip().lstrip() for x in list] - - def test(self): - """test""" - return self.getProjectsByFieldContent('xdata_09',['biology'])[0].absolute_url + def getContexts(self,childs=None,parents=None,depth=None,date=None,onlyActive=True): """childs alle childs, alle parents""" @@ -777,47 +771,21 @@ class MPIWGRoot(ZSQLExtendFolder): manage_options = Folder.manage_options+( - {'label':'Update personal homepages','action':'updateHomepages'}, + {'label':'Update personal homepages','action':'updatePersonalwww_html'}, {'label':'Reindex catalogs','action':'reindexCatalogs'}, {'label':'Main config','action':'changeMPIWGRootForm'}, + {'label':'add e-mails','action':'showNewDBEntries'}, + {'label':'update the institutsbibliography','action':'updateInstitutsbiliography'}, #{'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'}, #{'label':'Store Historical Persons','action':'storeHistoricalPersons'}, ) - def importNamesForm(self): - """Form""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGNamesForm.zpt')).__of__(self) - return pt() - - def importNames(self,fileupload,folderName,RESPONSE=None): - """import komma-sep list email,lastName,firstName""" - project=getattr(self,folderName) - load=fileupload.read() - - for line in load.split('\r'): - - - splitted=line.split(",") - # 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] - except: - zLOG.LOG("MPIWG Web (importNames)",zLOG.INFO,"cannot import: %s"%splitted[0]) - - - if RESPONSE is not None: - RESPONSE.redirect('manage_main') def updatePublicationDB(self,personId=None): - """updates the publication db, i.e. copy year into the main table""" + """updates the publication db, i.e. copy year and type into the main table""" if personId: - founds = self.ZSQLInlineSearch(_table="publications",id_main=personId) + founds = self.ZSQLInlineSearch(_table="publications",key_main=personId) else: founds = self.ZSQLInlineSearch(_table="publications") @@ -835,126 +803,192 @@ class MPIWGRoot(ZSQLExtendFolder): self.ZSQLChange(_table='publications',_identify='oid=%s' % found.oid,year=entry.year,referencetype=entry.reference_type) return True + + def showNewDBEntries(self): + """zeige neue Eintraege in der Datenbank ohne e-mail adressen bzw. fuer die noch kein Object angelegt wurde""" - def updateHomepages(self,RESPONSE=None): - """ update""" + qstr="select * from personal_www where web_object_created='no' and not key=''" + res=self.ZSQLQuery(qstr) - RESPONSE.setHeader('Content-type', 'text/html') - RESPONSE.write("\n") - RESPONSE.write("Update Institutsbibliography\n") - ret=self.upDateSQL('personalwww.xml') - RESPONSE.write("done Insitutsbibliography:%s\n"%ret) - 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) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showNewDBEntries.zpt')).__of__(self) + return pt(newEntries=res) + + def createNewStaffObjects(self): + """create new staff object""" + + memberFolder=getattr(self,'members') + args=self.REQUEST.form + arg_k=args.keys() + arg_k.remove("submit") + ret="" + for key in arg_k: + k=self.urlUnQuote(key) + logging.error("XXXXX %s"%k) + qstr="select * from personal_www where key=%s"%self.ZSQLQuote(k) + res=self.ZSQLQuery(qstr)[0] + if args[key]!="": #email-adresse wurde eingetragen + #create the object + e_mail=args[key] + try: + newObj=MPIWGStaff.MPIWGStaff(e_mail,res.last_name.encode('utf-8'),res.first_name.encode('utf-8'),k) + memberFolder._setObject(e_mail,newObj) + ret+="Created %s \n"%e_mail + created=True + except: - RESPONSE.write("got_xml_File\n") + msg="Cannot create new user %s (%s %s)"%(e_mail,sys.exc_info()[0],sys.exc_info()[1]) + logging.error(msg) + ret+=msg+"\n" + created=False + + if created: + qstr="update personal_www set web_object_created='yes',e_mail='%s' where key=%s"%(e_mail,self.ZSQLQuote(k)) + self.ZSQLQuery(qstr) + return ret + + def generateNewPersonEntry(self,data): + """generate a new person entry for data, neue personen werden zunaechst nur in der datenbank angelegt """ - memberFolder=getattr(self,'members') - members=memberFolder.ZopeFind(memberFolder,obj_metatypes=["MPIWGStaff"]) + #memberFolder=getattr(self,'members') + #create the object - memberList=[x[0] for x in members] - #print dom - #ctx=Context(dom,processorNss={EMPTY_NAMESPACE:'http://www.filemaker.com/fmpdsoresult'}) - # Evaluate(u".//dn:ROW",contextNode=dom,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) - #print dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) - for row in dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}): - - username=getTextFromNode(row.xpath('./dn:username',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - id=getTextFromNode(row.xpath('./dn:ID',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - name=getTextFromNode(row.xpath('./dn:Name',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - vorname=getTextFromNode(row.xpath('./dn:Vorname',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - title=getTextFromNode(row.xpath('./dn:Title',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - position=getTextFromNode(row.xpath('./dn:Position',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - e_mail=getTextFromNode(row.xpath('./dn:e_mail',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - e_mail_p=getTextFromNode(row.xpath('./dn:e_mail_p',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - date_from=getTextFromNode(row.xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - date_to=getTextFromNode(row.xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - abteilung=getTextFromNode(row.xpath('./dn:Abteilung',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - heimat_inst=getTextFromNode(row.xpath('./dn:heimat_inst',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - funded_by=getTextFromNode(row.xpath('./dn:funded_by',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - e_mail2=getTextFromNode(row.xpath('./dn:e_mail2',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - publish_the_data=getTextFromNode(row.xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - stay_at_mpiwg=getTextFromNode(row.xpath('./dn:stay_at_mpiwg',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) - #cwNode=row.xpath('./dn:current_work.current',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0] - cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) - if cw: - txt=getTextFromNode(cw[0]) - else: - txt="" - - #cwNode=row.xpath('.//dn:current_work.publish',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0] - cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) +# try: +# newObj=MPIWGStaff.MPIWGStaff(urllib.quote(data['key']),data['last_name'].encode('utf-8'),data['first_name'].encode('utf-8')) +# memberFolder._setObject(urllib.quote(data['key']),newObj) +# except: +# return False, "Cannot create new user %s (%s %s)"%(data['key'],sys.exc_info()[0],sys.exc_info()[1]) +# + + #create the new entry in the database + + + result,msg=MPIWGStaff.createNewDBEntry(self,data['publish_the_data'],data['key'],data['last_name'], + data['first_name'],data['title'],data['status'],"", + "",data['date_from'],data['date_to'], + data['department'],data['home_inst'],data['funded_by'], + data['e_mail2'],data['current_work'],"yes",data['date_stay_at_mpiwg'],data['group'],"no",data['current_work']) + + return result,msg + + def updatePersonEntry(self,data,ignoreEntries=[]): + """update an person entry from data. but ignore all fields in ignore Entries""" + + ignoreEntries.append('current_work') # TODO:updatecurrent work + + if data['date_to']=="": # wenn date_to leer + data['date_to']="date_none" + + if data['date_from']=="": # wenn date_fromleer + data['date_from']="date_none" + msg="" + + + #eintragen + + columns=data.keys() + for x in ignoreEntries: + columns.remove(x) + - if cw: - txt_p=getTextFromNode(cw[0]) + + insert=[] + for key in columns: + if data[key]=="date_none": # date_none eintrag wird zu null uebersetzt + insert.append('%s=null'%key) else: - txt_p="" - - project=getattr(self,'members') + insert.append(""" "%s"=%s"""%(key,self.ZSQLQuote(data[key]))) - if not (username in memberList):#neuer eintrag - - try: - 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) - 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,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'))) - RESPONSE.write("

: %s %s"%sys.exc_info()[:2]) - else: - RESPONSE.write("

update:%s

\n"%username.encode('utf-8')) - - xquery=".//dn:ROW[dn:username='%s']"%username - results=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) - if len(results)>1: - RESPONSE.write("

WARNING (update): username %s not unique

\n"%username.encode('utf-8')) - xquery=".//dn:ROW[dn:publish_the_data='yes' and dn:username='%s']"%username - rd=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}) - if len(rd)>1:#mehrere published - RESPONSE.write("

ERROR (update): username %s not unique and more then one date set to be published

\n"%username.encode('utf-8')) -# elif len(rd)==1:#nur einer published, kein published dann mache nichts -# publish_the_data=getTextFromNode(rd[0].xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) -# date_from=getTextFromNode(rd[0].xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) -# date_to=getTextFromNode(rd[0].xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]) -# - - obj=getattr(memberFolder,username) - - 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,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,stay_at_mpiwg) - if not ret[0]: - - 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) + insertStr=",".join(insert) + queryStr="update personal_www SET %s where key='%s'"%(insertStr,data['key']) + self.ZSQLQuery("SET DATESTYLE TO 'German'") + self.ZSQLQuery(queryStr) + + #currentwork + #if not (txt==""): + # queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p) + # + # self.ZSQLQuery(queryStr) + + return True,msg + def updatePersonalwww_doIt(self): + """do the update""" + args=self.REQUEST.form + resultSet=self.REQUEST.SESSION['personal_www']['resultSet'] + news=self.REQUEST.SESSION['personal_www']['news'] + conflicts=self.REQUEST.SESSION['personal_www']['conflicts'] + ret="" + # generate the new entry + + if news and (len(news)>0): + ret+="

HinzugefŸgt

" + ret+="

NeueintrŠge erscheinen erst auf der Homepage, wenn ihnen eine e-mail Adresse zugeordnet wurde.

" + ret+="" + + # update + + if len(conflicts.keys())>0: + ret+="

Bei €nderung belassen

" + ret+="

Bitte die Filemaker-db entsprehchend Šndern

" + + + for conflict in conflicts.keys(): + ignoreEntries=[] + displayIgnored=[] + for cf in conflicts[conflict]: + if args[conflict.encode('utf-8')+'_'+cf[0]]=="stored": #use the stored one + ignoreEntries.append(cf[0]) #so ignore field cf[0] + displayIgnored.append(cf) + if len(displayIgnored)>0: + ret+="

%s

"%conflict.encode('utf-8') + + ret+="" + for iE in displayIgnored: + ret+=""%(iE[0].encode('utf-8'),iE[1].encode('utf-8'),iE[2].encode('utf-8')) + ret+="" + + self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries) + + return ret+"" + + def updateInstitutsbiliography(self): + """update the Institutsbibliogrpahy""" + self.upDateSQL('personalwww.xml') + return "DONE" + def updatePersonalwww_html(self): + """update form for the homepages web form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','updatePersonalwww.zpt')).__of__(self) + return pt() - #self.updatePublicationDB() - - #self.ZSQLResetConnection() - RESPONSE.write("

Done

") - - return True + def updatePersonalwww(self,uploadfile): + """update personalwww + @param uploadfile: file handle auf das file + """ + dsn="dbname=personalwww" + resultSet=updatePersonalWWW.importFMPXML(uploadfile) + news,conflicts=updatePersonalWWW.checkImport(dsn, resultSet) + + self.REQUEST.SESSION['personal_www']={} + self.REQUEST.SESSION['personal_www']['resultSet']=resultSet + self.REQUEST.SESSION['personal_www']['news']=news + self.REQUEST.SESSION['personal_www']['conflicts']=conflicts + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','updatePersonalwww_check.zpt')).__of__(self) + return pt() + + def reindexCatalogs(self,RESPONSE=None): """reindex members and project catalog""" @@ -964,7 +998,7 @@ class MPIWGRoot(ZSQLExtendFolder): 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]) + logger("MPIWG Root (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2]) @@ -975,62 +1009,6 @@ class MPIWGRoot(ZSQLExtendFolder): - 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') - for found in founds: - - if not (found.e_mail==""): - newObj=MPIWGStaff.MPIWGStaff(found.username,found.name,found.vorname) - - try: - project._setObject(found.username,newObj) - RESPONSE.write("

new:%s

\n"%found.username) - except: - RESPONSE.write("

old:%s (%s,%s)

\n"%(found.username,found.name,found.vorname)) - - - - #delete non existing - - - foundUserNames=[x.username for x in founds] - for member in self.ZopeFind(self,obj_metatypes=["MPIWGStaff"],search_sub=1): - - if member[1].getId() not in foundUserNames: - member[1].aq_parent.manage_delObjects(ids=[member[1].getId()]) - RESPONSE.write("

deleted:%s

\n"%member[1].getId()) - try: - self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1']) - except: - pass - self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1']) - - self.updatePublicationDB() - - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - - -# def getAllMembers(self,reset=None): -# """give list of all members""" -# ret=[] -# -# -# if reset or (getattr(self,'_v_membersList',None) is None): -# for member in self.members._objects: -# if member['meta_type']=='MPIWGStaff': -# memberObj=getattr(self.members,member['id']) -# if memberObj.isPublished(): -# ret.append(memberObj.title.decode('utf-8')) -# -# ret.sort() -# self._v_membersList=ret[0:] -# print ret -# -# return self._v_membersList def getAllMembers(self): #ret=[] @@ -1083,79 +1061,6 @@ class MPIWGRoot(ZSQLExtendFolder): returnList.append((depth,nr,title,project[0])) return returnList - def formatElementsAsList(self,elements,onlyOneDept=False): - """formatiere tree als liste""" - - actualDepth=0 - ret="" - for element in elements: - if (element[0]>actualDepth): - #fuege soviele ul ein wie unterschied in tiefe - if element[0]==1: - ret+="""
\n
\n""" - if department==4: #hack - department=3 - - ret+="""
-
\n
%s%s%s