' in self.showMetaDataXML()):
- nurn=self.absolute_url()+'/showMetaDataXML'
- ret+=getRDFDescription(self,self.absolute_url()+'/showMetaDataXML',urn=nurn,nameDef="Metadata",typeName="ECHO_metaData")
+ width,height=A4
+ #print image%(width*faktor,height*faktor,i)
+ url=urllib.urlopen(image%(width*faktor,height*faktor,i)).read()
+ fh=file(fn,"w")
+ fh.write(url)
+ fh.close()
- return ret
-
+
+
+ c.drawImage(fn,0,0,width=width,height=height)
+ c.showPage()
+ c.save()
+ if RESPONSE:
+ RESPONSE.write("finished
\n")
+
+ if RESPONSE:
+ len=os.stat(tmpZip)[6]
+ downloadUrl=self.absolute_url()+"/downloadPDF"
+ RESPONSE.write("""
\n"""%(tmpFn,len))
+ RESPONSE.write("""The file will be stored for a while, you can download it later, the URL is:
+ %s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn))
+ RESPONSE.close()
+
+
+ def downloadPDF(self,fn):
+ """download prepared set"""
+ filename="/tmp/archivesImageServer/"+fn
+ namePDF=self.getId()+".pdf"
+ self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%namePDF)
+ self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
+ len=os.stat(filename)[6]
+ self.REQUEST.RESPONSE.setHeader("Content-Length",len)
+ images=file(filename).read()
+ self.REQUEST.RESPONSE.write(images)
+ self.REQUEST.RESPONSE.close()
+
+
+ def getRDF(self,urn=None):
+ """rdf"""
+ ret=getRDFDescription(self,self.link,urn=urn)
+ return ret+self.createSubElementRDF(urn=urn)
+
+
def getAccessRightSelectorHTML(self,outlook="select"):
"""htmlselector"""
values=['free','mpiwg']
@@ -1003,7 +516,7 @@ class ECHO_resource(Folder,Persistent):
"""Form for changing the startpage"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPage.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resourceStartPage.zpt')
pt.content_type="text/html"
return pt()
@@ -1012,7 +525,7 @@ class ECHO_resource(Folder,Persistent):
"""create ImageUrl"""
- resourcepath=readFieldFromXML(self.metalink,'resource','archive-path').replace('/mpiwg/online','')
+ resourcepath=readFieldFromXML(self.metalink,'resource','archive-path')
digiliburlprefix=readFieldFromXML(self.metalink,'texttool','digiliburlprefix')
images=readFieldFromXML(self.metalink,'texttool','image')
@@ -1021,7 +534,7 @@ class ECHO_resource(Folder,Persistent):
if (not resourcepath) or (not digiliburlprefix) or (not images):
zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
return None
-
+ resourcepath=resourcepath.replace('/mpiwg/online','')
if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
if (not images) or (not resourcepath): return None
@@ -1100,7 +613,7 @@ class ECHO_resource(Folder,Persistent):
def changeViewerTemplateSetForm(self):
"""change the viewer template set"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeResourceViewerTemplateSet').__of__(self)
+ pt=zptFile(self, 'zpt/changeResourceViewerTemplateSet')
return pt()
@@ -1165,25 +678,11 @@ class ECHO_resource(Folder,Persistent):
RESPONSE.redirect('manage_main')
- 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 content_html(self):
"""template fuer content"""
- return content_html(self,'resource')
+ return ECHO_basis.content_html(self,'resource')
def getViewClassification(self):
if hasattr(self,'viewClassification'):
@@ -1227,8 +726,11 @@ class ECHO_resource(Folder,Persistent):
else:
return "no fulltext available"
-
- def getImageView(self,noredirect=None):
+ def getImagePath(self):
+ """gibt pfad zum image aus"""
+ return self.getImageView(noredirect="yes",onlyPath="yes")
+
+ def getImageView(self,noredirect=None,onlyPath=None):
"""getImages; give Imageviewr and if somthing goes wrong."""
try:
fh=ECHO_helpers.urlopen(self.metalink)
@@ -1247,7 +749,10 @@ class ECHO_resource(Folder,Persistent):
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
self.REQUEST.RESPONSE.redirect(imageurl)
else:
- return imageurl
+ if not onlyPath:
+ return imageurl
+ else:
+ return archivepath+"/"+imagetemp
except:
if not noredirect:
@@ -1294,7 +799,7 @@ class ECHO_resource(Folder,Persistent):
return ret
def getInstitutionsHTML(self):
- """gibt Liste der frdernden Institutionen aus"""
+ """gibt Liste der foerdernden Institutionen aus"""
if hasattr(self,'support'):
obj=self.support
@@ -1310,6 +815,8 @@ class ECHO_resource(Folder,Persistent):
return self.credits
else:
return []
+
+
def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
@@ -1335,18 +842,9 @@ class ECHO_resource(Folder,Persistent):
coordsnew=[]
self.coords=coordsnew
+ self.viewClassification=""
- def getCoords(self):
- """gibt coordinaten als String zurück und löscht zugleich einträge die keine Koordinaten sind, letzteres zur korrektur der Eingabe der alten version"""
- retList=[]
- if hasattr(self,'coords'):
- for x in self.coords:
- if len(x)>1:
- retList.append(string.join(x,","))
- return retList
-
-
def getContentType(self):
try:
@@ -1372,34 +870,29 @@ class ECHO_resource(Folder,Persistent):
if not hasattr(self,'weight'):
self.weight=""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resource.zpt')
return pt()
def ECHO_resource_config_main(self):
"""Main configuration"""
-
if not hasattr(self,'weight'):
self.weight=""
-
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_main.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resource_main.zpt')
return pt()
def ECHO_resource_config_coords(self):
"""Coords configuration """
-
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_coords.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resource_coords.zpt')
return pt()
def ECHO_resource_config_credits(self):
"""Main configuration"""
-
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_credits.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resource_credits.zpt')
return pt()
def ECHO_resource_config_metadata(self):
"""Main configuration"""
-
if (hasattr(self,'metadata')) and not (hasattr(self,'metaDataHash')):
self.metaDataHash={}
self.contentType=self.bib_type
@@ -1409,14 +902,14 @@ class ECHO_resource(Folder,Persistent):
DataHash[data_neu]=getattr(self,data)[0:]
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
return pt()
def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
- """Änderung der Properties"""
+ """Aenderung der Properties"""
self.resourceID=resourceID
self.title=title
self.label=label
@@ -1433,25 +926,34 @@ class ECHO_resource(Folder,Persistent):
RESPONSE.redirect('manage_main')
- def changeECHO_resource_coords(self,coords,viewClassification,RESPONSE=None):
- """Änderung der Properties - coords"""
-
- if type(coords)==StringType:
- coords=[coords]
-
- try:
- coordsnew=[ string.split(x,",") for x in coords]
- except:
- coordsnew=[]
+ def changeECHO_resource_coords(self,RESPONSE=None):
+ """Aenderung der Properties - coords"""
+ #return self.REQUEST
+ for area in self.getMapAreas():
+ id = area.getId()
+ if self.REQUEST.has_key('del.'+id):
+ # delete this area
+ self._delObject(id)
+ # return to same menu
+ if RESPONSE is not None:
+ RESPONSE.redirect('ECHO_resource_config_coords')
+ return
+ # modify this area
+ coordstring = self.REQUEST.get('coords.'+id, '')
+ coords = string.split(coordstring, ',')
+ angle = self.REQUEST.get('angle.'+id, '0')
+ type = self.REQUEST.get('type.'+id, 'area')
+ if len(coords) == 4:
+ area.setCoordString(coordstring)
+ area.setAngle(angle)
+ area.setType(type)
+ # return to main menu
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
- self.coords=coordsnew[0:]
- self.viewClassification=viewClassification
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
def changeECHO_resource_credits(self,credits,responsible,copyrightType,RESPONSE=None):
- """Änderung der Properties"""
+ """Aenderung der Properties"""
self.credits=credits
self.responsible=responsible
self.copyrightType=copyrightType
@@ -1489,9 +991,13 @@ class ECHO_resource(Folder,Persistent):
RESPONSE.redirect('manage_main')
- def getMDValue(self,fieldName):
- return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
-
+ def getMDValue(self,fieldName,empty=None):
+ if empty:
+ return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+
+ else:
+ return self.metaDataHash.get(fieldName,empty)
+
def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
"""new index.meta"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
@@ -1519,7 +1025,7 @@ class ECHO_resource(Folder,Persistent):
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):
- """Änderung der Properties"""
+ """Aenderung der Properties"""
try:
coordsnew=[ string.split(x,",") for x in coords]
@@ -1539,8 +1045,8 @@ class ECHO_resource(Folder,Persistent):
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_resource_config_main'},
{'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
- {'label':'Change Coords','action':'ECHO_resource_config_coords'},
- {'label':'Add coords','action':'ECHO_graphicEntry'},
+ {'label':'Edit Coords','action':'ECHO_resource_config_coords'},
+ {'label':'Change Coords','action':'ECHO_graphicEntry'},
{'label':'Sync Metadata','action':'ECHO_getResourceMD'},
{'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},
@@ -1549,14 +1055,13 @@ class ECHO_resource(Folder,Persistent):
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"
@@ -1754,7 +1259,7 @@ class ECHO_resource(Folder,Persistent):
self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
self.REQUEST.SESSION['contentZope']=self.contentType
- return PageTemplateFile('Products/ECHO_content/zpt/ECHO_getResourceMDErrorContentType.zpt').__of__(self)()
+ return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
self.REQUEST.SESSION['metadict']=metadict
@@ -1765,7 +1270,7 @@ class ECHO_resource(Folder,Persistent):
if template=="yes":
- pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_resourceMD.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')
return pt()
@@ -1775,10 +1280,27 @@ class ECHO_resource(Folder,Persistent):
def ECHO_getMD(self,item):
"""Ausgabe der MD"""
return getattr(self,item)
-
+
+ def checkRDF(self,path):
+ """check if pdf in the path"""
+ try:
+ for fileName in os.listdir(path):
+ if os.path.splitext(fileName)[1]==".pdf":
+ return os.path.join(path,fileName)
+ return None
+ except:
+ return None
+
+
def index_html(self):
"""standard page"""
-
+ pdf=self.checkRDF(self.link)
+ if pdf:
+ fh=file(pdf,'r').read()
+ self.REQUEST.RESPONSE.setHeader('Content-Type','x-Application/pdf')
+ self.REQUEST.RESPONSE.write(fh)
+ self.REQUEST.RESPONSE.close()
+ return
return self.REQUEST.RESPONSE.redirect(self.link)
def startpage_html(self):
@@ -1791,13 +1313,13 @@ class ECHO_resource(Folder,Persistent):
if sp:
return sp[1]()
- #prüfen ob irgendwo ein template
+ #pruefen ob irgendwo ein template
if hasattr(self,'startpage_index_template'):
return self.startpage_index_template()
#generisches template ausgeben
- pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_startpage_index_template_standard.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ECHO_startpage_index_template_standard.zpt')
pt.content_type="text/html"
return pt()
@@ -1832,7 +1354,7 @@ Globals.InitializeClass(ECHO_resource)
def manage_addECHO_resourceForm(self):
"""Form for adding a ressource"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_resourceForm.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_resourceForm.zpt')
return pt()
@@ -1848,30 +1370,15 @@ def manage_addECHO_resource(self,id,titl
RESPONSE.redirect('manage_main')
-class ECHO_externalLink(Folder):
+class ECHO_externalLink(Folder,ECHO_basis):
"""Link zu einer externen Ressource"""
security=ClassSecurityInfo()
meta_type='ECHO_externalLink'
- 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 content_html(self):
"""template fuer content"""
- return content_html(self,'externalLink')
+ return ECHO_basis.content_html(self,'externalLink')
def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
@@ -1899,13 +1406,13 @@ class ECHO_externalLink(Folder):
self.coords=['']
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_externalLink.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_externalLink.zpt')
return pt()
def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
- """Änderung der Properties"""
+ """Aenderung der Properties"""
try:
coordsnew=[ string.split(x,",") for x in coords]
except:
@@ -1931,7 +1438,7 @@ class ECHO_externalLink(Folder):
def manage_addECHO_externalLinkForm(self):
"""Form for external Links"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_externalLinkForm.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_externalLinkForm.zpt')
return pt()
@@ -1955,13 +1462,13 @@ class ECHO_link(ECHO_externalLink):
def content_html(self):
"""template fuer link"""
if hasattr(self,"link_template"):
- return content_html(self,'link')
+ return ECHO_basis.content_html(self,'link')
else:
- return content_html(self,'collection')
+ return ECHO_basis.content_html(self,'collection')
def manage_addECHO_linkForm(self):
"""Form for external Links"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkForm.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_linkForm.zpt')
return pt()
@@ -1976,7 +1483,7 @@ def manage_addECHO_link(self,id,title,la
RESPONSE.redirect('manage_main')
-class ECHO_collection(Folder, Persistent, Implicit, Cacheable):
+class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis):
"""ECHO Collection"""
security=ClassSecurityInfo()
@@ -2008,40 +1515,29 @@ class ECHO_collection(Folder, Persistent
ret+=li%nurn
return ret+""
-
- 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 changeLabels(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self)
+ pt=zptFile(self, 'zpt/changeLabelsForm')
pt.content_type="text/html"
return pt()
def changeTitles(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeTitleForm').__of__(self)
+ pt=zptFile(self, 'zpt/changeTitleForm')
pt.content_type="text/html"
return pt()
def changeWeights(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeWeightForm').__of__(self)
+ pt=zptFile(self, 'zpt/changeWeightForm')
pt.content_type="text/html"
return pt()
def changeMetaDataLinks(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeMetaDataLinkForm').__of__(self)
+ pt=zptFile(self, 'zpt/changeMetaDataLinkForm')
pt.content_type="text/html"
return pt()
def changeAccessRightsCollection(self):
@@ -2166,7 +1662,7 @@ class ECHO_collection(Folder, Persistent
def changeViewerTemplateSetsForm(self):
"""change the viewer template set"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
+ pt=zptFile(self, 'zpt/changeViewerTemplateSet')
return pt()
def getViewerTemplateSets(self,obj_ids=None,RESPONSE=None):
@@ -2191,7 +1687,7 @@ class ECHO_collection(Folder, Persistent
def isSelectedViewerTemplateSet(self,obj,id):
- """is ausgewählt"""
+ """is ausgewaehlt"""
if self.REQUEST['viewerTemplateSet']==id:
return 1
@@ -2215,7 +1711,7 @@ class ECHO_collection(Folder, Persistent
"""Form for changing the startpage"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPageFolder.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_resourceStartPageFolder.zpt')
pt.content_type="text/html"
return pt()
@@ -2266,7 +1762,7 @@ class ECHO_collection(Folder, Persistent
def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
"""warning"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/reloadMetaDataFromStorageWarning.zpt')
pt.content_type="text/html"
return pt()
@@ -2310,25 +1806,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):
@@ -2390,7 +1871,7 @@ class ECHO_collection(Folder, Persistent
element=getattr(object,entry)
try:
if element.meta_type in ["ECHO_collection","ECHO_group"]:
- collections+=""
+ collections+=""
collections+=getCollection(element,depth)+"\n"
except:
"""nothing"""
@@ -2413,19 +1894,30 @@ class ECHO_collection(Folder, Persistent
ret+=javaHandler%dynamical
return ret
- def createJSAreas(self):
+ def newMapArea(self, id, coords=None):
+ """returns a new MapArea"""
+ if coords is None:
+ coords = [0,0,0,0]
+ return MapArea(id, coords)
+
+ def createJSAreas(self, areas):
"""create area calls for JavaScript"""
dynamical="\n"
- for ob in self.getGraphicCoords():
- if ob[5] == "area":
- dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob[1],ob[0])
+ for ob in areas:
+ if ob.isTypeArrow():
+ dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob.getFullId(),ob.getCoordString())
else:
- dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob[1],ob[0])
+ dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob.getFullId(),ob.getCoordString())
return dynamical
+ def createAllJSAreas(self):
+ """create area calls for JavaScript"""
+ areas = self.getAllMapAreas()
+ return self.createJSAreas(areas)
+
def createMapHead(self):
"""create javascript include and script tags for head"""
- pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_content_map_frag_js')).__of__(self)
+ pt=zptFile(self, 'zpt/ECHO_content_map_frag_js')
return pt()
def createMapImg(self):
@@ -2442,46 +1934,46 @@ class ECHO_collection(Folder, Persistent
def createMapLink(self, ob, text=None):
"""generate map link"""
bt = BrowserCheck(self)
- id = ob[1]
- link = ob[1]
- if text == None:
- text = ob[2]
+ id = ob.getFullId()
+ link = ob.getLinkId()
+ if text is None:
+ text = ob.getLabel()
+ if text is None:
+ text = "link"
tag = ""
if bt.isN4:
tag += '" + text + ""
else:
tag = '" + text + ""
return tag
def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil"):
"""generate map link image, text and other stuff"""
- id = ob[1]
- link = ob[1]
- vtype = ob[5]
- ctype = ob[3].contentType
bt = BrowserCheck(self)
+ id = ob.getFullId()
+ link = ob.getLinkId()
+ tiptext = ob.getText()
tag = ""
if bt.isN4:
tag += ''%(id,id,id)
- if vtype == "view point":
- rot = ob[4][4]
+ if ob.isTypeArrow():
+ rot = ob.angle
tag += ''%(link,arrowsrc,rot)
else:
tag += ''
tag += ''
else:
tag = ''%(id,id,id,link)
- if vtype == "view point":
- rot = ob[4][4]
+ if ob.isTypeArrow():
+ rot = ob.angle
if bt.isIEWin and bt.versIE > 5:
tag += ''%(id,arrowsrc,rot,arrowsrc,rot)
else:
@@ -2491,9 +1983,8 @@ class ECHO_collection(Folder, Persistent
tag += '
'
tag += ''
return tag
@@ -2526,38 +2017,23 @@ class ECHO_collection(Folder, Persistent
ret.append((label,link))
return ret
- security.declarePublic('ECHO_rerenderLinksMD')
-
def ECHO_rerenderLinksMDWarning(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/rerenderLinksWarning').__of__(self)
+ pt=zptFile(self, 'zpt/rerenderLinksWarning')
pt.content_type="text/html"
return pt()
+ security.declarePublic('ECHO_rerenderLinksMD')
def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
"""Rerender all Links"""
return ECHO_rerenderLinksMD(self,obj,types)
- security.declarePublic('ECHO_newViewerLink')
-
-
- 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)
@@ -2593,32 +2069,18 @@ class ECHO_collection(Folder, Persistent
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):
@@ -2633,20 +2095,19 @@ class ECHO_collection(Folder, Persistent
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"
-
+
+
+ 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"""
@@ -2689,7 +2150,7 @@ class ECHO_collection(Folder, Persistent
"""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')
@@ -2713,16 +2174,17 @@ class ECHO_collection(Folder, Persistent
elif hasattr(self,'main_index_template'):
ret=self.main_index_template()
else:
- pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
- pt.content_type="text/html"
- ret=pt.render()
+ pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt')
+ pt.content_type="text/html"
+ ret=pt.render()
self.ZCacheable_set(ret)
return ret
- def content_html(self):
+ 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"""
@@ -2748,39 +2210,77 @@ 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/baselib.js', 'text/plain')
+
+ def hl_add_js(self):
"""javascript"""
- return sendFile(self, 'js/js_lib.js', 'text/plain')
+ return sendFile(self, 'js/hl_add.js', 'text/plain')
- def getGraphicCoords(self):
+ 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"
+
+ def repairCoords(self):
+ """updates map coordinates to new class objects"""
+ msg = ""
+ for cols in self.ZopeFind(self, obj_metatypes=['ECHO_collection','ECHO_resource'], search_sub=1):
+ col = cols[1]
+ if not hasattr(col, 'coords'):
+ continue
+ print "fixing: ", col.id
+ msg += "fixing: "+col.id+"\n"
+ coords = col.coords
+ if len(coords) > 0:
+ # delete old MapAreas
+ for areas in self.ZopeFind(col, obj_metatypes=['MapArea']):
+ #area = areas[1]
+ id = areas[0]
+ print " deleting: ", id
+ msg += " deleting: "+id+"\n"
+ col._delObject(id)
+ # add new MapAreas
+ areacnt = 0
+ for coord in coords:
+ if len(coord) < 4:
+ continue
+ type = col.viewClassification
+ if type == 'view point':
+ type = 'arrow'
+ if type is None:
+ if len(coord) > 4:
+ type = 'arrow'
+ else:
+ type = 'area'
+ newid = "a%02d"%areacnt
+ areacnt += 1
+ area = MapArea(newid, coord, type=type)
+ print " adding: ", newid
+ msg += " adding: "+newid+"\n"
+ col.addMapArea(area) print "added"
+ msg += "\nDone!"
+ return msg
getSubCols = ECHO_helpers.getSubCols
@@ -2788,7 +2288,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()
@@ -2816,15 +2316,6 @@ class ECHO_group(ECHO_collection):
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"""
@@ -2865,7 +2356,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()
@@ -2881,11 +2372,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
@@ -2918,13 +2409,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()
@@ -3109,6 +2600,23 @@ class ECHO_root(Folder,Persistent,Implic
#return "http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"
###END CDLI add
+
+ def checkResource(self,id):
+ """checks if a resource is in the tree, gives back none or list of resources"""
+ 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]
+
+ else:
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],obj_ids=[id],search_sub=1)
+
+ if not hasattr(self,"_v_checkResource"): self._v_checkResource={}#lege cache an falls nicht existent
+ if resources:
+ self._v_checkResource[id]=resources[0:] # slicing to be sure that data is stabil
+ else:
+ self._v_checkResource[id]=None
+
+ return self._v_checkResource[id]
+
def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'):
"""sendform"""
toaddrs=["dwinter@mpiwg-berlin.mpg.de"]
@@ -3123,7 +2631,7 @@ class ECHO_root(Folder,Persistent,Implic
def generateFromRDFForm(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/generateFromRDFForm').__of__(self)
+ pt=zptFile(self, 'zpt/generateFromRDFForm')
pt.content_type="text/html"
return pt()
@@ -3240,7 +2748,7 @@ class ECHO_root(Folder,Persistent,Implic
def changeWeights(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/changeWeightForm').__of__(self)
+ pt=zptFile(self, 'zpt/changeWeightForm')
pt.content_type="text/html"
return pt()
getSubCols = ECHO_helpers.getSubCols
@@ -3254,19 +2762,10 @@ class ECHO_root(Folder,Persistent,Implic
)
- 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 reloadMetaDataFromStorageWarning(self,RESPONSE=None):
"""warning"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/reloadMetaDataFromStorageWarning.zpt')
pt.content_type="text/html"
return pt()
@@ -3307,7 +2806,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
@@ -3445,7 +2944,7 @@ class ECHO_root(Folder,Persistent,Implic
"""nothing"""
return retStr
- mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version über echoroot??
+ mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version ueber echoroot??
def mediaTypeSelector_HTML(self,selected=None):
"""give type selector"""
@@ -3537,6 +3036,7 @@ class ECHO_root(Folder,Persistent,Implic
+ security.declarePublic('ECHO_newViewerLink')
def ECHO_newViewerLink(self,obj=None):
"""change links (:86 faellt weg)"""
@@ -3607,9 +3107,9 @@ class ECHO_root(Folder,Persistent,Implic
if self.checkRef(ref):
if pn:
- link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn)
+ link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&p="+pn)
else:
- link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+ link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref)
newxml=dom.toxml('utf-8')
@@ -3692,9 +3192,10 @@ class ECHO_root(Folder,Persistent,Implic
def getPartners(self):
"""Get list of Partners. Presently only from a subfolder partners"""
-
- return [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
-
+ if hasattr(self,'partners'):
+ return [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
+ else:
+ return []
def getInstitutions(self):
"""Get list of Partners. Presently only from a subfolder partners"""
@@ -3885,10 +3386,10 @@ def manage_addECHO_root(self,id,title,RE
def manage_addECHO_rootForm(self):
"""Nothing yet"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_root.zpt')
return pt()
-class ECHO_copyrightType(Folder):
+class ECHO_copyrightType(Folder,ECHO_basis):
"""copyright typ"""
meta_type="ECHO_copyrightType"
@@ -3906,7 +3407,7 @@ class ECHO_copyrightType(Folder):
def ECHO_copyrightType_config_mainForm(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyrightType').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_copyrightType')
pt.content_type="text/html"
return pt()
@@ -3921,7 +3422,7 @@ class ECHO_copyrightType(Folder):
def manage_addECHO_copyrightTypeForm(self):
"""Form for adding a ressource"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyrightTypeForm.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_copyrightTypeForm.zpt')
return pt()
@@ -3937,7 +3438,7 @@ def manage_addECHO_copyrightType(self,id
-class ECHO_partner(Image,Persistent):
+class ECHO_partner(Image,Persistent,ECHO_basis):
"""ECHO Partner"""
meta_type="ECHO_partner"
@@ -3978,7 +3479,7 @@ class ECHO_partner(Image,Persistent):
"""Main configuration"""
if not hasattr(self,'url'):
self.url=""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_partner.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
return pt()
@@ -4021,7 +3522,7 @@ def manage_addECHO_partner(self, id, url
REQUEST.RESPONSE.redirect('%s/manage_main' % url)
return id
-class ECHO_linkList(ZopePageTemplate):
+class ECHO_linkList(ZopePageTemplate,ECHO_basis):
"""LinkList Objekt"""
meta_type="ECHO_linkList"
@@ -4033,11 +3534,11 @@ class ECHO_linkList(ZopePageTemplate):
def content_html(self):
"""content_html"""
- return content_html(self,'pageTemplate')
+ return ECHO_basis.content_html(self,'pageTemplate')
def changeECHO_linkListWeightForm(self):
"""change"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_linkListTemplate.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_linkListTemplate.zpt')
return pt()
def changeECHO_linkListWeight(self,contentType,label,RESPONSE=None):
@@ -4075,11 +3576,9 @@ class ECHO_linkList(ZopePageTemplate):
def manage_addECHO_linkListForm(self):
"""Form for adding"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkListTemplate.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_linkListTemplate.zpt')
return pt()
-from urllib import quote
-
def manage_addECHO_linkList(self, id, label,contentType=0,title=None, text=None,
REQUEST=None, submit=None):
@@ -4112,13 +3611,13 @@ def manage_addECHO_linkList(self, id, la
u = REQUEST['URL1']
if submit == " Add and Edit ":
- u = "%s/%s" % (u, quote(id))
+ u = "%s/%s" % (u, urllib.quote(id))
REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''
-class ECHO_support(Folder):
- """gefrdert durch"""
+class ECHO_support(Folder,ECHO_basis):
+ """gefoerdert durch"""
meta_type="ECHO_support"
@@ -4142,7 +3641,7 @@ class ECHO_support(Folder):
def ECHO_support_configForm(self):
"""change form"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_support').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_support')
pt.content_type="text/html"
return pt()
@@ -4156,7 +3655,7 @@ class ECHO_support(Folder):
def manage_addECHO_supportForm(self):
"""Form for adding"""
- pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_support.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/AddECHO_support.zpt')
return pt()
def manage_addECHO_support(self, id,institutions=None,RESPONSE=None):
@@ -4171,7 +3670,7 @@ def manage_addECHO_support(self, id,inst
RESPONSE.redirect('manage_main')
-class ECHO_institution(Image,Persistent):
+class ECHO_institution(Image,Persistent,ECHO_basis):
"""ECHO Institution"""
meta_type="ECHO_institution"
@@ -4208,7 +3707,7 @@ class ECHO_institution(Image,Persistent)
"""Main configuration"""
if not hasattr(self,'url'):
self.url=""
- pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_institution.zpt').__of__(self)
+ pt=zptFile(self, 'zpt/ChangeECHO_institution.zpt')
return pt()
@@ -4250,3 +3749,4 @@ def manage_addECHO_institution(self, id,
except: url=REQUEST['URL1']
REQUEST.RESPONSE.redirect('%s/manage_main' % url)
return id
+