--- ECHO_content/ECHO_collection.py 2006/10/18 14:42:33 1.275 +++ ECHO_content/ECHO_collection.py 2007/01/31 13:43:36 1.283 @@ -68,13 +68,27 @@ import urllib import xml.dom.minidom import ECHO_helpers from ECHO_helpers import * -from ECHO_language import * + +try: + from ECHO_language import * +except: + print "no echo_language" + class ECHO_language: + """ leere Klasse""" + pass + from ECHO_movie import * import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen import xmlrpclib + +def normalizeCt(str): + """normalizes content_type""" + #str= str.replace(" ","_") + return str.replace("-"," ").lower() + def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""): """Allegemeine Informationen zu einer ECHO Collection""" @@ -345,7 +359,10 @@ class ECHO_fullText(ZopePageTemplate,ECH def getPage(self,nr='1'): """get page n""" #return self().encode('latin-1','ignore') - dom=xml.dom.minidom.parseString(self()) + try: + dom=xml.dom.minidom.parseString(self()) + except: + dom=xml.dom.minidom.parseString(self().encode('latin-1')) pages=dom.getElementsByTagName('page') return pages[int(nr)-1].toxml() @@ -1092,7 +1109,7 @@ class ECHO_resource(CatalogAware,Folder, def getContentType(self): try: - return self.contentType + return normalizeCt(self.contentType) except: return "" @@ -1150,8 +1167,42 @@ class ECHO_resource(CatalogAware,Folder, + def changeViewer(self,newViewer): + """set newViewer to the url of the new viewer + only if metalink is set, otherwise it gives false + """ + + vl,msg=self.checkValidityOfMetaLink() + + if vl: + self.newViewer=newViewer + return vl,msg + else: + return vl,msg + + def checkValidityOfMetaLink(self): + """checks if the metalink is valid xml""" + + ml=self.metalink + + try: + txt=urllib.urlopen(ml) - def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None): + except: + return False,"Cannot open: %s)"%ml + + txt.close() + try: + dom = NonvalidatingReader.parseUri(ml) + except: + return False, "Connot parse: %s)"%ml + + if len(dom.xpath("//texttool"))==0: + return False, "No texttools: %s)"%ml + + return True,"" + + def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,newViewer='',RESPONSE=None): """Aenderung der Properties""" self.resourceID=resourceID self.title=title @@ -1165,6 +1216,9 @@ class ECHO_resource(CatalogAware,Folder, self.link=link self.metalink=metalink + self.newViewer=newViewer + + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -1207,7 +1261,7 @@ class ECHO_resource(CatalogAware,Folder, def changeECHO_resource_metadata_local(self,RESPONSE=None): """change metadata""" - tags=self.findTagsFromMapping(self.contentType) + tags=self.findTagsFromMapping(normalizeCt(self.contentType)) for field in tags[1]: self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)][0:] @@ -1218,7 +1272,7 @@ class ECHO_resource(CatalogAware,Folder, def changeECHO_resource_metadata(self,RESPONSE=None): """change metadata""" - tags=self.findTagsFromMapping(self.contentType) + tags=self.findTagsFromMapping(normalizeCt(self.contentType)) self.OSAS_meta={} for field in tags[1]: try: @@ -1264,6 +1318,7 @@ class ECHO_resource(CatalogAware,Folder, if generic: if self.contentType: ct=self.contentType.replace(" ","_").lower() + ct=self.contentType.replace("-","_").lower() else: zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId()) ct="" @@ -1271,13 +1326,16 @@ class ECHO_resource(CatalogAware,Folder, #caching if not hasattr(self,'_v_mapHash'): #noch keine cachevariable self._v_mapHash={} - + + + tmp=self._v_mapHash.get(ct,None) if tmp: #teste ob type schon existiert fieldName=tmp.get(fieldNameTest,None) else: self._v_mapHash[ct]={} + #noch nicht gecached if not fieldName and hasattr(self.standardMD,ct): fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0] @@ -1288,7 +1346,7 @@ class ECHO_resource(CatalogAware,Folder, #FIXME: warum gibt es manchmal kein metadatahas try: - ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType) + ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType)) except: zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) return "" @@ -1454,11 +1512,12 @@ class ECHO_resource(CatalogAware,Folder, fields=[] fieldlist=self.standardMD.fieldList - tags=self.findTagsFromMapping(self.contentType) + tags=self.findTagsFromMapping(normalizeCt(self.contentType)) self.referencetypes=tags[2] for referenceTypeF in self.referencetypes: - - if referenceTypeF[1].title.lower() == referenceType.lower(): + + + if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()): try: bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields @@ -1496,7 +1555,7 @@ class ECHO_resource(CatalogAware,Folder, for referenceTypeF in temp: #print referenceType - if referenceTypeF[1].title.lower() == referenceType.lower(): + if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()): try: bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields referenceType=referenceTypeF[1].title @@ -1523,10 +1582,10 @@ class ECHO_resource(CatalogAware,Folder, return "ERROR:",error,self.absolute_url() - self.contentType=metadict['bib_type'][0:] - fields=self.findTagsFromMapping(self.contentType) + self.contentType=normalizeCt(metadict['bib_type'])[0:] + fields=self.findTagsFromMapping(normalizeCt(self.contentType)) - #fields=self.findLabelsFromMapping(self.contentType) + #fields=self.findLabelsFromMapping(normalizeCt(self.contentType)) for field in fields[1]: if self.isDefinedInThisSet(fields,field): @@ -1538,7 +1597,7 @@ class ECHO_resource(CatalogAware,Folder, if RESPONSE: return RESPONSE.redirect('manage_main') - return "OK:",self.absolute_url(),self.contentType + return "OK:",self.absolute_url(),normalizeCt(self.contentType) def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"): """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" @@ -1551,11 +1610,11 @@ class ECHO_resource(CatalogAware,Folder, return "ERROR:",error if (not self.contentType) or (overwrite=="yes"): - self.contentType=metadict['bib_type'].lower() + self.contentType=normalizeCt(normalizeCt(metadict['bib_type']).lower()) - if not (metadict['bib_type'].lower()==self.contentType.lower()): - self.REQUEST.SESSION['contentStorage']=metadict['bib_type'] - self.REQUEST.SESSION['contentZope']=self.contentType + if not (normalizeCt(metadict['bib_type']).lower()==normalizeCt(self.contentType).lower()): + self.REQUEST.SESSION['contentStorage']=normalizeCt(metadict['bib_type']) + self.REQUEST.SESSION['contentZope']=normalizeCt(self.contentType) return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')() @@ -1602,6 +1661,11 @@ class ECHO_resource(CatalogAware,Folder, self.REQUEST.RESPONSE.write(fh) self.REQUEST.RESPONSE.close() return + + if getattr(self,'newViewer',''): #benutze den neuen viewer + url=self.newViewer+'url='+self.metalink+"&mode=texttool" + return self.REQUEST.RESPONSE.redirect(url) + return self.REQUEST.RESPONSE.redirect(self.link) def startpage_html(self): @@ -1636,7 +1700,7 @@ class ECHO_resource(CatalogAware,Folder, def generate_label(self): """Erzeugt_standard_Label aus Template""" - pt=getattr(self,"label_template_"+self.contentType.lower()) + pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower()) self.label=pt()[0:] return pt() @@ -1645,7 +1709,7 @@ class ECHO_resource(CatalogAware,Folder, def generate_title(self,RESPONSE=None): """Erzeugt_standard_Label aus Template""" - pt=getattr(self,"label_template_"+self.contentType.lower()) + pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower()) self.title=pt()[0:] @@ -1688,7 +1752,7 @@ class ECHO_externalLink(Folder,ECHO_basi - def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords): + def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType): self.id = id """Festlegen der ID""" @@ -1703,6 +1767,8 @@ class ECHO_externalLink(Folder,ECHO_basi self.responsible=responsible coordsnew=[ string.split(x,",") for x in coords] self.coords=coordsnew + self.linkType = linkType # Linktypen 'otherPresentation','external' + def ECHO_externalLink_config(self): """Main configuration""" @@ -1718,13 +1784,25 @@ class ECHO_externalLink(Folder,ECHO_basi return pt() - def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None): + def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'): """Aenderung der Properties""" setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight) self.link=link + self.linkType = linkType if RESPONSE is not None: RESPONSE.redirect('manage_main') + + def getLinkType(self): + """ return linkType """ + if hasattr(self,"linkType"): + return self.linkType + else : + return 'otherPresentation' + + def setLinkType(self,type): + """ set linkType """ + self.linkType = type manage_options = Folder.manage_options+( @@ -1737,6 +1815,7 @@ class ECHO_externalLink(Folder,ECHO_basi """standard page""" return self.REQUEST.RESPONSE.redirect(self.link) + def manage_addECHO_externalLinkForm(self): """Form for external Links""" @@ -1744,10 +1823,10 @@ def manage_addECHO_externalLinkForm(self return pt() -def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None): +def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'): """Add an external Link""" - newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords) + newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType) self._setObject(id,newObj) @@ -2284,6 +2363,28 @@ class ECHO_collection(CatalogAware, Fold else: return None + def changeViewer(self,newViewer,REQUEST=None,RESPONSE=None): + """changes all ressources to the newViewer""" + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) + if RESPONSE is not None: + RESPONSE.write("") + + for resource in resources: + + done,msg=resource[1].changeViewer(newViewer) + if done: + if RESPONSE is not None: + RESPONSE.write("

