--- ECHO_content/ECHO_helpers.py 2006/03/03 22:05:31 1.74 +++ ECHO_content/ECHO_helpers.py 2007/01/23 16:50:11 1.78 @@ -17,6 +17,7 @@ import ECHO_collection import base64 import bz2 import xmlrpclib +import zLOG displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie'] @@ -51,6 +52,7 @@ class ECHO_basis: security.declarePublic('getImageTag') management_page_charset="utf-8" + isVisible = True def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None): return ECHO_collection.manage_addECHO_locale(self,lang,title,label) @@ -136,10 +138,38 @@ class ECHO_basis: """template fuer content bei einbau und ECHO_Umgebung""" return content_html(self,type) - + + def getIsVisible(self): + """return if object and all parents are visible""" + + # if object is not visible return False + if hasattr(self,'isVisible'): + if not self.isVisible : return False + + # else if parent of object is not ECHO_root, ECHO_basis or None + if not self.aq_parent.meta_type in ['ECHO_root','ECHO_basis',None] : + return self.aq_parent.getIsVisible() + + # else return True + return True + + def setIsVisible(self, isVisible): + """ set object attribute isVisible""" + self.isVisible = isVisible + + def getAttributeIsVisible(self): + """ return object attribute isVisible""" + if hasattr(self,'isVisible'): + return self.isVisible + return True + def getTitle(self): """title""" - lang=self.getLanguage() + if hasattr(self,'getLanguage'): + lang=self.getLanguage() + else: + lang=None + locale=None if lang and not (lang =="de"): locale=self.ZopeFind(self,obj_ids=["locale_"+lang]) @@ -147,13 +177,20 @@ class ECHO_basis: if locale: return self.decode(locale[0][1].title) else: + try: return self.decode(self.title) - + except: + return self.title def getLabel(self): """title""" - lang=self.getLanguage() + if hasattr(self,'getLanguage'): + lang=self.getLanguage() + else: + lang=None + locale=None + if lang and not (lang=="de"): locale=self.ZopeFind(self,obj_ids=["locale_"+lang]) @@ -512,7 +549,7 @@ def readFieldFromXML(meta_url,parent,fie def urlopen(url): """urlopen mit timeout""" - socket.setdefaulttimeout(2) + socket.setdefaulttimeout(10) ret=urllib.urlopen(url) socket.setdefaulttimeout(5) return ret @@ -537,7 +574,7 @@ def checkOnlyOneInGroup(object): else: return object -def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes",search_sub=0): +def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchMD_modus='search',searchSimple=None,generic="yes",search_sub=0): def sort(x,y): return cmp(x[0],y[0]) @@ -569,7 +606,11 @@ def getSubCols(self, sortfield=None, sub for field in searchMD.keys(): #if object.getMDValue(field,generic=generic)==searchMD[field]: #if re.match(searchMD[field],object.getMDValue(field,generic=generic)): - if object.getMDValue(field,generic=generic).find(searchMD[field])>-1: + if searchMD_modus=='match': + searchResult=re.match(searchMD[field],object.getMDValue(field,generic=generic)) + else: + searchResult=re.search(searchMD[field],object.getMDValue(field,generic=generic)) + if searchResult: flag=1 else: flag=0 @@ -839,7 +880,7 @@ class BrowserCheck: def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,xmlfrag=None,digiliburlprefix=None): """Einlesen der Metadaten und und erstellen des geaenderten XML file""" - + def updateTextToolNode(tag,value): metanode=dom.getElementsByTagName('texttool')[0] @@ -856,6 +897,7 @@ def writeMetadata(url,metadict,project=N node.appendChild(nodetext) metanode.appendChild(node) + if xmlfrag: geturl=""" @@ -873,12 +915,14 @@ def writeMetadata(url,metadict,project=N except: - return (None,"XCannot open: "+url) + zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"XCannot open: "+url) + return (None,"XCannot open: "+url) try: dom=xml.dom.minidom.parseString(geturl) except: - return (None,"Cannot parse: "+url+"
"+geturl) + zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"Cannot parse: "+url+"
"+geturl) + return (None,"Cannot parse: "+url+"
"+geturl) @@ -890,15 +934,15 @@ def writeMetadata(url,metadict,project=N metanode=metanodes[0] for metaData in metadict.keys(): - - try: + if metaData: + try: nodeOld=metanode.getElementsByTagName(metaData) - except: + except: nodeOld=None - if nodeOld: + if nodeOld: metanode.removeChild(nodeOld[0]).unlink() - else: + else: # try also old writing rule - instead of _: try: nodeOld=metanode.getElementsByTagName(re.sub('_','-',metaData)) @@ -908,19 +952,21 @@ def writeMetadata(url,metadict,project=N if nodeOld: metanode.removeChild(nodeOld[0]).unlink() - metanodeneu=dom.createElement(metaData) - try: - metanodetext=dom.createTextNode(metadict[metaData]) - except: - metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8')) - #try: - #metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8")) - #except: - #metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8')) - metanodeneu.appendChild(metanodetext) - metanode.appendChild(metanodeneu) + metanodeneu=dom.createElement(metaData) + try: + metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8')) + except: + metanodetext=dom.createTextNode(metadict[metaData]) + #try: + #metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8")) + #except: + #metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8')) + metanodeneu.appendChild(metanodetext) + metanode.appendChild(metanodeneu) + + @@ -942,10 +988,13 @@ def writeMetadata(url,metadict,project=N if digiliburlprefix: updateTextToolNode('digiliburlprefix',digiliburlprefix) - - try: + + try: + return dom.toxml(encoding='utf-8').encode('utf-8') except: + + return dom.toxml(encoding='utf-8') def readMetadata(url):