--- ECHO_content/ECHO_helpers.py 2005/11/25 18:46:40 1.65 +++ ECHO_content/ECHO_helpers.py 2007/01/23 18:22:29 1.79 @@ -14,9 +14,22 @@ from AccessControl import ClassSecurityI import os.path from OFS.Folder import Folder import ECHO_collection +import base64 +import bz2 +import xmlrpclib +import zLOG +import logging 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'] + +#decode and compress for xmlrpc communication with OSAS_server + +def encodeRPC(string): + return base64.encodestring(bz2.compress(string)) +def decodeRPC(string): + return bz2.decompress(base64.decodestring(string)) + def content_html(self,type): """template fuer content""" #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"]) @@ -25,6 +38,7 @@ def content_html(self,type): # return templates[0][1]() if hasattr(self,type+"_template"): + logging.info("type: %s"%type) obj=getattr(self,type+"_template") return obj() else: @@ -38,7 +52,10 @@ class ECHO_basis: """basis eigenschaften fuer echo objekte""" security=ClassSecurityInfo() 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) @@ -115,14 +132,46 @@ class ECHO_basis: return ret + def content_html_XMLRpc(self): + """xml_rpc_version""" + return encodeRPC(self.content_html()) + def content_html(self,type="collection"): """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]) @@ -130,19 +179,20 @@ class ECHO_basis: if locale: return self.decode(locale[0][1].title) else: + try: return self.decode(self.title) - - - try: - return self.title.encode('utf-8','ignore') - except: - self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error - return self.title.encode('utf-8','ignore') + 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]) @@ -160,13 +210,7 @@ class ECHO_basis: return ret return self.decode(self.label) - try: - return self.label.encode('utf-8','ignore') - except: - self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error - return self.label.encode('utf-8','ignore') - - + def changeECHOEntriesForm(self): """change Entries for the ECHO Navigation environment""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHOEntriesForm')).__of__(self) @@ -507,7 +551,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 @@ -531,7 +575,15 @@ def checkOnlyOneInGroup(object): return displayedObjects[0][1] else: return object -def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes"): + +def getSubCols(self, sortfield=None, + subColTypes=displayTypes, + sortFieldMD=None, + searchMD=None, + searchMD_modus='search', + searchSimple=None, + generic="yes",search_sub=0, + isVisible=True): def sort(x,y): return cmp(x[0],y[0]) @@ -549,42 +601,37 @@ def getSubCols(self, sortfield=None, sub sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) ids=[] - displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) - + displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes,search_sub=search_sub) - if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): - searchString=" AND ".join(searchSimple.split()) - ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] - + if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): + searchString=" AND ".join(searchSimple.split()) + ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString,'getIsVisible':True})] else: - for entry in displayedObjects: - - + for entry in displayedObjects: object=entry[1] - if searchMD and hasattr(object,'getMDValue'): + if searchMD: + if hasattr(object,'getMDValue'): flag=0 for field in searchMD.keys(): #if object.getMDValue(field,generic=generic)==searchMD[field]: - if re.match(searchMD[field],object.getMDValue(field,generic=generic)): + #if re.match(searchMD[field],object.getMDValue(field,generic=generic)): + 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 break if flag==1: - ids.append(object) - - + ids.append(object) else: ids.append(object) - if not sortfield: sortfield=getattr(self,'sortfield','weight') - - tmplist=[] - for x in ids: - if hasattr(x,sortfield): try: tmp=int(getattr(x,sortfield)) @@ -601,7 +648,9 @@ def getSubCols(self, sortfield=None, sub else: tmplist.sort(sortWithMD(sortFieldMD)) - return [x for (key,x) in tmplist] + ret=[x for (key,x) in tmplist] + + return ret def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): """Rerender all Links""" @@ -767,7 +816,8 @@ def zptFile(self, path, orphaned=False): # unusual case pt=PageTemplateFile(os.path.join(package_home(globals()), path)) else: - pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self) return pt @@ -839,7 +889,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,8 +906,9 @@ def writeMetadata(url,metadict,project=N node.appendChild(nodetext) metanode.appendChild(node) + if xmlfrag: - geturl=""" + geturl=""" @@ -873,12 +924,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 +943,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,16 +961,21 @@ def writeMetadata(url,metadict,project=N if nodeOld: metanode.removeChild(nodeOld[0]).unlink() - metanodeneu=dom.createElement(metaData) - 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) + 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) + + @@ -939,13 +997,14 @@ def writeMetadata(url,metadict,project=N if digiliburlprefix: updateTextToolNode('digiliburlprefix',digiliburlprefix) - - try: - return dom.toxml().encode('utf-8') - except: - return dom.toxml('utf-8') + + try: - + return dom.toxml(encoding='utf-8').encode('utf-8') + except: + + + return dom.toxml(encoding='utf-8') def readMetadata(url): """Methode zum Auslesen der Metadateninformation zu einer Resource @@ -991,8 +1050,7 @@ def readMetadata(url): except: """nothing""" - - return metadict,"" + return (metadict,"") class MapArea(SimpleItem):