--- ECHO_content/ECHO_collection.py 2007/07/19 11:02:28 1.289
+++ ECHO_content/ECHO_collection.py 2008/11/16 12:15:42 1.296
@@ -196,12 +196,15 @@ class ECHO_locale(ZopePageTemplate):
meta_type="ECHO_locale"
def __init__(self,id,lang,title,label,text=None,content_type=None):
- self.lang=lang
- self.title=title
- self.label=label
- if text:
- self.pt_edit(text, content_type)
- self.id=id
+ self.lang=lang
+ self.title=title
+ self.label=label
+ # default content
+ if not text:
+ text = open(self._default_content_fn).read()
+ content_type = 'text/html'
+ self.pt_edit(text, content_type)
+ self.id=id
manage_options = ZopePageTemplate.manage_options+(
{'label':'Main Config','action':'change_ECHO_localeForm'},
@@ -218,6 +221,8 @@ class ECHO_locale(ZopePageTemplate):
self.title=title
self.label=label
if not text is None:
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, content_type)
if RESPONSE is not None:
@@ -307,6 +312,8 @@ class ECHO_layoutTemplate(ZopePageTempla
if text is None:
self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
text = open(self._default_content_fn).read()
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, content_type)
@@ -415,7 +422,15 @@ class ECHO_resource(CatalogAware,Folder,
default_catalog='resourceCatalog'
# viewClassificationList=viewClassificationListMaster
-
+ def setPID(self,pid):
+ """set the pid"""
+ self.pid=pid
+ return True
+
+ def getPID(self):
+ """get the pid"""
+ return getattr(self,'pid',None)
+
def PrincipiaSearchSource(self):
"""Return cataloguable key for ourselves."""
return str(self)
@@ -1379,10 +1394,7 @@ class ECHO_resource(CatalogAware,Folder,
ret= self.metaDataHash.get(fieldNameTest,empty)
- if type(ret) is StringType:
- return ret.decode('utf-8')
- else:
- return ret
+ return unicodify(ret)
getFieldValue=getMDValue #depricated
@@ -2010,10 +2022,10 @@ def manage_addECHO_linkForm(self):
return pt()
-def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
"""Add an external Link"""
- newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+ newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
self._setObject(id,newObj)
@@ -2587,8 +2599,24 @@ class ECHO_collection(CatalogAware, Fold
manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
return "done"
except:
- return None
+ logging.error("ECHOcollection: (AddResource): %s %s"%sys.exc_info()[0:2])
+ return None
+ def addResourceAndCreateLabelAndTitle(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+ """SSS"""
+ ret = self.addResource(id,title,label,description,contentType,responsible,link,metalink,weight,credits,coords,RESPONSE)
+ if ret is None:
+ return None
+
+ try:
+ server2=getattr(self,id)
+ server2.copyIndex_meta2echo_resource()
+ server2.generate_label()
+ server2.generate_title()
+ except:
+ logging.error("An Error occured adding the resource A\n %s %s"%sys.exc_info()[0:2])
+ return None
+ return "done"
def getSecondaryLink(self):
"""secondary link"""
try:
@@ -3511,8 +3539,10 @@ class ECHO_root(Folder,Persistent,Implic
"""ret attribute if existing"""
try:
- return getattr(found,field).decode('ascii','ignore')
+ return getattr(found,field)#.decode('utf-8','ignore')
except:
+ logging.error("can't: decode: %s"%repr(field))
+ logging.error(" %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))
return ""
security.declarePublic('getImageTag')
@@ -3749,7 +3779,10 @@ class ECHO_root(Folder,Persistent,Implic
def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch
"""
- #url=None
+
+ if not str:
+ return ""
+
if url:
retStr=""
@@ -3761,9 +3794,10 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""%s
"""%(strUrl,word)
str=retStr
if str:
- return re.sub(r"[\n]","
",str)
+ str = re.sub(r"[\n]","
",str)
+ return unicodify(str)
else:
- return ""
+ return u""
link2html=vlp_xmlhelpers.link2html
related2html=vlp_xmlhelpers.related2html
@@ -4134,6 +4168,8 @@ class ECHO_linkList(ZopePageTemplate,ECH
self.ZBindings_edit(self._default_bindings)
if text is None:
text = ''
+ if content_type is None:
+ content_type = self.content_type
self.pt_edit(text, contentType)