--- ECHO_content/ECHO_collection.py 2005/11/03 17:10:52 1.249 +++ ECHO_content/ECHO_collection.py 2005/12/01 12:11:51 1.258 @@ -15,7 +15,7 @@ try: except: print "PDF generation will not work" - +import urlparse import string import tempfile import re @@ -50,6 +50,7 @@ from Ft.Xml import EMPTY_NAMESPACE import Ft.Xml.XPath import cStringIO import zLOG +import sys try: from psycopg import libpq @@ -68,7 +69,7 @@ from ECHO_helpers import * from ECHO_language import * from ECHO_movie import * import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen - +import xmlrpclib def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""): @@ -83,6 +84,90 @@ def setECHO_collectionInformation(self,t self.credits=toList(credits) self.weight=weight +class ECHO_partner(Image,Persistent,ECHO_basis): + """ECHO Partner""" + + meta_type="ECHO_partner" + + 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) + content_type=self._get_content_type(file, data, id, content_type) + self.update_data(data, content_type, size) + + manage_options = Image.manage_options+( + {'label':'Partner Information','action':'ECHO_partner_config'}, + ) + + + 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') + + + + def ECHO_partner_config(self): + """Main configuration""" + if not hasattr(self,'url'): + self.url="" + pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt') + return pt() + + +manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(), + Kind='ECHO_partner',kind='ECHO_partner') + + + +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. + + Creates a new ECHO_partner object 'id' with the contents of 'file'. + Based on Image.manage_addImage + """ + + id=str(id) + title=str(title) + content_type=str(content_type) + precondition=str(precondition) + + id, title = OFS.Image.cookId(id, title, file) + + self=self.this() + + # First, we create the image without data: + 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. + if file: + self._getOb(id).manage_upload(file) + if content_type: + self._getOb(id).content_type=content_type + + if REQUEST is not None: + try: url=self.DestinationURL() + except: url=REQUEST['URL1'] + REQUEST.RESPONSE.redirect('%s/manage_main' % url) + return id + class ECHO_locale(ZopePageTemplate): """localisierung""" @@ -314,7 +399,7 @@ class ECHO_resource(CatalogAware,Folder, def reindex(self): """generate fields for indexing and reindex""" - import urlparse + #TODO: korrigieren des metalink pfades konfigurierbar machen splitted= [x for x in urlparse.urlparse(self.metalink)] splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:] @@ -427,72 +512,128 @@ class ECHO_resource(CatalogAware,Folder, return ret+self.createSubElementRDF(urn=urn) - def getAccessRightSelectorHTML(self,outlook="select"): - """htmlselector""" - values=['free','mpiwg'] + def changeAccessRightForm(self,preselect=None): + """change the access rights""" + + pt=zptFile(self, 'zpt/ChangeECHO_resourceAccessRight.zpt') + return pt(preselect=preselect) + + def changeAccessRight(self): + """changeRights""" + argv=self.REQUEST.form + self.setAccessRightXML(argv["%s_xml"%self.getId()]) + self.accessRight=argv["%s_echo"%self.getId()] + + self.REQUEST.RESPONSE.redirect('manage_main') + + + def getAccessRightSelectorHTML(self,outlook="select",xmldominant=None,preselect=None): + """htmlselector, xmldominant= in der regel wird der wert des xmlfiles ausgegeben ausser er existiert nicht""" + values=['','free','MPIWG'] + if preselect:#set all to the preselected + ar=(preselect,preselect) + else:#else set to actual value + ar=self.getAccessRightMD() + if outlook=="select": - ret=""""""%self.getId() + ret1="""" + + if value==ar[1]: + ret1+=""%value + else: + ret1+=""%value + + + if not xmldominant: + return ret+"",ret1+"" + else: + if ar[0] is not None: + return ret+"" + else: + return "

