--- ECHO_content/ECHO_collection.py 2004/12/10 13:48:13 1.201
+++ ECHO_content/ECHO_collection.py 2005/02/07 18:29:07 1.209
@@ -74,7 +74,7 @@ regexpPage = re.compile(patternPage, re.
-def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs="",viewClassification=""):
+def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
"""Allegemeine Informationen zu einer ECHO Collection"""
@@ -258,7 +258,7 @@ class ECHO_resource(Folder,Persistent,EC
security=ClassSecurityInfo()
meta_type='ECHO_resource'
- viewClassificationList=viewClassificationListMaster
+# viewClassificationList=viewClassificationListMaster
getSubCols = ECHO_helpers.getSubCols
@@ -660,11 +660,11 @@ class ECHO_resource(Folder,Persistent,EC
"""template fuer content"""
return ECHO_basis.content_html(self,'resource')
- def getViewClassification(self):
- if hasattr(self,'viewClassification'):
- return self.viewClassification
- else:
- return ""
+# def getViewClassification(self):
+# if hasattr(self,'viewClassification'):
+# return self.viewClassification
+# else:
+# return ""
def getFullTextXML(self,noredirect=None):
"""getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong."""
@@ -818,7 +818,7 @@ class ECHO_resource(Folder,Persistent,EC
coordsnew=[]
self.coords=coordsnew
- self.viewClassification=""
+# self.viewClassification=""
@@ -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:
@@ -1000,7 +1000,7 @@ class ECHO_resource(Folder,Persistent,EC
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
return writeMetadata(self.metalink,self.metaDataHash)
- def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
+ def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
"""Aenderung der Properties"""
setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
@@ -1065,7 +1065,8 @@ class ECHO_resource(Folder,Persistent,EC
if ret == "":
return None
else:
- return ret
+
+ return ret
except:
return None
@@ -1102,7 +1103,9 @@ class ECHO_resource(Folder,Persistent,EC
retdata={}
fields=[]
fieldlist=self.standardMD.fieldList
-
+
+ tags=self.findTagsFromMapping(self.contentType)
+ self.referencetypes=tags[2]
for referenceTypeF in self.referencetypes:
if referenceTypeF[1].title.lower() == referenceType.lower():
@@ -1302,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)
@@ -1424,7 +1427,7 @@ class ECHO_collection(Folder, Persistent
security=ClassSecurityInfo()
meta_type='ECHO_collection'
- viewClassificationList=viewClassificationListMaster
+# viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes
path="/mpiwg/online/permanent/shipbuilding"
@@ -1736,11 +1739,11 @@ class ECHO_collection(Folder, Persistent
"""nothing"""
return retStr
- def getViewClassification(self):
- if hasattr(self,'viewClassification'):
- return self.viewClassification
- else:
- return ""
+# def getViewClassification(self):
+# if hasattr(self,'viewClassification'):
+# return self.viewClassification
+# else:
+# return ""
def createRessourcesFromXMLForm(self):
@@ -1792,29 +1795,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"""
@@ -1922,7 +1928,7 @@ class ECHO_collection(Folder, Persistent
security.declarePublic('changeECHO_collection')
- def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None,isAlwaysClickable=None):
+ def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None):
"""Aenderung der Properties"""
self.secondaryLink=secondaryLink
@@ -1974,7 +1980,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"
@@ -2025,10 +2032,10 @@ class ECHO_collection(Folder, Persistent
def getAllMapAreas(self):
"""Give list of coordinates"""
- subColTypes=['ECHO_collection','ECHO_resource']
+ mapColTypes=['ECHO_collection','ECHO_resource']
areas=[]
- for entrySearch in self.ZopeFind(self,obj_metatypes=subColTypes):
- object=entrySearch[1]
+ for entry in self.getSubCols(self,subColTypes=mapColTypes):
+ object=entry
areas.extend(object.getMapAreas())
return areas
@@ -2054,7 +2061,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"""
@@ -2343,12 +2350,12 @@ class ECHO_root(Folder,Persistent,Implic
meta_type="ECHO_root"
- def content_overview_main_t(self):
- """template for map overview page"""
- pt = zptFile(self, 'zpt/ECHO_content_overview_main')
+ def getContentOverviewTemplate(self):
+ """produces overview template with macro"""
+ pt = zptObjectOrFile(self, 'content_overview_template')
return pt
- ###CDLI adds -> have to be removed
+ ###Cdli adds -> have to be removed
def getTablet(self,item):
#print "getTablet"
try:
@@ -2368,6 +2375,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]