--- MPIWGWeb/MPIWGStaff.py 2008/06/24 07:55:05 1.10.2.38 +++ MPIWGWeb/MPIWGStaff.py 2008/08/18 13:27:55 1.10.2.40 @@ -64,7 +64,7 @@ def createNewDBEntry(self,publish_the_da queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr) self.ZSQLQuery("SET DATESTYLE TO 'German'") self.ZSQLQuery(queryStr) - logging.error("QQQQ %s:"%queryStr) + logging.info("QQQQ %s:"%queryStr) #currentwork if not (current_work==""): queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes") @@ -109,7 +109,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""): """zpddatedb""" if not DBid: - DBid=self.getDBId() + DBid=self.getDBId() self.ZSQLQuery("SET DATESTYLE TO 'German'") @@ -148,17 +148,18 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if file and not(file.filename==""): if self.getImageObj(): - self.getImageObj().updateImage(file,_rename=None,RESPONSE=None) + self.getImageObj().updateImage(file,_rename=None,RESPONSE=None) else: - # create new image object - xp = file.filename.rfind('.') - if xp > 0: - ext = file.filename[xp:] - fn = self.getId()+ext - logger("MPWIG STAFF", logging.INFO, "new filename: %s"%fn) - self.getImageFolder().addImage2(file,fileName=fn) - else: - logger("MPWIG STAFF", logging.ERROR, "uploaded filename %s has no extension!"%file.filename) + # create new image object + xp = file.filename.rfind('.') + if xp > 0: + ext = file.filename[xp:] + #fn = self.getId()+ext + fn = self.getId() + logger("MPWIG STAFF", logging.INFO, "new filename: %s"%fn) + self.getImageFolder().addImage2(file,fileName=fn) + else: + logger("MPWIG STAFF", logging.ERROR, "uploaded filename %s has no extension!"%file.filename) self.publishImage=publishImage @@ -172,7 +173,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend try: return self.getPhysicalRoot().www_neu.images.staff_images except: - logger("MPWIG STAFF", logging.ERROR, "image folder not found:"," has to be add /www_neu/staff_images") + logger("MPWIG STAFF", logging.ERROR, "image folder not found: has to be add /www_neu/staff_images") return None def getImageObj(self): @@ -443,7 +444,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend bookId="b%06i" % newId self.ZSQLAdd(argv,_table="bibliography",reference_type=_docType,id=bookId) - logging.info("XXXXXXXXXXXXYYYYYYYYYY") + self.ZSQLAdd(_useRequest=False,_table="publications",id_gen_bib=bookId,key_main=self.getDBId(),publish='yes') self.updatePublicationDB(personId=self.getDBId()) @@ -525,7 +526,6 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if not (type(entries) is ListType): entries=[entries] - logging.info("XXXXXXXXXXXXXXXXXXXXXXX") for bibId in entries: query="INSERT INTO %s " % "publications"