No xml file (only local selection):"+ret1 else: ret="" + ret1="" for value in values: - if value==self.getAccessRightMD(): - ret+="""%s"""%(self.getId(),value,value) + if value==ar[0]: + ret+="""%s"""%(self.getId(),value,value) else: - ret+="""%s"""%(self.getId(),value,value) - return ret + ret+="""%s"""%(self.getId(),value,value) + + if value==ar[1]: + ret1+="""%s"""%(self.getId(),value,value) + else: + ret1+="""%s"""%(self.getId(),value,value) + + if not xmldominant: + return ret,ret1 + else: + if ar[0]: + return ret + else: + return "

No xml file (only local selection)

"+ret1 + + def copyAccessRightsFromMD(self): + """kopiere rechte aus den metadaten""" + self.accessRight=self.getAccessRightMD()[0] + + + + def getAccessRightMD(self): """set accessright""" url=self.metalink try: - geturl="" - for line in ECHO_helpers.urlopen(url).readlines(): - geturl=geturl+line - - + urllib.urlopen(url) except: - return (None,"Cannot open: "+url) + zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + return None,getattr(self,'accessRight','') + + try: - dom=xml.dom.minidom.parseString(geturl) - root=dom.getElementsByTagName('resource')[0] + dom = NonvalidatingReader.parseUri(url) except: - return (None,"Cannot parse: "+url+"
"+geturl) + zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + return (None,"Cannot parse: "+url+"
"+"%s (%s)"%sys.exc_info()[0:2]) - 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 + accessright=dom.xpath("//meta/access-conditions/access/@type") + if accessright: + accessright=accessright[0].value + if str(accessright)=='institution': + tmp=dom.xpath("//meta/access-conditions/access/name") + if tmp: + accessright=getTextFromNode(tmp[0]) + + if not accessright: + accessright="" + + return accessright,getattr(self,'accessRight','') def changeAccessRightMD(self,accessright,RESPONSE=None): - """change the rights""" - + """change the rights - not user anymore""" + #TODO: check if method still needed params="accessright=%s"%accessright #print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read() - ECHO_helpers.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() + ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/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: @@ -502,7 +643,13 @@ class ECHO_resource(CatalogAware,Folder, def setAccessRightXML(self,accessright): """set accessright""" url=self.metalink - + accessrights=['MPIWG','free']#allowes rights + + if accessright =='': + """do nothing""" + return "" + + try: geturl="" for line in ECHO_helpers.urlopen(url).readlines(): @@ -518,48 +665,59 @@ class ECHO_resource(CatalogAware,Folder, except: return (None,"Cannot parse: "+url+"
"+geturl) - metanodes=dom.getElementsByTagName('access-conditions') + metamains=dom.getElementsByTagName('meta') + + if not metamains: + nodenew=dom.createElement('meta') + root.appendChild(nodenew) + metamain=nodenew + else: + metamain=metamains[0] + + + metanodes=metamain.getElementsByTagName('access-conditions') if not metanodes: nodenew=dom.createElement('access-conditions') - root.appendChild(nodenew) + metamain.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') + #delete old + if accesses: + metanode.removeChild(accesses[0]).unlink() - if internal: - metanode2.removeChild(internal[0]).unlink() - - free=metanode.getElementsByTagName('free') + #create new + + nodenew2=dom.createElement('access') + metanode.appendChild(nodenew2) + metanode2=nodenew2 - 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') + attribute=metanode2.getAttribute('type') + + if accessright=="free": + + metanode2.setAttribute('type','free') + + elif accessright.upper()=='MPIWG': + metanode2.setAttribute('type','institution') + nodenew4=dom.createElement('name') + metanodetext=dom.createTextNode('MPIWG') nodenew4.appendChild(metanodetext) - nodenew3.appendChild(nodenew4) - metanode2.appendChild(nodenew3) - - return dom.toxml().encode('utf-8') + nodenew2.appendChild(nodenew4) + #print dom.toxml().encode('utf-8') + string= encodeRPC(dom.toxml().encode('utf-8')) + + #TODO: make server configurable + server=xmlrpclib.Server("http://foxridge.mpiwg-berlin.mpg.de/server") + path=urlparse.urlparse(self.metalink)[2] + + server.writeMetaDataFile(path,string,"yes") + def setStartPageForm(self): """Form for changing the startpage""" @@ -1039,15 +1197,24 @@ class ECHO_resource(CatalogAware,Folder, - + def getMDValueSimpleSearchField(self): + """returns value for simple search""" + return " ".join([self.getMDValue('title',generic="yes"), + self.getMDValue('author',generic="yes"), + self.getMDValue('year',generic="yes"),self.title]) + def getMDValue(self,fieldNameTest,empty=None,generic=None): """get md values""" #TODO: cache mappinghash - + fieldName=None if generic: - ct=self.contentType.replace(" ","_").lower() - + if self.contentType: + ct=self.contentType.replace(" ","_").lower() + else: + zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId()) + ct="" + #caching if not hasattr(self,'_v_mapHash'): #noch keine cachevariable self._v_mapHash={} @@ -1062,7 +1229,8 @@ class ECHO_resource(CatalogAware,Folder, if not fieldName and hasattr(self.standardMD,ct): fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0] self._v_mapHash[ct][fieldNameTest]=fieldName - + if not fieldName: + fieldName=fieldNameTest if not empty: #FIXME: warum gibt es manchmal kein metadatahas try: @@ -1149,6 +1317,7 @@ class ECHO_resource(CatalogAware,Folder, {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'}, {'label':'set/change startpage','action':'setStartPageForm'}, {'label':'Copy MD for indexing and search','action':'copySearchFields'}, + {'label':'Change AccessRights','action':'changeAccessRightForm'}, ) @@ -1308,7 +1477,7 @@ class ECHO_resource(CatalogAware,Folder, return "OK:",self.absolute_url(),self.contentType - def ECHO_getResourceMD(self,template="yes",back=None): + def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"): """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" (metadict, error)=readMetadata(self.metalink) @@ -1318,7 +1487,7 @@ class ECHO_resource(CatalogAware,Folder, if not error=="": #Fehler beim Auslesen des Metafiles return "ERROR:",error - if not self.contentType: + if (not self.contentType) or (overwrite=="yes"): self.contentType=metadict['bib_type'].lower() if not (metadict['bib_type'].lower()==self.contentType.lower()): @@ -1445,7 +1614,18 @@ class ECHO_externalLink(Folder,ECHO_basi security.declarePublic('content_html') def content_html(self): """template fuer content""" - return ECHO_basis.content_html(self,'externalLink') + ret= ECHO_basis.content_html(self,'externalLink') + + + try: + return ret.encode('utf-8') + + except: + try: + return ret.decode('latin-1') + except: + + return ret def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords): @@ -1518,7 +1698,8 @@ class ECHO_link(ECHO_externalLink): """external_link""" meta_type="ECHO_link" - manage_options = ECHO_externalLink.manage_options+( + + manage_options = ECHO_externalLink.manage_options+( {'label':'add links config','action':'ECHO_link_addLinksForm'}, ) @@ -1536,16 +1717,29 @@ class ECHO_link(ECHO_externalLink): def content_html(self): """template fuer link""" - + + if hasattr(self,"link_template"): ret=ECHO_basis.content_html(self,'link') + else: ret=ECHO_basis.content_html(self,'collection') - try: - return ret.decode('utf-8') - except: - return ret + + #return ret + return ret +# +# +# try: +# return ret.decode('utf-8') +# except: +# try: +# return ret.decode('latin-1') +# except: +# +# return ret +# + def index_html(self): """standard link""" @@ -1590,16 +1784,22 @@ def manage_addECHO_link(self,id,title,la RESPONSE.redirect('manage_main') -class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis): +class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis): """ECHO Collection""" security=ClassSecurityInfo() meta_type='ECHO_collection' + default_catalog='resourceCatalog' + # viewClassificationList=viewClassificationListMaster displayTypes=displayTypes path="/mpiwg/online/permanent/shipbuilding" + def getMDValueSimpleSearchField(self): + """returns value for simple search""" + return " ".join([self.title,self.description]) + def getTitleAndLabel(self): """gibt title und label zurueck""" return (getattr(self,'title',''),getattr(self,'label','')) @@ -1708,6 +1908,15 @@ class ECHO_collection(Folder, Persistent pt=zptFile(self, 'zpt/changeMetaDataLinkForm') pt.content_type="text/html" return pt() + + def changeAccessRightsCollectionForm(self,preselect=None): + """change access rights of all resources in this collection""" + + pt=zptFile(self, 'zpt/changeAccessRightsCollectionForm') + pt.content_type="text/html" + return pt(preselect=preselect) + + def changeAccessRightsCollection(self): """change""" ret="" @@ -1716,11 +1925,15 @@ class ECHO_collection(Folder, Persistent 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: - pass + if argv.has_key(resource[1].getId()+'_xml'): + ret+=resource[1].getId()+" "+argv[resource[1].getId()+'_xml']+"
" + resource[1].setAccessRightXML(argv[resource[1].getId()+'_xml']) + resource[1].accessRight=argv[resource[1].getId()+'_xml'] + elif argv.has_key(resource[1].getId()+'_echo'): + ret+="only local:"+resource[1].getId()+" "+argv[resource[1].getId()+'_echo']+"
" + resource[1].accessRight=argv[resource[1].getId()+'_echo'] + else: + ret+="ERROR:" +resource[0] return ret def changeMetaDataLinkInCollection(self): @@ -1798,15 +2011,20 @@ class ECHO_collection(Folder, Persistent pass return ret - def updateCollection(self,RESPONSE=None): + def importCollection(self,path=None,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" - files=os.listdir(self.path) + + if path is None: + pt=zptFile(self, 'zpt/importCollection.zpt') + return pt() + + files=os.listdir(path) ret="" for fileName in files: if fileName: - tempPath=re.sub("/mpiwg/online","",self.path) + tempPath=re.sub("/mpiwg/online","",path) link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg" metalink=self.path+"/"+fileName+"/index.meta" @@ -1829,20 +2047,6 @@ class ECHO_collection(Folder, Persistent 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""" pt=zptFile(self, 'zpt/changeViewerTemplateSet') @@ -1933,7 +2137,7 @@ class ECHO_collection(Folder, Persistent RESPONSE.redirect('manage_main') def copySearchFields(self,RESPONSE=None): - """copys import metadatafields to the object""" + """copys < metadatafields to the object""" resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) for resource in resources: @@ -2089,14 +2293,19 @@ class ECHO_collection(Folder, Persistent areas = self.getAllMapAreas() return self.createJSAreas(areas) + + emptyPartner=ECHO_partner("", "","", "", "", "", "", "", "") + security.declarePublic('getCreditObject') def getCreditObject(self,name): """credit id to credititem""" try: return getattr(self.partners,name) except: - return "" - + + return self.emptyPartner + + security.declarePublic('ECHO_generateNavBar') def ECHO_generateNavBar(self): """Erzeuge Navigationsbar""" @@ -2163,8 +2372,9 @@ class ECHO_collection(Folder, Persistent {'label':'Set Startpage','action':'setStartpageFolderForm'}, {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'}, {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, - {'label':'ImportCollection','action':'updateCollection'}, + {'label':'ImportCollection','action':'importCollection'}, {'label':'Copy MD for indexing and search','action':'copySearchFields'}, + {'label':'Change access rights', 'action':'changeAccessRightsCollectionForm'}, ) @@ -2628,6 +2838,10 @@ class ECHO_root(Folder,Persistent,Implic meta_type="ECHO_root" + def mod_re_sub(self,pattern,replace,string): + """re.sub aus mod re zur Verfuegung stellen""" + return re.sub(pattern,replace,string) + def findObjectFromFulltext(self,existUri): ''' @@ -2655,7 +2869,7 @@ class ECHO_root(Folder,Persistent,Implic for resource in resources: resource[1].reindex() - print "

done %s

\n" + #print "

done %s

\n" if RESPONSE: RESPONSE.write("

done %s

\n"%resource[0]) @@ -3479,89 +3693,6 @@ def manage_addECHO_copyrightType(self,id -class ECHO_partner(Image,Persistent,ECHO_basis): - """ECHO Partner""" - - meta_type="ECHO_partner" - - 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) - content_type=self._get_content_type(file, data, id, content_type) - self.update_data(data, content_type, size) - - manage_options = Image.manage_options+( - {'label':'Partner Information','action':'ECHO_partner_config'}, - ) - - - 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') - - - - def ECHO_partner_config(self): - """Main configuration""" - if not hasattr(self,'url'): - self.url="" - pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt') - return pt() - - -manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(), - Kind='ECHO_partner',kind='ECHO_partner') - - - -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. - - Creates a new ECHO_partner object 'id' with the contents of 'file'. - Based on Image.manage_addImage - """ - - id=str(id) - title=str(title) - content_type=str(content_type) - precondition=str(precondition) - - id, title = OFS.Image.cookId(id, title, file) - - self=self.this() - - # First, we create the image without data: - 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. - if file: - self._getOb(id).manage_upload(file) - if content_type: - self._getOb(id).content_type=content_type - - if REQUEST is not None: - try: url=self.DestinationURL() - except: url=REQUEST['URL1'] - REQUEST.RESPONSE.redirect('%s/manage_main' % url) - return id class ECHO_linkList(ZopePageTemplate,ECHO_basis): """LinkList Objekt"""