--- ECHO_content/ECHO_helpers.py 2007/01/23 18:22:29 1.79 +++ ECHO_content/ECHO_helpers.py 2007/05/03 14:23:46 1.82 @@ -17,9 +17,14 @@ import ECHO_collection import base64 import bz2 import xmlrpclib -import zLOG + import logging +#erstzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + 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'] @@ -351,10 +356,10 @@ class ECHO_basis: js+="""addArea('%s', 'overview', %s, '%s', '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType(),perm) return js - def createMapHead(self): + def createMapHead(self,mapColTypes=None): """create javascript include and script tags for head""" pt=zptFile(self, 'zpt/ECHO_content_map_frag_js') - return pt() + return pt(mapColTypes=mapColTypes) def createMapImg(self): """generate img-tag for map""" @@ -924,13 +929,13 @@ def writeMetadata(url,metadict,project=N except: - zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"XCannot open: "+url) + logger("ECHO writeMetadata",logging.ERROR,"XCannot open: "+url) return (None,"XCannot open: "+url) try: dom=xml.dom.minidom.parseString(geturl) except: - zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"Cannot parse: "+url+"
"+geturl) + logger("ECHO writeMetadata",logging.ERROR,"Cannot parse: "+url+"
"+geturl) return (None,"Cannot parse: "+url+"
"+geturl) @@ -1159,7 +1164,8 @@ class MapArea(SimpleItem): parent = self.aq_parent text = parent.getMapText() if text is not None: - return text.document_src() + #return text.document_src() + return text() return "" def getLabel(self):