" - - - if RESPONSE is not None: - # RESPONSE.redirect('manage_main') - return ret - + def getPartnerCopyright(self,name,sonst="generic"): """gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung""" #print "hi",name,sonst @@ -1832,25 +1774,10 @@ class ECHO_collection(Folder, Persistent else: return "" - def getTitle(self): - """title""" - try: - return self.title.encode('utf-8','ignore') - except: - self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error - return self.title.encode('utf-8','ignore') - - def getLabel(self): - """title""" - try: - return self.label.encode('utf-8','ignore') - except: - self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error - return self.label.encode('utf-8','ignore') def createRessourcesFromXMLForm(self): """form""" - pt=PageTemplateFile('Products/ECHO_content/zpt/createRessourcesFromXMLForm.zpt').__of__(self) + pt=zptFile(self, 'zpt/createRessourcesFromXMLForm.zpt') return pt() def createRessourcesFromXML(self,fileupload): @@ -1900,6 +1827,11 @@ class ECHO_collection(Folder, Persistent def getCollectionTreeXML(self): """Tree as XML""" + def addPassWd(str): + """adds a user/passwd to an url""" + txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str) + return txt2 + def getCollection(object,depth=0): depth+=1 collections="" @@ -1907,7 +1839,7 @@ class ECHO_collection(Folder, Persistent element=getattr(object,entry) try: if element.meta_type in ["ECHO_collection","ECHO_group"]: - collections+="
"
- except:
- ret+="Error:"+entry[0]+"
" - - else: - self.ECHO_rerenderLinksMD(entry[1]) + def ECHO_rerenderLinksMDWarning(self): + """change form""" + pt=zptFile(self, 'zpt/rerenderLinksWarning') + pt.content_type="text/html" + return pt() - - - return ret+"Rerenderd all links to resources in: "+self.title - security.declarePublic('ECHO_newViewerLink') + security.declarePublic('ECHO_rerenderLinksMD') + def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): + """Rerender all Links""" + return ECHO_rerenderLinksMD(self,obj,types) - def getCoords(self): - try: - - x= [string.join(x,",") for x in self.coords] - return x - - except: - - return [] - + def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""): - self.id = id """Festlegen der ID""" self.credits=toList(credits) @@ -2107,47 +2020,35 @@ class ECHO_collection(Folder, Persistent self.bgcolour=bgcolour - manage_options = Folder.manage_options+( + manage_options = Folder.manage_options+ Cacheable.manage_options+( {'label':'Main Config','action':'ECHO_collection_config'}, {'label':'Change Labels','action':'changeLabels'}, {'label':'Change Titles','action':'changeTitles'}, - {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'}, + {'label':'Change Weights','action':'changeWeights'}, + {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, {'label':'create resources from XML','action':'createRessourcesFromXMLForm'}, - {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'}, - {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'}, + {'label':'Set Startpage','action':'setStartpageFolderForm'}, + {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'}, + {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, {'label':'ImportCollection','action':'updateCollection'}, {'label':'Copy MD for indexing and search','action':'copySearchFields'}, ) def getOverview(self): """overview graphics""" - return self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview'])[0][1] def ECHO_graphicEntry(self): """DO nothing""" overview = self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview']) - - if overview: - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self) + pt=zptFile(self, 'zpt/ECHO_draw.zpt') return pt() else: return "NO OVERVIEW GRAPHICS" - def ECHO_enterCoords(self,coordstr,angle="",RESPONSE=None): - """Enter coords""" - coords=self.coords - temco=coordstr.split(",") - temco.append(angle) - coords.append(temco) - self.coords=coords[0:] - - if RESPONSE is not None: - RESPONSE.redirect('ECHO_graphicEntry') - security.declarePublic('ECHO_collection_config') def ECHO_collection_config(self): @@ -2159,81 +2060,84 @@ class ECHO_collection(Folder, Persistent if not hasattr(self,'sortfield'): self.sortfield="weight" - if not hasattr(self,'coords'): - self.coords=[] - - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_collection.zpt').__of__(self) + pt=zptFile(self, 'zpt/ChangeECHO_collection.zpt') return pt() - security.declarePublic('changeECHO_collection') - - def getBgcolour(self): """colour""" if hasattr(self,'bgcolour') and not (self.bgcolour==""): return self.bgcolour else: return "#dddddd" - - 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): + + + 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): """Aenderung der Properties""" self.secondaryLink=secondaryLink self.secondaryLinkTitle=secondaryLinkTitle self.imageTag=imageTag self.bgcolour=bgcolour - self.viewClassification=viewClassification self.location=location - - if coords: - coordsnew=[ string.split(x,",") for x in coords] - self.coords=coordsnew[0:] - else: - coordsnew=None - self.coords=None + self.isAlwaysClickable=isAlwaysClickable - setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew) - try: - self.coords=coordsnew[0:] # HACK fehler in setECHO_collection - except: - """none""" + setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight) self.sortfield=sortfield if RESPONSE is not None: RESPONSE.redirect('manage_main') + def setAlwaysClickable(self,flag="yes"): + """set clickable""" + if flag=="yes": + self.isAlwaysClickable="yes" + else: + self.isAlwaysClickable=None + return flag + def showOverview(self): """overview""" if 'ECHO_overview.html' in self.__dict__.keys(): return getattr(self,'ECHO_overview.html')() - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_overview.zpt').__of__(self) + pt=zptFile(self, 'zpt/ECHO_content_overview.zpt') return pt() security.declareProtected('View','index_html') def index_html(self): """standard page""" - + if self.ZCacheable_isCachingEnabled(): + + result = self.ZCacheable_get() + if result is not None: + # Got a cached value. + return result + if 'index.html' in self.__dict__.keys(): - return getattr(self,'index.html')() + ret=getattr(self,'index.html')() elif 'overview' in self.__dict__.keys(): - return self.showOverview() + ret=self.showOverview() elif hasattr(self,'collection_index_template'): - return self.collection_index_template() + ret=self.collection_index_template() elif hasattr(self,'main_index_template'): - return self.main_index_template() - - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self) - pt.content_type="text/html" - return pt() + ret=self.main_index_template() + else: + pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt') + pt.content_type="text/html" + ret=pt.render() - def content_html(self): + self.ZCacheable_set(ret) + return ret + + def content_html(self,**argv): """template fuer content""" - return content_html(self,'collection') + #print "NN",argv + return ECHO_basis.content_html(self,'collection') def getCredits(self): """Ausgabe der credits""" @@ -2259,38 +2163,36 @@ class ECHO_collection(Folder, Persistent return sendFile(self, 'js/hl_lib.js', 'text/plain') def js_lib_js(self): + """javascript -- old name""" + return sendFile(self, 'js/baselib.js', 'text/plain') + + def baselib_js(self): """javascript""" - return sendFile(self, 'js/js_lib.js', 'text/plain') + return sendFile(self, 'js/baselib.js', 'text/plain') - def getGraphicCoords(self): + def hl_add_js(self): + """javascript""" + return sendFile(self, 'js/hl_add.js', 'text/plain') + + def getAllMapAreas(self): """Give list of coordinates""" subColTypes=['ECHO_collection','ECHO_resource'] - ids=[] + areas=[] for entrySearch in self.ZopeFind(self,obj_metatypes=subColTypes): object=entrySearch[1] - if hasattr(object,'coords'): - for coordtemp in object.coords: - if len(coordtemp)>3: - coord=coordtemp[0:4] - label="" - vc="" - if hasattr(object,'label') and not object.label=="": - label=object.label - elif hasattr(object,'title') and not object.title=="": - label=object.title - else: - label=object.getId() - if object.viewClassification != "": - vc=object.viewClassification - else: - if len(coordtemp) > 4 and coordtemp[4] != "": - vc="view point" - else: - vc="area" - ids.append([string.join(coord,", "),object.getId(),label,object,coordtemp,vc]) - return ids + areas.extend(object.getMapAreas()) + return areas + def deleteMapAreas(self): + """deletes all map areas from this object""" + for obs in self.ZopeFind(self, obj_metatypes=['MapArea'], search_sub=1): + ob = obs[1] + id = ob.id + parent = ob.aq_parent + print "deleting: ", ob.id + parent._delObject(id) + return "Done" getSubCols = ECHO_helpers.getSubCols @@ -2299,7 +2201,7 @@ Globals.InitializeClass(ECHO_collection) def manage_addECHO_collectionForm(self): """Add collection form""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_collectionForm.zpt').__of__(self) + pt=zptFile(self, 'zpt/AddECHO_collectionForm.zpt') return pt() @@ -2321,21 +2223,12 @@ class ECHO_group(ECHO_collection): manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_group_config'}, - {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'}, + {'label':'Rerender Links','action':'ECHO_rerenderLinksMDWarning'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, ) security.declareProtected('View','index_html') - def showRDF(self): - """showrdf""" - self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') - ret="""\n\n"""
- ret+=self.getRDF(urn="echo:collectionroot")+"\n"
-
- ret+=""" """
-
- return ret
def getRDF(self,urn=None):
"""rdf of the collection"""
@@ -2376,7 +2269,7 @@ class ECHO_group(ECHO_collection):
elif hasattr(self,'main_index_template'):
return self.main_index_template()
- pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt')
pt.content_type="text/html"
return pt()
@@ -2392,11 +2285,11 @@ class ECHO_group(ECHO_collection):
if not hasattr(self,'coords'):
self.coords=[]
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_group.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_group.zpt')
return pt()
def changeECHO_group(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",logo=""):
- """Änderung der Properties"""
+ """Aenderung der Properties"""
self.secondaryLink=secondaryLink
self.secondaryLinkTitle=secondaryLinkTitle
@@ -2404,14 +2297,7 @@ class ECHO_group(ECHO_collection):
self.bgcolour=bgcolour
self.logo=logo
- if coords:
- coordsnew=[ string.split(x,",") for x in coords]
- self.coords=coordsnew[0:]
- else:
- coordsnew=None
- self.coords=None
-
- setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
+ setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
@@ -2429,13 +2315,13 @@ class ECHO_group(ECHO_collection):
def content_html(self):
"""template fuer content"""
- return content_html(self,'group')
+ return ECHO_basis.content_html(self,'group')
def manage_addECHO_groupForm(self):
"""Add group form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_groupForm.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_groupForm.zpt')
return pt()
@@ -2567,22 +2453,233 @@ def manage_addECHO_userFolderForm(self):
"""add a user folder form"""
return manage_addECHO_userFolder(self)
+
+
+def createNode(self,descrs,node):
+ name=descrs[node]['name']
+ type=descrs[node]['type']
+ urn=node
+ #print " will create",node.encode('utf-8')
+ id=re.sub('[^a-zA-Z0-9]','',name).encode('ascii','ignore')
+ #print "id",id
+ #print type
+ #self.REQUEST.RESPONSE.write("\n"""
- ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
- ret+=""" """
- return ret
+
+ def changeWeightsInCollection(self):
+ """change all lables of a collection"""
+ ret=""
+ argv=self.REQUEST.form
+
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+ for resource in resources:
+
+ try:
+ ret+=resource[1].getId()+" "+argv[resource[1].getId()]+""
+ resource[1].weight=argv[resource[1].getId()][0:]
+ except:
+ """not"""
+ return ret
+
+ def changeWeights(self):
+ """change form"""
+ pt=zptFile(self, 'zpt/changeWeightForm')
+ pt.content_type="text/html"
+ return pt()
+ getSubCols = ECHO_helpers.getSubCols
+
+ manage_options=Folder.manage_options+(
+ {'label':'Main Config','action':'ECHO_copyright_configForm'},
+ {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+ {'label':'Change Weights','action':'changeWeights'},
+ {'label':'Generate from RDF','action':'generateFromRDFForm'},
+
+)
+
+
+ def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
+ """warning"""
+ pt=zptFile(self, 'zpt/reloadMetaDataFromStorageWarning.zpt')
+ pt.content_type="text/html"
+ return pt()
+
+ def reloadMetaDataFromStorage(self,RESPONSE=None):
+ """reload MD from Storage"""
+
+ return reloadMetaDataFromStorage(self,RESPONSE)
+
def getRDF(self,urn=None):
"""rdf of the collection"""
@@ -2606,7 +2703,7 @@ class ECHO_root(Folder,Persistent,Implic
def showContent(self,path):
"""return content/html"""
- return urllib.urlopen(path+"/content_html").read()
+ return ECHO_helpers.urlopen(path+"/content_html").read()
def getImageViewers(self):
"""images"""
@@ -2615,7 +2712,7 @@ class ECHO_root(Folder,Persistent,Implic
def getBibTag(self,tag,content):
- """get field tag für index-meta-generation"""
+ """get field tag for index-meta-generation"""
if not content or content=="":
return ""
ret="<%s>"%tag
@@ -2703,7 +2800,7 @@ class ECHO_root(Folder,Persistent,Implic
return retStr
- def copyrightTypeSelector_HTML(self,selected=None,first=None):
+ def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
"""give type selector"""
if not first:
@@ -2724,8 +2821,16 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""
" - - else: - self.ECHO_rerenderLinksMD(entry[1]) + def ECHO_rerenderLinksMDWarning(self): + """change form""" + pt=zptFile(self, 'zpt/rerenderLinksWarning') + pt.content_type="text/html" + return pt() - - - return ret+"Rerenderd all links to resources in: "+self.title - security.declarePublic('ECHO_newViewerLink') + security.declarePublic('ECHO_rerenderLinksMD') + def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): + """Rerender all Links""" + return ECHO_rerenderLinksMD(self,obj,types) - def getCoords(self): - try: - - x= [string.join(x,",") for x in self.coords] - return x - - except: - - return [] - + def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""): - self.id = id """Festlegen der ID""" self.credits=toList(credits) @@ -2107,47 +2020,35 @@ class ECHO_collection(Folder, Persistent self.bgcolour=bgcolour - manage_options = Folder.manage_options+( + manage_options = Folder.manage_options+ Cacheable.manage_options+( {'label':'Main Config','action':'ECHO_collection_config'}, {'label':'Change Labels','action':'changeLabels'}, {'label':'Change Titles','action':'changeTitles'}, - {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'}, + {'label':'Change Weights','action':'changeWeights'}, + {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, {'label':'create resources from XML','action':'createRessourcesFromXMLForm'}, - {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'}, - {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'}, + {'label':'Set Startpage','action':'setStartpageFolderForm'}, + {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'}, + {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, {'label':'ImportCollection','action':'updateCollection'}, {'label':'Copy MD for indexing and search','action':'copySearchFields'}, ) def getOverview(self): """overview graphics""" - return self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview'])[0][1] def ECHO_graphicEntry(self): """DO nothing""" overview = self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['overview']) - - if overview: - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self) + pt=zptFile(self, 'zpt/ECHO_draw.zpt') return pt() else: return "NO OVERVIEW GRAPHICS" - def ECHO_enterCoords(self,coordstr,angle="",RESPONSE=None): - """Enter coords""" - coords=self.coords - temco=coordstr.split(",") - temco.append(angle) - coords.append(temco) - self.coords=coords[0:] - - if RESPONSE is not None: - RESPONSE.redirect('ECHO_graphicEntry') - security.declarePublic('ECHO_collection_config') def ECHO_collection_config(self): @@ -2159,81 +2060,84 @@ class ECHO_collection(Folder, Persistent if not hasattr(self,'sortfield'): self.sortfield="weight" - if not hasattr(self,'coords'): - self.coords=[] - - pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_collection.zpt').__of__(self) + pt=zptFile(self, 'zpt/ChangeECHO_collection.zpt') return pt() - security.declarePublic('changeECHO_collection') - - def getBgcolour(self): """colour""" if hasattr(self,'bgcolour') and not (self.bgcolour==""): return self.bgcolour else: return "#dddddd" - - 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): + + + 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): """Aenderung der Properties""" self.secondaryLink=secondaryLink self.secondaryLinkTitle=secondaryLinkTitle self.imageTag=imageTag self.bgcolour=bgcolour - self.viewClassification=viewClassification self.location=location - - if coords: - coordsnew=[ string.split(x,",") for x in coords] - self.coords=coordsnew[0:] - else: - coordsnew=None - self.coords=None + self.isAlwaysClickable=isAlwaysClickable - setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew) - try: - self.coords=coordsnew[0:] # HACK fehler in setECHO_collection - except: - """none""" + setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight) self.sortfield=sortfield if RESPONSE is not None: RESPONSE.redirect('manage_main') + def setAlwaysClickable(self,flag="yes"): + """set clickable""" + if flag=="yes": + self.isAlwaysClickable="yes" + else: + self.isAlwaysClickable=None + return flag + def showOverview(self): """overview""" if 'ECHO_overview.html' in self.__dict__.keys(): return getattr(self,'ECHO_overview.html')() - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_overview.zpt').__of__(self) + pt=zptFile(self, 'zpt/ECHO_content_overview.zpt') return pt() security.declareProtected('View','index_html') def index_html(self): """standard page""" - + if self.ZCacheable_isCachingEnabled(): + + result = self.ZCacheable_get() + if result is not None: + # Got a cached value. + return result + if 'index.html' in self.__dict__.keys(): - return getattr(self,'index.html')() + ret=getattr(self,'index.html')() elif 'overview' in self.__dict__.keys(): - return self.showOverview() + ret=self.showOverview() elif hasattr(self,'collection_index_template'): - return self.collection_index_template() + ret=self.collection_index_template() elif hasattr(self,'main_index_template'): - return self.main_index_template() - - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self) - pt.content_type="text/html" - return pt() + ret=self.main_index_template() + else: + pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt') + pt.content_type="text/html" + ret=pt.render() - def content_html(self): + self.ZCacheable_set(ret) + return ret + + def content_html(self,**argv): """template fuer content""" - return content_html(self,'collection') + #print "NN",argv + return ECHO_basis.content_html(self,'collection') def getCredits(self): """Ausgabe der credits""" @@ -2259,38 +2163,36 @@ class ECHO_collection(Folder, Persistent return sendFile(self, 'js/hl_lib.js', 'text/plain') def js_lib_js(self): + """javascript -- old name""" + return sendFile(self, 'js/baselib.js', 'text/plain') + + def baselib_js(self): """javascript""" - return sendFile(self, 'js/js_lib.js', 'text/plain') + return sendFile(self, 'js/baselib.js', 'text/plain') - def getGraphicCoords(self): + def hl_add_js(self): + """javascript""" + return sendFile(self, 'js/hl_add.js', 'text/plain') + + def getAllMapAreas(self): """Give list of coordinates""" subColTypes=['ECHO_collection','ECHO_resource'] - ids=[] + areas=[] for entrySearch in self.ZopeFind(self,obj_metatypes=subColTypes): object=entrySearch[1] - if hasattr(object,'coords'): - for coordtemp in object.coords: - if len(coordtemp)>3: - coord=coordtemp[0:4] - label="" - vc="" - if hasattr(object,'label') and not object.label=="": - label=object.label - elif hasattr(object,'title') and not object.title=="": - label=object.title - else: - label=object.getId() - if object.viewClassification != "": - vc=object.viewClassification - else: - if len(coordtemp) > 4 and coordtemp[4] != "": - vc="view point" - else: - vc="area" - ids.append([string.join(coord,", "),object.getId(),label,object,coordtemp,vc]) - return ids + areas.extend(object.getMapAreas()) + return areas + def deleteMapAreas(self): + """deletes all map areas from this object""" + for obs in self.ZopeFind(self, obj_metatypes=['MapArea'], search_sub=1): + ob = obs[1] + id = ob.id + parent = ob.aq_parent + print "deleting: ", ob.id + parent._delObject(id) + return "Done" getSubCols = ECHO_helpers.getSubCols @@ -2299,7 +2201,7 @@ Globals.InitializeClass(ECHO_collection) def manage_addECHO_collectionForm(self): """Add collection form""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_collectionForm.zpt').__of__(self) + pt=zptFile(self, 'zpt/AddECHO_collectionForm.zpt') return pt() @@ -2321,21 +2223,12 @@ class ECHO_group(ECHO_collection): manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_group_config'}, - {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'}, + {'label':'Rerender Links','action':'ECHO_rerenderLinksMDWarning'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, ) security.declareProtected('View','index_html') - def showRDF(self): - """showrdf""" - self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') - ret="""\n
%s
\n"%id) + if type=="CDLI_group": + + try: + manage_addECHO_collection(self,id,name,name,"","","","","") + + except: + self.REQUEST.RESPONSE.write("
Error%s
\n"%id) + + self.REQUEST.RESPONSE.write("Creates:%s
\n"%getattr(self,id).absolute_url()) + + return type,getattr(self,id),urn + + if type=="CDLI_item": + try: + manage_addECHO_resource(self,id,name,name,"","",urn,"","") + except: + self.REQUEST.RESPONSE.write("Error%s
\n"%id) + self.REQUEST.RESPONSE.write("Creates:%s
\n"%getattr(self,id).absolute_url()) + + + return "XX" + + class ECHO_root(Folder,Persistent,Implicit): """ECHO Root Folder""" security=ClassSecurityInfo() meta_type="ECHO_root" + + ###CDLI adds -> have to be removed + def getTablet(self,item): + #print "getTablet" + try: + read=urllib.urlopen("http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"%item).read() + read=re.sub("\[search\]","search",read) + return read[read.find("")+6:read.rfind("")] + except: + return "