--- ECHO_content/ECHO_helpers.py 2010/10/11 13:15:00 1.103
+++ ECHO_content/ECHO_helpers.py 2012/09/03 14:48:22 1.103.2.7
@@ -11,6 +11,7 @@ from OFS.SimpleItem import SimpleItem
from Globals import package_home
import Globals
from AccessControl import ClassSecurityInfo
+from Acquisition import aq_parent,aq_chain,aq_base
import os.path
from OFS.Folder import Folder
import ECHO_collection
@@ -19,7 +20,7 @@ import bz2
import xmlrpclib
import sys
import logging
-import amara
+#import amara
#erstzt logging
def logger(txt,method,txt2):
@@ -33,7 +34,7 @@ def normalizeCt(str):
#str= str.replace(" ","_")
return str.replace("-"," ").lower()
-#decode and compress for xmlrpc communication with OSAS_server
+#decode and compress for xmlrpc communication
def encodeRPC(string):
return base64.encodestring(bz2.compress(string))
@@ -131,6 +132,9 @@ class ECHO_basis:
"""return utf-8 encoded string object for string or unicode object s"""
return utf8ify(s)
+ def getBrowserType(self):
+ """returns browserType object"""
+ return browserType(self)
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)
@@ -248,6 +252,7 @@ class ECHO_basis:
return self.unicodify(getattr(self,'description',''));
+
def getTitle(self):
"""title"""
if hasattr(self,'getLanguage'):
@@ -260,12 +265,9 @@ class ECHO_basis:
locale=self.ZopeFind(self,obj_ids=["locale_"+lang])
if locale:
- return self.decode(locale[0][1].title)
- else:
- try:
- return self.decode(self.title)
- except:
- return self.title
+ return unicodify(locale[0][1].title)
+
+ return unicodify(self.title)
def getLabel(self):
"""title"""
@@ -292,7 +294,7 @@ class ECHO_basis:
ret=self.getId()
return ret
- return self.decode(self.label)
+ return unicodify(self.label)
def changeECHOEntriesForm(self):
"""change Entries for the ECHO Navigation environment"""
@@ -324,9 +326,7 @@ class ECHO_basis:
def getOverview(self):
"""map overview graphics"""
#return self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview'])[0][1]
- if self.hasOverview():
- return getattr(self, 'overview')
- return None
+ return getattr(self, 'overview', None)
def getMapAreas(self):
"""returns the list of MapAreas"""
@@ -371,7 +371,7 @@ class ECHO_basis:
res = self.ZopeFind(self, obj_metatypes=('ECHO_mapText'))
if len(res) > 0:
text = res[0][1]
- return text
+ return unicodify(text)
return None
def ECHO_graphicEntry(self):
@@ -441,10 +441,10 @@ class ECHO_basis:
def createMapImg(self):
"""generate img-tag for map"""
- bt = BrowserCheck(self)
+ bt = browserType(self)
tag = ""
src = self.getOverview().absolute_url()
- if bt.isN4:
+ if bt['isN4']:
# N4 needs ilayer to create an id
tag += '