--- ECHO_content/ECHO_helpers.py	2007/01/23 16:50:11	1.78
+++ ECHO_content/ECHO_helpers.py	2007/07/24 09:11:46	1.84
@@ -17,7 +17,13 @@ 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']
 
@@ -29,6 +35,29 @@ def encodeRPC(string):
 def decodeRPC(string):
     return bz2.decompress(base64.decodestring(string))
 
+def unicodify(s):
+    """decode str (utf-8 or latin-1 representation) into unicode object"""
+    if not s:
+        return u""
+    if isinstance(s, str):
+        try:
+            return s.decode('utf-8')
+        except:
+            return s.decode('latin-1')
+    else:
+        return s
+
+def utf8ify(s):
+    """encode unicode object or string into byte string in utf-8 representation.
+       assumes string objects to be utf-8"""
+    if not s:
+        return ""
+    if isinstance(s, str):
+        return s
+    else:
+        return s.encode('utf-8')
+
+
 def content_html(self,type):
         """template fuer content"""
         #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
@@ -37,6 +66,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:
@@ -349,10 +379,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"""
@@ -574,7 +604,14 @@ def checkOnlyOneInGroup(object):
         else:           return object
 
 
-def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchMD_modus='search',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,
+               isVisible=True):
         
         def sort(x,y):
                 return cmp(x[0],y[0])
@@ -596,7 +633,7 @@ def getSubCols(self, sortfield=None, 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})]         
+            ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString,'getIsVisible':True})]         
         else:
             for entry in displayedObjects:       
                     object=entry[1]
@@ -915,13 +952,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+"<br>"+geturl)
+                    logger("ECHO writeMetadata",logging.ERROR,"Cannot parse: "+url+"<br>"+geturl)
                     return (None,"Cannot parse: "+url+"<br>"+geturl)
 
         
@@ -1150,7 +1187,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):
@@ -1205,6 +1243,8 @@ class MapText(Folder,ZopePageTemplate):
         self.ZBindings_edit(self._default_bindings)
         if text is None:
             text = open(self._default_content_fn).read()
+        if content_type is None:
+            content_type = self.content_type
         self.pt_edit(text, content_type)
 
     def createLocale(self):