--- ECHO_content/ECHO_collection.py 2004/05/26 07:39:36 1.90 +++ ECHO_content/ECHO_collection.py 2004/05/27 09:31:25 1.91 @@ -75,11 +75,11 @@ def checkDiffs(self,metadict): if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]): diffs[self.getFieldTag(tags,field)]=1 else: - #print "DIFF",field,self.getFieldValue(self.getFieldTag(tags,field)),metadict[self.getFieldTag(tags,field)] + diffs[self.getFieldTag(tags,field)]=0 except: diffs[self.getFieldTag(tags,field)]=0 - #print "EX",field + return diffs def content_html(self,type): @@ -231,7 +231,7 @@ def readMetadata(url): if len(metanode)==0: metanode=dom.getElementsByTagName('archimedes') metadict['bib_type']='Archimedes' - #print "HELLO" + if not len(metanode)==0: metacontent=metanode[0].childNodes @@ -243,7 +243,7 @@ def readMetadata(url): for node in metacontent: try: - metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes)) + metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes)) except: """nothing""" @@ -268,15 +268,15 @@ def setECHO_collectionInformation(self,t coords=[] #coordinates of for rectangles - #print "cs", coordstrs + if coordstrs: for coordstr in coordstrs: - #print "cs", coordstr + try: temco=coordstr.split(",") except: temco=[] - #temco.append(angle) + coords.append(temco) @@ -543,8 +543,7 @@ class ECHO_resource(Folder,Persistent): for data in self.metadata: data_neu=re.sub('-','_',data) self.metaDataHash[data_neu]=getattr(self,data) - #print data_neu, getattr(self,data) - #print self.metaDataHash,self.metadata + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self) return pt() @@ -729,7 +728,7 @@ class ECHO_resource(Folder,Persistent): def getFieldValue(self,field): """get value""" - #print field + try: ret=self.metaDataHash[field] @@ -746,7 +745,7 @@ class ECHO_resource(Folder,Persistent): def setFieldValue(self,field,value): """get value""" - #print field + if not hasattr(self,'metaDataHash'): setattr(self,'metaDataHash',{}) self.metaDataHash[field]=value[0:] @@ -769,9 +768,9 @@ class ECHO_resource(Folder,Persistent): fieldlist=self.standardMD.fieldList for referenceTypeF in self.referencetypes: - #print referenceTypeF[1].title,referenceType + if referenceTypeF[1].title.lower() == referenceType.lower(): - #print "OK" + try: bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields referenceType=referenceTypeF[1].title @@ -783,7 +782,7 @@ class ECHO_resource(Folder,Persistent): fields=bibdata[referenceType] for field in fieldlist: retdata[field]=referenceTypeF[1].getValue(field)[1] - #print retdata,fieldlist + return retdata,fieldlist,temp,fields def findTagsFromMapping(self,referenceType): @@ -986,7 +985,7 @@ class ECHO_externalLink(Folder): if not hasattr(self,'coords'): self.coords=[''] - #print "G",self.coords + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_externalLink.zpt').__of__(self) return pt() @@ -1301,7 +1300,7 @@ class ECHO_collection(Folder, Persistent for entry in entries: if entry[1].meta_type == 'ECHO_resource': entry[1].ECHO_getResourceMD(template="no") - #print "rerender",entry[1].getId() + else: self.ECHO_rerenderLinksMD(entry[1]) @@ -1323,7 +1322,7 @@ class ECHO_collection(Folder, Persistent return [] def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""): - #print "CO",coords + self.id = id """Festlegen der ID""" @@ -1903,7 +1902,7 @@ class ECHO_root(Folder,Persistent,Implic def checkIfArrow(obj): if hasattr(obj,'coords'): for coordtemp in obj.coords: - #print obj.title,len(coordtemp) + if (len(coordtemp)>4) and not (coordtemp[4]==''): return 4 return None @@ -1975,7 +1974,7 @@ class ECHO_root(Folder,Persistent,Implic for word in words: strUrl=url%word - #print "str",strUrl + retStr+="""%s
"""%(strUrl,word) str=retStr if str: @@ -1986,12 +1985,12 @@ class ECHO_root(Folder,Persistent,Implic def link2html(self,str): """link2html fuer VLP muss hier noch raus""" if str: - #print str + str=re.sub("\&","&",str) dom=xml.dom.minidom.parseString(""+str+"") links=dom.getElementsByTagName("link") - #print "link",links + for link in links: link.tagName="a" ref=link.getAttribute("ref") @@ -2006,7 +2005,6 @@ class ECHO_root(Folder,Persistent,Implic dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''} res=None for db in dbs.keys(): - #print ref,"select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db]) res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db]))) return res @@ -2015,7 +2013,7 @@ class ECHO_root(Folder,Persistent,Implic def PgQuoteString(self,string): """Quote string""" - #print "PG",string + return libpq.PgQuoteString(string) def getPartners(self):