--- ECHO_content/ECHO_collection.py 2004/05/06 13:29:45 1.56
+++ ECHO_content/ECHO_collection.py 2004/05/10 14:18:33 1.76
@@ -45,6 +45,29 @@ import ECHO_helpers
#List of different types for the graphical linking viewer
viewClassificationListMaster=['view point','area']
+def checkDiffs(self,metadict):
+ """check differences"""
+
+ def NoneToEmpty(obj):
+ if obj:
+ return obj
+ else:
+ return ""
+
+ diffs={}
+ tags=self.findTagsFromMapping(self.contentType)
+ for field in tags[1]:
+ try:
+ if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
+ diffs[self.getFieldTag(tags,field)]=1
+ else:
+ print "DIFF",field,self.getFieldValue(self.getFieldTag(tags,field)),metadict[self.getFieldTag(tags,field)]
+ diffs[self.getFieldTag(tags,field)]=0
+ except:
+ diffs[self.getFieldTag(tags,field)]=0
+ print "EX",field
+ return diffs
+
def content_html(self,type):
"""template fuer content"""
#templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
@@ -76,8 +99,81 @@ def getText(nodelist):
return rc
+def sendFile(self, filename, type):
+ """sends an object or a local file (in the product) as response"""
+ paths = filename.split('/')
+ object = self
+ # look for an object called filename
+ for path in paths:
+ if hasattr(object, path):
+ object = getattr(object, path)
+ else:
+ object = None
+ break
+ if object:
+ # if the object exists then send it
+ return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)
+ else:
+ # send a local file with the given content-type
+ fn = os.path.join(package_home(globals()), filename)
+ self.REQUEST.RESPONSE.setHeader("Content-Type", type)
+ self.REQUEST.RESPONSE.write(file(fn).read())
+ return
+
+
+def writeMetadata(url,metadict):
+ """Einlesen der Metadaten und und erstellen des geänderten XML file"""
+
+ try:
+ geturl=""
+ for line in urllib.urlopen(url).readlines():
+ geturl=geturl+line
+
+
+ except:
+ return (None,"Cannot open: "+url)
+
+ try:
+ dom=xml.dom.minidom.parseString(geturl)
+ except:
+ return (None,"Cannot parse: "+url+"
"+geturl)
+
+ metanodes=dom.getElementsByTagName('bib')
+
+ if not metanodes:
+ metanodes=dom.getElementsByTagName('archimedes')
+
+ metanode=metanodes[0]
+
+ for metaData in metadict.keys():
+ print metaData,metanode
+ try:
+ nodeOld=metanode.getElementsByTagName(metaData)
+ except:
+ nodeOld=None
+
+ if nodeOld:
+ metanode.removeChild(nodeOld[0]).unlink()
+ else:
+ # try also old writing rule - instead of _:
+ try:
+ nodeOld=metanode.getElementsByTagName(re.sub('_','-',metaData))
+ except:
+ nodeOld=None
+
+ if nodeOld:
+ metanode.removeChild(nodeOld[0]).unlink()
+
+ metanodeneu=dom.createElement(metaData)
+ metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf8"))
+ metanodeneu.appendChild(metanodetext)
+ metanode.appendChild(metanodeneu)
+
+
+ return dom.toxml().encode('utf-8')
+
def readMetadata(url):
- """Methoden zum Auslesen der Metadateninformation zu einer Resource
+ """Methode zum Auslesen der Metadateninformation zu einer Resource
Vorerst noch Typ bib"""
metadict={}
@@ -112,11 +208,11 @@ def readMetadata(url):
for node in metacontent:
try:
- metadict[node.tagName.lower()]=getText(node.childNodes)
+ metadict[re.sub('-','_',node.tagName.lower())]=getText(node.childNodes)
except:
"""nothing"""
- #print metadict
+
return metadict,""
@@ -321,10 +417,15 @@ class ECHO_resource(Folder):
def getCoords(self):
- try:
- return [string.join(x,",") for x in self.coords]
- except:
- return []
+ """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:
@@ -332,19 +433,132 @@ class ECHO_resource(Folder):
except:
return ""
+ def getCopyrightType(self):
+ try:
+ return self.copyrightType
+ except:
+ return ""
+
+ def getRenderingType(self):
+ try:
+ return self.renderingType
+ except:
+ return ""
+
def ECHO_resource_config(self):
"""Main configuration"""
if not hasattr(self,'weight'):
self.weight=""
- if not hasattr(self,'coords'):
- self.coords=[]
- print "vorher",self.coords
pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource.zpt').__of__(self)
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)
+ return pt()
+
+ def ECHO_resource_config_coords(self):
+ """Coords configuration """
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_coords.zpt').__of__(self)
+ return pt()
+
+ def ECHO_resource_config_credits(self):
+ """Main configuration"""
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_credits.zpt').__of__(self)
+ 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
+ for data in self.metadata:
+ data_neu=re.sub('-','_',data)
+ self.metaDataHash[data_neu]=getattr(self,data)
+ #print data_neu, getattr(self,data)
+ #print self.metaDataHash,self.metadata
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
+ return pt()
+
+
+
+
+ def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
+ """Änderung der Properties"""
+ self.resourceID=resourceID
+ self.title=title
+ self.label=label
+ self.description=description
+
+ self.contentType=contentType
+ self.renderingType=renderingType
+ self.weight=weight
+
+ self.link=link
+ self.metalink=metalink
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+ def changeECHO_resource_coords(self,coords,viewClassification,RESPONSE=None):
+ """Änderung der Properties - coords"""
+
+ try:
+ coordsnew=[ string.split(x,",") for x in coords]
+ except:
+ coordsnew=[]
+
+ 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"""
+ self.credits=credits
+ self.responsible=responsible
+ self.copyrightType=copyrightType
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+ def changeECHO_resource_metadata(self,RESPONSE=None):
+ """change metadata"""
+ tags=self.findTagsFromMapping(self.contentType)
+ self.OSAS_meta={}
+ for field in tags[1]:
+ try:
+ self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
+ self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
+ except:
+ """nothing"""
+
+ return urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+ def newMetaXML(self):
+ """new index.meta"""
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ return writeMetadata(self.metalink,self.OSAS_meta)
+
+
def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
"""Änderung der Properties"""
@@ -354,7 +568,7 @@ class ECHO_resource(Folder):
coordsnew=[]
setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
-
+ self.viewClassification=viewClassification
self.coords=coordsnew[0:]
self.link=link
self.metalink=metalink
@@ -364,10 +578,13 @@ class ECHO_resource(Folder):
manage_options = Folder.manage_options+(
- {'label':'Main Config','action':'ECHO_resource_config'},
- {'label':'Metadata','action':'ECHO_getResourceMD'},
- {'label':'Graphics','action':'ECHO_graphicEntry'},
- )
+ {'label':'Main Config','action':'ECHO_resource_config_main'},
+ {'label':'Change Credits & Copyright','action':'ECHO_resource_config_credits'},
+ {'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
+ {'label':'Change Coords','action':'ECHO_resource_config_coords'},
+ {'label':'Add coords','action':'ECHO_graphicEntry'},
+ {'label':'Sync Metadata','action':'ECHO_getResourceMD'},
+ )
def getOverview(self):
"""overview graphics"""
@@ -395,6 +612,98 @@ class ECHO_resource(Folder):
if RESPONSE is not None:
RESPONSE.redirect('ECHO_graphicEntry')
+
+ def isDefinedInThisSet(self,fields,field):
+ """checks if field is defined in fields"""
+ if (fields[0].has_key(field)) and not (fields[0][field]==""):
+ return 1
+ else:
+
+ return 0
+
+ def getFieldLabel(self,fields,field):
+ """get labels"""
+ try:
+ ret =fields[0][field]
+ if ret == "":
+ return field
+ else:
+ return ret
+ except:
+ return field
+
+
+
+ def getFieldTag(self,fields,field):
+ """get labels"""
+ try:
+ ret =fields[0][field]
+ if ret == "":
+ return field
+ else:
+ return ret
+ except:
+ return field
+
+
+
+ def getFieldValue(self,field):
+ """get value"""
+ #print field
+ try:
+
+ ret=self.metaDataHash[field]
+ if ret == "":
+ return None
+ else:
+ return ret
+ except:
+ return None
+
+ def findLabelsFromMapping(self,referenceType):
+ """gib hash mit label -> generic zurueck"""
+ self.referencetypes=self.ZopeFind(self.standardMD)
+ #print "RT",referenceType
+
+ bibdata={}
+ retdata={}
+ fieldlist=self.standardMD.fieldList
+
+ for referenceTypeF in self.referencetypes:
+ #print referenceTypeF[1].title,referenceType
+ if referenceTypeF[1].title == referenceType:
+ #print "OK"
+ bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+ bibdata['data']=referenceTypeF[1]
+ self.fields=bibdata[referenceType]
+ for field in fieldlist:
+ retdata[field]=referenceTypeF[1].getValue(field)[1]
+ #print retdata,fieldlist
+ return retdata,fieldlist
+
+ def findTagsFromMapping(self,referenceType):
+ """gib hash mit label -> generic zurueck"""
+ self.referencetypes=self.ZopeFind(self.standardMD)
+
+
+ bibdata={}
+ retdata={}
+ fieldlist=self.standardMD.fieldList
+
+ for referenceTypeF in self.referencetypes:
+
+ if referenceTypeF[1].title == referenceType:
+ bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+ bibdata['data']=referenceTypeF[1]
+ self.fields=bibdata[referenceType]
+ for field in fieldlist:
+ retdata[field]=referenceTypeF[1].getValue(field)[0]
+
+ return retdata,fieldlist
+
+
+
+
def ECHO_getResourceMD(self,template="yes"):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
(metadict, error)=readMetadata(self.metalink)
@@ -402,19 +711,26 @@ class ECHO_resource(Folder):
if not error=="": #Fehler beim Auslesen des Metafiles
- return "ERROR:",error
- for key in metadict.keys():#Hinzufügen der Felder
+ return "ERROR:",error
+
- setattr(self,key,metadict[key].encode('ascii','replace'))
-
+ if not (metadict['bib_type']==self.contentType):
+ self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
+ self.REQUEST.SESSION['contentZope']=self.contentType
+
+ return PageTemplateFile('Products/ECHO_content/zpt/ECHO_getResourceMDErrorContentType.zpt').__of__(self)()
+
+ self.REQUEST.SESSION['metadict']=metadict
- self.metadata=metadict.keys()
+ self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)
- self.label=self.generate_label()
-
+
if template=="yes":
pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_resourceMD.zpt').__of__(self)
return pt()
+
+
+
def ECHO_getMD(self,item):
"""Ausgabe der MD"""
@@ -576,6 +892,14 @@ class ECHO_collection(Folder, Persistent
"""ECHO Collection"""
security=ClassSecurityInfo()
meta_type='ECHO_collection'
+ viewClassificationList=viewClassificationListMaster
+ displayTypes=displayTypes
+
+ def getViewClassification(self):
+ if hasattr(self,'viewClassification'):
+ return self.viewClassification
+ else:
+ return ""
def getTitle(self):
"""title"""
@@ -642,28 +966,76 @@ 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"""
return collections
-
- return ""+getCollection(self)+""
+ ret=""""""
+ return ret+""+getCollection(self)+""
def createJavaScript(self):
"""CreateJava"""
ret=javaScriptMain
- dynamical=""
+ dynamical="\n"
for ob in self.getGraphicCoords():
if ob[4][4] == "":
dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
else:
- dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
+ dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
- ret+=javaHandler%dynamical
+ ret+=javaHandler%dynamical
return ret
+
+ def createJSAreas(self):
+ """new version of createJavaScript"""
+ dynamical="\n"
+ for ob in self.getGraphicCoords():
+ if ob[5] == "area":
+ dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob[1],ob[0])
+ else:
+ dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob[1],ob[0])
+ return dynamical
+
+ def createMapHead(self):
+ """generate divs"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_content_map_frag_js')).__of__(self)
+ return pt()
+
+ def createMapLink(self, ob, text=None):
+ """generate map link"""
+ id = ob[1]
+ link = ob[1]
+ if text == None:
+ text = ob[2]
+ tag = '"
+ 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
+
+ tag = ''%(id,id,id,link)
+ if vtype == "view point":
+ rot = ob[4][4]
+ tag += '
'%(id,arrowsrc,rot)
+ else:
+ tag += '3:
- coord=coordtemp[0:4]
- if hasattr(object,'label') and not object.label=="":
- ids.append([string.join(coord,", "),object.getId(),object.label,object,coordtemp])
- elif hasattr(object,'title'):
- if not object.title=="":
- ids.append([string.join(coord,", "),object.getId(),object.title,object,coordtemp])
- else:
- ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
- else:
- ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
-
- except:
- """nothing"""
-
+ 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
@@ -940,8 +1328,8 @@ class ECHO_group(ECHO_collection):
def index_html(self):
"""standard page"""
displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
- if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object
- return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
+ #if (len(displayedObjects)==1) and (displayedObjects[0][1].meta_type=="ECHO_collection"): # nur ein Object dann redirect auf dieses Object
+ # return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
if 'index.html' in self.__dict__.keys():
return getattr(self,'index.html')()
@@ -1054,15 +1442,76 @@ class ECHO_root(Folder,Persistent,Implic
else:
retStr="