--- ECHO_content/ECHO_collection.py 2004/06/22 14:47:57 1.125 +++ ECHO_content/ECHO_collection.py 2004/07/18 14:58:32 1.144 @@ -29,7 +29,7 @@ from Products.PageTemplates.ZopePageTemp from Globals import Persistent, package_home from Acquisition import Implicit from ECHO_helpers import displayTypes - +import urllib try: from psycopg import libpq @@ -46,7 +46,34 @@ import xml.dom.minidom from ECHO_graphicalOverview import javaHandler,javaScriptMain import ECHO_helpers -def getCopyrightsFromForm(self,argv): +def getRDFDescription(self,linkURL,urn=None): + """rdf""" + ret="" + about="""""" + name="""%s""" + link="""%s""" + #link="""""" + type="""%s""" + + if not urn: + urn="urn:"+re.sub('/',':',self.absolute_url()) + + about2=about%urn + + if hasattr(self,'label') and not (self.label==""): + name2=name%urllib.quote(self.label) + elif not self.title=="": + name2=name%urllib.quote(self.title) + else: + name2=name%self.getId() + + link2=link%urllib.quote(linkURL) + type2=type%self.meta_type + + ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n" + return ret + +def getCopyrightsFromForm(self,argv): medias={} partners={} copyrights={} @@ -184,10 +211,12 @@ class BrowserCheck: self.isIEMac = self.isIE and self.isMac + + def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None): """Einlesen der Metadaten und und erstellen des geaenderten XML file""" def updateTextToolNode(tag,value): - print dom,tag,value + #print dom,tag,value metanode=dom.getElementsByTagName('texttool')[0] try: nodeOld=metanode.getElementsByTagName(tag) @@ -475,6 +504,8 @@ def manage_addECHO_layoutTemplate(self, REQUEST.RESPONSE.redirect(u+'/manage_main') return '' + + class ECHO_resource(Folder,Persistent): """ECHO Ressource""" security=ClassSecurityInfo() @@ -484,6 +515,145 @@ class ECHO_resource(Folder,Persistent): getSubCols = ECHO_helpers.getSubCols + security.declareProtected('View','index_html') + def getRDF(self,urn=None): + """rdf""" + return getRDFDescription(self,self.link,urn=urn) + + + def getAccessRightSelectorHTML(self,outlook="select"): + """htmlselector""" + values=['free','mpiwg'] + + if outlook=="select": + ret="""" + + else: + ret="" + for value in values: + print + if value==self.getAccessRightMD(): + ret+="""%s"""%(self.getId(),value,value) + else: + ret+="""%s"""%(self.getId(),value,value) + return ret + + + + def getAccessRightMD(self): + """set accessright""" + url=self.metalink + + 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) + root=dom.getElementsByTagName('resource')[0] + except: + return (None,"Cannot parse: "+url+"
"+geturl) + + internal=dom.getElementsByTagName('internal') + if internal: + institution=dom.getElementsByTagName('institution') + return getText(institution[0].childNodes) + + free=dom.getElementsByTagName('free') + if free: + return "free" + + return "free" #default free + + def changeAccessRightMD(self,accessright,RESPONSE=None): + """change the rights""" + + params="accessright=%s"%accessright + + + #print urllib.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read() + + + 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()+'/setAccessRightXML'+urllib.quote('?'+params))).read() + + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + + def setAccessRightXML(self,accessright): + """set accessright""" + url=self.metalink + + 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) + root=dom.getElementsByTagName('resource')[0] + except: + return (None,"Cannot parse: "+url+"
"+geturl) + + metanodes=dom.getElementsByTagName('access-conditions') + + if not metanodes: + nodenew=dom.createElement('access-conditions') + root.appendChild(nodenew) + metanode=nodenew + else: + metanode=metanodes[0] + + accesses=metanode.getElementsByTagName('access') + + if not accesses: + nodenew2=dom.createElement('access') + metanode.appendChild(nodenew2) + metanode2=nodenew2 + else: + metanode2=accesses[0] + + internal=metanode.getElementsByTagName('internal') + + if internal: + metanode2.removeChild(internal[0]).unlink() + + free=metanode.getElementsByTagName('free') + + if free: + metanode2.removeChild(internal[0]).unlink() + + + if accessright=='free': + nodenew3=dom.createElement('free') + metanode2.appendChild(nodenew3) + elif accessright=='mpiwg': + nodenew3=dom.createElement('internal') + nodenew4=dom.createElement('institution') + metanodetext=dom.createTextNode('mpiwg') + nodenew4.appendChild(metanodetext) + nodenew3.appendChild(nodenew4) + metanode2.appendChild(nodenew3) + + return dom.toxml().encode('utf-8') + def setStartPageForm(self): """Form for changing the startpage""" @@ -505,15 +675,18 @@ class ECHO_resource(Folder,Persistent): params="startpage=%s"%startpage - 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'+urllib.quote('?'+params))).read() - - #print "http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s"%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)) + + path=self.metalink + path=re.sub(self.REQUEST['SERVER_URL'],'',path) + path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path) + path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server - + path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server + path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server path=re.sub('/index.meta','',path) @@ -552,7 +725,7 @@ class ECHO_resource(Folder,Persistent): paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate'] - #print writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate) + #writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate) params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate) @@ -562,13 +735,21 @@ class ECHO_resource(Folder,Persistent): # hack Pfad auf die Dokumente path=self.metalink - path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server - path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server + path=re.sub('/index.meta','',path) + path=re.sub(self.REQUEST['SERVER_URL'],'',path) + path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path) + + path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server + path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server + path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server + + path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server + path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server - print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines() + return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines() if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -576,12 +757,20 @@ class ECHO_resource(Folder,Persistent): def getTitle(self): """title""" - return self.title.encode('utf-8') - + 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""" - return self.label.encode('utf-8') - + 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') @@ -600,8 +789,9 @@ class ECHO_resource(Folder,Persistent): texttools=dom.getElementsByTagName('texttool') text=texttools[0].getElementsByTagName('text') texturl=getText(text[0].childNodes) - self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') + if not noredirect: + self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') self.REQUEST.RESPONSE.redirect(texturl) else: return texturl @@ -614,10 +804,10 @@ class ECHO_resource(Folder,Persistent): return "no fulltext available" def getCopyrightsHTML(self): - """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus""" + """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus""" - if hasattr(self,'copyrightModell'): - obj=self.copyrightModell + if hasattr(self,'copyrightModel'): + obj=self.copyrightModel else: return "ERROR" @@ -633,12 +823,12 @@ class ECHO_resource(Folder,Persistent): url=copyrightTypeObj.url if url!='': - ret.append(("""%s"""%(url,label),copyright[0],copyright[1],copyright[2],label)) + ret.append((url,copyright[0],copyright[1],copyright[2],label)) else: if hasattr(copyrightTypeObj, 'copyright.html'): - ret.append(("""%s"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label)) + ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label)) else: - ret.append((label,copyright[0],copyright[1],copyright[2],label)) + ret.append(('empty',copyright[0],copyright[1],copyright[2],label)) except: """nothing""" @@ -745,7 +935,8 @@ class ECHO_resource(Folder,Persistent): self.contentType=self.bib_type for data in self.metadata: data_neu=re.sub('-','_',data) - self.metaDataHash[data_neu]=getattr(self,data)[0:] + self.meta + DataHash[data_neu]=getattr(self,data)[0:] pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self) @@ -836,6 +1027,7 @@ class ECHO_resource(Folder,Persistent): self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') if not hasattr(self,'metaDataHash'): + self.copyIndex_meta2echo_resource() try: return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate) @@ -873,6 +1065,7 @@ class ECHO_resource(Folder,Persistent): {'label':'Sync Metadata','action':'ECHO_getResourceMD'}, {'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'}, {'label':'set/change startpage','action':'setStartPageForm'}, + {'label':'Copy MD for indexing and search','action':'copySearchFields'}, ) def getOverview(self): @@ -961,6 +1154,12 @@ class ECHO_resource(Folder,Persistent): self.metaDataHash[field]=value[0:] + def copySearchFields(self): + """copys metadatafields to the object""" + fields=['author','title','year'] + for field in fields: + setattr(self,'MD_'+field,self.getFieldValue(field)) + def findLabelsFromMapping(self,referenceType): """gib hash mit label -> generic zurueck""" @@ -1015,8 +1214,9 @@ class ECHO_resource(Folder,Persistent): bibdata={} retdata={} fieldlist=self.standardMD.fieldList - + fields=[] for referenceTypeF in temp: + #print referenceType if referenceTypeF[1].title.lower() == referenceType.lower(): try: @@ -1038,11 +1238,14 @@ class ECHO_resource(Folder,Persistent): (metadict, error)=readMetadata(self.metalink) - self.contentType=metadict['bib_type'][0:] + self.metaDataHash={} if not error=="": #Fehler beim Auslesen des Metafiles + return "ERROR:",error + + self.contentType=metadict['bib_type'][0:] fields=self.findTagsFromMapping(self.contentType) #fields=self.findLabelsFromMapping(self.contentType) @@ -1057,11 +1260,12 @@ class ECHO_resource(Folder,Persistent): if RESPONSE: return RESPONSE.redirect('manage_main') - def ECHO_getResourceMD(self,template="yes"): + def ECHO_getResourceMD(self,template="yes",back=None): """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" (metadict, error)=readMetadata(self.metalink) - + if back: + self.REQUEST.SESSION['back']=back if not error=="": #Fehler beim Auslesen des Metafiles return "ERROR:",error @@ -1127,6 +1331,7 @@ class ECHO_resource(Folder,Persistent): security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination + def generate_label(self): """Erzeugt_standard_Label aus Template""" pt=getattr(self,"label_template_"+self.contentType.lower()) @@ -1135,6 +1340,7 @@ class ECHO_resource(Folder,Persistent): return pt() security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination + def generate_title(self,RESPONSE=None): """Erzeugt_standard_Label aus Template""" pt=getattr(self,"label_template_"+self.contentType.lower()) @@ -1170,11 +1376,19 @@ class ECHO_externalLink(Folder): def getTitle(self): """title""" - return self.title.encode('utf-8') - + 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""" - return self.label.encode('utf-8') + 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""" @@ -1291,6 +1505,140 @@ class ECHO_collection(Folder, Persistent viewClassificationList=viewClassificationListMaster displayTypes=displayTypes + path="/mpiwg/online/permanent/shipbuilding" + + def showRDF(self): + """showrdf""" + self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') + ret="""\n\n""" + ret+=self.getRDF(urn="urn:echo:collectionroot")+"\n" + ret+="""""" + return ret + + def getRDF(self,urn=None): + """rdf of the collection""" + + contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection']) + + ret=getRDFDescription(self,self.absolute_url(),urn=urn) + + if not urn: + urn="urn:"+re.sub('/',':',self.absolute_url()) + + li="""\n""" + + + for content in contents: + ret+=content[1].getRDF()+"\n" + + ret+="""\n"""%urn + for content in contents: + nurn="urn:"+re.sub('/',':',content[1].absolute_url()) + ret+=li%nurn + return ret+"" + + + def changeLabels(self): + """change form""" + pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self) + pt.content_type="text/html" + return pt() + + def changeTitles(self): + """change form""" + pt=PageTemplateFile('Products/ECHO_content/zpt/changeTitleForm').__of__(self) + pt.content_type="text/html" + return pt() + + def changeAccessRightsCollection(self): + """change""" + ret="" + argv=self.REQUEST.form + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + for resource in resources: + + try: + ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + resource[1].changeAccessRightMD(argv[resource[1].getId()]) + except: + """not""" + return ret + + def changeLabelsInCollection(self): + """change all lables of a collection""" + ret="" + argv=self.REQUEST.form + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + for resource in resources: + + try: + ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + resource[1].label=argv[resource[1].getId()][0:] + except: + """not""" + return ret + + def changeTitlesInCollection(self): + """change all lables of a collection""" + ret="" + argv=self.REQUEST.form + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + for resource in resources: + + try: + ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + resource[1].title=argv[resource[1].getId()][0:] + except: + """not""" + return ret + + def updateCollection(self,RESPONSE=None): + """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" + files=os.listdir(self.path) + ret="" + for fileName in files: + + if fileName: + + tempPath=re.sub("/mpiwg/online","",self.path) + link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg" + + metalink=self.path+"/"+fileName+"/index.meta" + try: + + #link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb" + + newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'generated','book','','','','','','') + self._setObject(fileName,newObj) + + genObj=getattr(self,fileName) + #genObj.createIndexFile() + ret+="OK:"+fileName+"
" + except: + print "ERROR" + ret+="ERROR:"+fileName+"
" + + return ret + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def updateCollectionMD(self,RESPONSE=None): + """updateMD""" + files=os.listdir(self.path) + for fileName in files: + if fileName: + genObj=getattr(self,fileName) + genObj.copyIndex_meta2echo_resource() + genObj.generate_title() + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def changeViewerTemplateSetsForm(self): """change the viewer template set""" @@ -1332,13 +1680,38 @@ class ECHO_collection(Folder, Persistent resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) for resource in resources: - print resource[0] + resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate) if RESPONSE is not None: RESPONSE.redirect('manage_main') + def copySearchFields(self,RESPONSE=None): + """copys import metadatafields to the object""" + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + + for resource in resources: + + resource[1].copySearchFields() + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def reloadMetaDataFromStorage(self,RESPONSE=None): + """copy metadata from the storage to ECHO""" + ret="" + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + + for resource in resources: + + ret+=str(resource[1].copyIndex_meta2echo_resource())+"
" + + + 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 @@ -1375,14 +1748,20 @@ class ECHO_collection(Folder, Persistent def getTitle(self): """title""" - return self.title.encode('utf-8') - + 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""" - return self.label.encode('utf-8') - - - + 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) @@ -1402,6 +1781,7 @@ class ECHO_collection(Folder, Persistent ret+="

"+label+"

" manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","") return ret + def getImageTag(self): """GetTag""" try: @@ -1579,8 +1959,10 @@ class ECHO_collection(Folder, Persistent security.declarePublic('ECHO_rerenderLinksMD') - def ECHO_rerenderLinksMD(self,obj=None): + def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): """Rerender all Links""" + ret="" + if not obj: obj = self @@ -1588,16 +1970,22 @@ class ECHO_collection(Folder, Persistent for entry in entries: if entry[1].meta_type == 'ECHO_resource': - entry[1].ECHO_getResourceMD(template="no") - entry[1].generate_title() - entry[1].generate_label() + try: + entry[1].ECHO_getResourceMD(template="no") + if "title" in types: + entry[1].generate_title() + if "label" in types: + entry[1].generate_label() + ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
" + except: + ret+="Error:"+entry[0]+"
" else: self.ECHO_rerenderLinksMD(entry[1]) - return "Rerenderd all links to resources in: "+self.title + return ret+"Rerenderd all links to resources in: "+self.title security.declarePublic('ECHO_newViewerLink') @@ -1635,10 +2023,15 @@ class ECHO_collection(Folder, Persistent manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_collection_config'}, - {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'}, + {'label':'Change Labels','action':'changeLabels'}, + {'label':'Change Titles','action':'changeTitles'}, + {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'}, {'label':'Graphics','action':'ECHO_graphicEntry'}, {'label':'create resources from XML','action':'createRessourcesFromXMLForm'}, {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'}, + {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'}, + {'label':'ImportCollection','action':'updateCollection'}, + {'label':'Copy MD for indexing and search','action':'copySearchFields'}, ) def getOverview(self): @@ -1847,6 +2240,28 @@ class ECHO_group(ECHO_collection): ) security.declareProtected('View','index_html') + + def getRDF(self,urn=None): + """rdf of the collection""" + contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection']) + + ret=getRDFDescription(self,self.absolute_url(),urn) + + + + urn="urn:"+re.sub('/',':',self.absolute_url()) + li="""\n""" + + + for content in contents: + ret+=content[1].getRDF()+"\n" + + ret+="""\n"""%urn + for content in contents: + nurn="urn:"+re.sub('/',':',content[1].absolute_url()) + ret+=li%nurn + return ret+"" + def index_html(self): """standard page""" displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes) @@ -2062,7 +2477,46 @@ class ECHO_root(Folder,Persistent,Implic security=ClassSecurityInfo() meta_type="ECHO_root" + + def showRDF(self): + """showrdf""" + self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') + ret="""\n""" + ret+=self.getRDF(urn="echo:collectionroot")+"\n" + + ret+="""""" + return ret + + def getRDF(self,urn=None): + """rdf of the collection""" + + contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection']) + ret=getRDFDescription(self,self.absolute_url(),urn=urn) + + li="""\n""" + + + for content in contents: + ret+=content[1].getRDF()+"\n" + + ret+="""\n"""%urn + for content in contents: + nurn="urn:"+re.sub('/',':',content[1].absolute_url()) + ret+=li%nurn + return ret+"" + + + def showContent(self,path): + """return content/html""" + + return urllib.urlopen(path+"/content_html").read() + + def getImageViewers(self): + """images""" + viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject']) + return viewers + def getBibTag(self,tag,content): """get field tag für index-meta-generation""" @@ -2505,16 +2959,17 @@ class ECHO_root(Folder,Persistent,Implic for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1): echo_url=resource[1].absolute_url() - if resource[1].getFullTextXML(noredirect="yes"): - if hasattr(resource[1],'link'): - viewer_url=echo_url+"/getMetaDataXML" - else: - viewer_url="NO URL" - if filter: - if re.search(filter,viewer_url): - ret+="""\n"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?')) - else: - ret+="""\n"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?')) + + if hasattr(resource[1],'link'): + meta_url=echo_url+"/getMetaDataXML" + else: + meta_url="NO_URL" + + if filter and not re.search(filter,viewer_url): + continue + + ret+="""\n"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?')) + ret +="""\n""" @@ -2606,13 +3061,14 @@ class ECHO_partner(Image,Persistent): meta_type="ECHO_partner" - def __init__(self, id, title,url, file, copyrightType, person, email, country, content_type='', precondition=''): + def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''): self.__name__=id self.title=title self.url=url self.person=person self.email=email self.country=country + self.color=color self.precondition=precondition self.copyrightType=copyrightType data, size = self._read_data(file) @@ -2624,12 +3080,13 @@ class ECHO_partner(Image,Persistent): ) - def changeECHO_partner(self,url,copyrightType,person, email, country, RESPONSE=None): + def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None): """Change main information""" self.url=url self.person=person self.email=email self.country=country + self.color=color self.copyrightType=copyrightType if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -2649,7 +3106,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm -def manage_addECHO_partner(self, id,file,url, person, email, country, copyrightType='', title='', precondition='', content_type='', +def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='', REQUEST=None): """ Add a new ECHO_partner object. @@ -2668,7 +3125,7 @@ def manage_addECHO_partner(self, id,file self=self.this() # First, we create the image without data: - self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, content_type, precondition)) + self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition)) # Now we "upload" the data. By doing this in two steps, we # can use a database trick to make the upload more efficient.