OK: %s"%resource[0]) + else: + if RESPONSE is not None: + RESPONSE.write("

ERROR: %s (%s)"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg)) + + + + if RESPONSE is not None: + RESPONSE.write("

Done

") + def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None): """change the templates""" @@ -2411,12 +2512,13 @@ class ECHO_collection(CatalogAware, Fold for resource in dom.getElementsByTagName('resource'): link=getText(resource.getElementsByTagName('link')[0].childNodes) label=getText(resource.getElementsByTagName('label')[0].childNodes) + pageimglink=getText(resource.getElementsByTagName('pageimglink')[0].childNodes) #splitted=link.split("?")[0].split("/") #id=splitted[len(splitted)-1].encode('ascii') id=re.sub(" ","_",label).encode('ascii') ret+="

"+label+"

" - manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","") + manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","",pageimglink.encode('ascii'),link.encode('ascii'),"","") return ret security.declarePublic('getImageTag') @@ -2545,7 +2647,7 @@ class ECHO_collection(CatalogAware, Fold return ECHO_rerenderLinksMD(self,obj,types) - def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""): + def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True): self.id = id """Festlegen der ID""" @@ -2563,6 +2665,7 @@ class ECHO_collection(CatalogAware, Fold self.secondaryLinkTitle=secondaryLinkTitle self.secondaryLink=secondaryLink self.bgcolour=bgcolour + self.isVisible=isVisible manage_options = Folder.manage_options+ Cacheable.manage_options+( @@ -2607,7 +2710,7 @@ class ECHO_collection(CatalogAware, Fold 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="",location=None,isAlwaysClickable=None,prefix="",suffix=""): + def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True): """Aenderung der Properties""" self.secondaryLink=secondaryLink @@ -2618,6 +2721,7 @@ class ECHO_collection(CatalogAware, Fold self.isAlwaysClickable=isAlwaysClickable self.prefix=prefix[0:] self.suffix=suffix[0:] + self.setIsVisible(isVisible) setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight) @@ -2755,11 +2859,11 @@ def manage_addECHO_collectionForm(self): return pt() -def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""): +def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True): """add a echo collection""" - newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="") + newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible) self._setObject(id,newObj) @@ -3625,6 +3729,7 @@ class ECHO_root(Folder,Persistent,Implic return "" link2html=vlp_xmlhelpers.link2html + related2html=vlp_xmlhelpers.related2html xml2html=vlp_xmlhelpers.xml2html @@ -3981,7 +4086,7 @@ class ECHO_linkList(ZopePageTemplate,ECH def getcontentType(self): """get contentType""" if hasattr(self,'contentType'): - return self.contentType + return normalizeCt(self.contentType) else: return 0