--- ECHO_content/ECHO_collection.py 2005/01/21 16:28:58 1.204
+++ ECHO_content/ECHO_collection.py 2005/02/08 21:32:36 1.211
@@ -655,7 +655,7 @@ class ECHO_resource(Folder,Persistent,EC
-
+ security.declarePublic('content_html')
def content_html(self):
"""template fuer content"""
return ECHO_basis.content_html(self,'resource')
@@ -968,7 +968,7 @@ class ECHO_resource(Folder,Persistent,EC
def getMDValue(self,fieldName,empty=None):
- if empty:
+ if not empty:
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
else:
@@ -1065,7 +1065,8 @@ class ECHO_resource(Folder,Persistent,EC
if ret == "":
return None
else:
- return ret
+
+ return ret
except:
return None
@@ -1304,7 +1305,7 @@ def manage_addECHO_resourceForm(self):
-def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
+def manage_addECHO_resource(self,id,title,label,description="",responsible="",link="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
"""addaresource"""
newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
@@ -1320,7 +1321,7 @@ class ECHO_externalLink(Folder,ECHO_basi
security=ClassSecurityInfo()
meta_type='ECHO_externalLink'
-
+ security.declarePublic('content_html')
def content_html(self):
"""template fuer content"""
return ECHO_basis.content_html(self,'externalLink')
@@ -1396,7 +1397,7 @@ class ECHO_link(ECHO_externalLink):
meta_type="ECHO_link"
-
+
def content_html(self):
"""template fuer link"""
if hasattr(self,"link_template"):
@@ -1764,7 +1765,8 @@ class ECHO_collection(Folder, Persistent
ret+="
"+label+"
"
manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
return ret
-
+
+ security.declarePublic('getImageTag')
def getImageTag(self):
"""GetTag"""
try:
@@ -1794,29 +1796,32 @@ class ECHO_collection(Folder, Persistent
except:
return ""
- def getCollectionTreeXML(self):
+ def getCollectionTreeXML(self,pwstr=None):
"""Tree as XML"""
- def addPassWd(str):
+ def addPassWd(str,pwstr=None):
"""adds a user/passwd to an url"""
- txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
+ if pwstr:
+ txt2=re.sub(r"(http://)(.*?)","\g<1>%s@\g<2>"%pwstr,str)
+ else:
+ txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
return txt2
- def getCollection(object,depth=0):
+ def getCollection(object,depth=0,pwstr=None):
depth+=1
collections=""
for entry in object.__dict__.keys():
element=getattr(object,entry)
try:
if element.meta_type in ["ECHO_collection","ECHO_group"]:
- collections+=""
+ collections+=""
collections+=getCollection(element,depth)+"\n"
except:
"""nothing"""
return collections
ret=""""""
- return ret+""+getCollection(self)+""
+ return ret+""+getCollection(self,pwstr=pwstr)+""
def createAllJSAreas(self):
"""create area calls for JavaScript"""
@@ -1976,7 +1981,8 @@ class ECHO_collection(Folder, Persistent
elif hasattr(self,'collection_index_template'):
ret=self.collection_index_template()
elif hasattr(self,'main_index_template'):
- ret=self.main_index_template()
+
+ ret=self.main_index_template.__of__(self)(self.main_template)
else:
pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt')
pt.content_type="text/html"
@@ -1985,6 +1991,7 @@ class ECHO_collection(Folder, Persistent
self.ZCacheable_set(ret)
return ret
+ security.declarePublic('content_html')
def content_html(self,**argv):
"""template fuer content"""
#print "NN",argv
@@ -2029,7 +2036,7 @@ class ECHO_collection(Folder, Persistent
"""Give list of coordinates"""
mapColTypes=['ECHO_collection','ECHO_resource']
areas=[]
- for entry in self.getSubCols(self,subColTypes=mapColTypes):
+ for entry in self.getSubCols(subColTypes=mapColTypes):
object=entry
areas.extend(object.getMapAreas())
return areas
@@ -2056,7 +2063,7 @@ def manage_addECHO_collectionForm(self):
return pt()
-def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
"""add a echo collection"""
@@ -2164,6 +2171,7 @@ class ECHO_group(ECHO_collection):
except:
return "ECHO_groups"
+ security.declarePublic('content_html')
def content_html(self):
"""template fuer content"""
return ECHO_basis.content_html(self,'group')
@@ -2345,6 +2353,20 @@ class ECHO_root(Folder,Persistent,Implic
meta_type="ECHO_root"
+ def printer(self,txt):
+ print txt
+ print txt[2]
+ print txt[2].getImageTag()
+ print "HO"
+ return txt[2].getImageTag()
+
+ def printer2(self,txt):
+ print txt
+
+
+ def item2(self,txt):
+ return txt[2]
+
def getContentOverviewTemplate(self):
"""produces overview template with macro"""
pt = zptObjectOrFile(self, 'content_overview_template')
@@ -2370,6 +2392,10 @@ class ECHO_root(Folder,Persistent,Implic
def checkResource(self,id):
"""checks if a resource is in the tree, gives back none or list of resources"""
+ if not id:
+ id=""
+ splitted=id.split("/")
+ id=splitted[len(splitted)-1]
if hasattr(self,"_v_checkResource") and self._v_checkResource.has_key(id): #existiert ein cache und id ist bereits drin?
return self._v_checkResource[id]
@@ -2590,10 +2616,12 @@ class ECHO_root(Folder,Persistent,Implic
return getattr(found,field).decode('ascii','ignore')
except:
return ""
-
+
+ security.declarePublic('getImageTag')
def getImageTag(self):
"""needed by main_template"""
return ""
+
secondaryLink="" #needed by main_template
secondaryLinkTitle="" #needed by main_template