--- ECHO_content/ECHO_collection.py 2004/08/27 22:57:57 1.165 +++ ECHO_content/ECHO_collection.py 2004/11/28 21:56:07 1.191 @@ -29,9 +29,17 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Globals import Persistent, package_home from Acquisition import Implicit -from ECHO_helpers import displayTypes + import urllib +import smtplib import time +from Ft.Xml.Domlette import NonvalidatingReader +from Ft.Xml.Domlette import PrettyPrint +from Ft.Xml import EMPTY_NAMESPACE + +import Ft.Xml.XPath +import cStringIO +import zLOG try: from psycopg import libpq @@ -47,38 +55,9 @@ import urllib import xml.dom.minidom from ECHO_graphicalOverview import javaHandler,javaScriptMain import ECHO_helpers +from ECHO_helpers import * +from ECHO_language import * -def donatus(txt2): - import xmlrpclib - - server = xmlrpclib.ServerProxy("http://archimedes.fas.harvard.edu/cgi-bin/donatus-rpc") - - txt=txt2.encode('utf-8') - bin=xmlrpclib.Binary(txt) - - - - ret=server.donatus.analyze(bin) - - - return ret['morphData'].data - - -def donatusVariant2Lemma(morphData): - """creates hash variant -> morphdata""" - ret={} - dom=xml.dom.minidom.parseString(morphData) - lemmas=dom.getElementsByTagName('lemma') - for lemma in lemmas: - variants=lemma.getElementsByTagName('variant') - for variant in variants: - atr=variant.getAttribute('form') - if ret.has_key(atr): - ret[atr].append=lemma.getAttribute('form') - else: - ret[atr]=[lemma.getAttribute('form')] - - return ret #regexp for extracting elements from xml patternTXT=r"<\s*txt.*?>(.*?)" @@ -87,387 +66,6 @@ patternPage=r"<\s*page.*?>(.*?)" regexpPage = re.compile(patternPage, re.IGNORECASE + re.DOTALL) -def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): - """Rerender all Links""" - ret="" - - if not obj: - obj = self - - entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource'],search_sub=1) - - for entry in entries: - if entry[1].meta_type == 'ECHO_resource': - 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]+"
" - - - - - return ""+ret+"Rerenderd all links to resources in: "+self.title+"" - -def reloadMetaDataFromStorage(self,RESPONSE=None): - """copy metadata from the storage to ECHO""" - ret="" - resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) - - for resource in resources: - x=str(resource[1].copyIndex_meta2echo_resource())+"
" - ret+=x - #print x - - - if RESPONSE is not None: - #RESPONSE.redirect('./manage_main') - return ""+ret+"" - - return ret - -def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None): - """rdf""" - - ret="" - about="""""" - name="""%s""" - link="""%s""" - clickable="""%s""" - #link="""""" - type="""%s""" - #xlink="""""" - if not urn: - #urn="urn:"+re.sub('/',':',self.absolute_url()) - urn=self.absolute_url() - about2=about%urn - if not nameDef: - if hasattr(self,'label') and not (self.label==""): - name2=name%self.label - elif not self.title=="": - name2=name%self.title - else: - name2=name%self.getId() - - name2=re.sub('&','&',name2) - else: - name2=name%nameDef - - linkURL=re.sub('http:','',linkURL) - linkURL2=re.sub('&','&',linkURL) - link2=link%(("http:"+linkURL2),("http:"+urllib.quote(linkURL))) - clickable2=clickable%"true" - - if not typeName: - type2=type%self.meta_type - else: - type2=type%typeName - - #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n" - ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n" - return ret - -def getCopyrightsFromForm(self,argv): - medias={} - partners={} - copyrights={} - - copyrightsFinal=[] - for arg in argv.keys(): - - if arg[0:5]=='media': - nm=int(arg[5:]) - medias[nm]=argv[arg] - elif arg[0:5]=='partn': - nm=int(arg[5:]) - partners[nm]=argv[arg] - elif arg[0:5]=='copyr': - nm=int(arg[5:]) - copyrights[nm]=argv[arg] - - - - copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()] - for copyright in copyrightsList: - - if copyright[2]=='institution0000': - copyrightsFinal.append((copyright[0],copyright[1],self.getPartnerCopyright(copyright[1],''))) - else: - if not copyright[0]=='': - copyrightsFinal.append(copyright) - - - return copyrightsFinal - -#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) - self.referencetypes=tags[2] - self.fields=tags[3] - - - 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: - - diffs[self.getFieldTag(tags,field)]=0 - except: - diffs[self.getFieldTag(tags,field)]=0 - - return diffs - -def content_html(self,type): - """template fuer content""" - #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"]) - # - #if templates: - # return templates[0][1]() - - if hasattr(self,type+"_template"): - obj=getattr(self,type+"_template") - return obj() - else: - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self) - pt.content_type="text/html" - return pt() - -def toList(field): - """Einzelfeld in Liste umwandeln""" - if type(field)==StringType: - return [field] - else: - return field - -def getText(nodelist): - - rc = "" - for node in nodelist: - if node.nodeType == node.TEXT_NODE: - rc = rc + node.data - return rc - -def getTextFromNode(nodename): - nodelist=nodename.childNodes - rc = "" - for node in nodelist: - if node.nodeType == node.TEXT_NODE: - rc = rc + node.data - 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 - -class BrowserCheck: - """check the browsers request to find out the browser type""" - - def __init__(self, zope): - self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT") - self.isN4 = (string.find(self.ua, 'Mozilla/4.') > -1) and (string.find(self.ua, 'MSIE') < 0) - self.isIE = string.find(self.ua, 'MSIE') > -1 - self.nav = self.ua[string.find(self.ua, '('):] - ie = string.split(self.nav, "; ")[1] - if string.find(ie, "MSIE") > -1: - self.versIE = string.split(ie, " ")[1] - self.isMac = string.find(self.ua, 'Macintosh') > -1 - self.isWin = string.find(self.ua, 'Windows') > -1 - self.isIEWin = self.isIE and self.isWin - self.isIEMac = self.isIE and self.isMac - - - - -def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,xmlfrag=None,digiliburlprefix=None): - """Einlesen der Metadaten und und erstellen des geaenderten XML file""" - - def updateTextToolNode(tag,value): - #print dom,tag,value - metanode=dom.getElementsByTagName('texttool')[0] - try: - nodeOld=metanode.getElementsByTagName(tag) - except: - nodeOld=None - - if nodeOld: - metanode.removeChild(nodeOld[0]).unlink() - - node=dom.createElement(tag) - nodetext=dom.createTextNode(value) - node.appendChild(nodetext) - metanode.appendChild(node) - - if xmlfrag: - geturl=""" - - - - - - """ - dom=xml.dom.minidom.parseString(geturl) - else: - try: - geturl="" - for line in ECHO_helpers.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(): - - 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) - try: - metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8")) - except: - metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8')) - metanodeneu.appendChild(metanodetext) - metanode.appendChild(metanodeneu) - - - - - - if project: - updateTextToolNode('project',project) - - if startpage: - updateTextToolNode('startpage',startpage) - - if topbar: - updateTextToolNode('toptemplate',topbar) - - if thumbtemplate: - updateTextToolNode('thumbtemplate',thumbtemplate) - - if xslt: - updateTextToolNode('xslt',xslt) - - - if digiliburlprefix: - updateTextToolNode('digiliburlprefix',digiliburlprefix) - - return dom.toxml().encode('utf-8') - - - -def readMetadata(url): - """Methode zum Auslesen der Metadateninformation zu einer Resource - Vorerst noch Typ bib""" - - metadict={} - try: - geturl="" - for line in ECHO_helpers.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) - - metanode=dom.getElementsByTagName('bib') - metadict['bib_type']='Book' - if len(metanode)==0: - metanode=dom.getElementsByTagName('archimedes') - metadict['bib_type']='Archimedes' - - - if not len(metanode)==0: - metacontent=metanode[0].childNodes - - try: - metadict['bib_type']=getText(dom.getElementsByTagName('bib')[0].attributes['type'].childNodes) - except: - """nothing""" - - for node in metacontent: - try: - #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes) - metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes)) - except: - """nothing""" - - - return metadict,"" - def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs,viewClassification=""): @@ -500,7 +98,7 @@ def setECHO_collectionInformation(self,t self.coords=coords[0:] -class ECHO_copyright(Folder): +class ECHO_copyright(Folder,ECHO_basis): """Copyright informationen""" meta_type="ECHO_copyright" @@ -520,6 +118,7 @@ class ECHO_copyright(Folder): {'label':'Main Config','action':'ECHO_copyright_configForm'}, ) + def ECHO_copyright_configForm(self): """change form""" pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyright').__of__(self) @@ -555,7 +154,7 @@ def manage_addECHO_copyright(self, id,ti if RESPONSE is not None: RESPONSE.redirect('manage_main') -class ECHO_layoutTemplate(ZopePageTemplate): +class ECHO_layoutTemplate(ZopePageTemplate,ECHO_basis): """Create a layout Template for different purposes""" meta_type="ECHO_layoutTemplate" @@ -578,7 +177,7 @@ class ECHO_layoutTemplate(ZopePageTempla def manage_addECHO_layoutTemplateForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_layoutTemplate.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddECHO_layoutTemplate.zpt')).__of__(self) return pt() from urllib import quote @@ -623,127 +222,11 @@ def manage_addECHO_layoutTemplate(self, REQUEST.RESPONSE.redirect(u+'/manage_main') return '' -class ECHO_fullText(ZopePageTemplate): +class ECHO_fullText(ZopePageTemplate,ECHO_basis,ECHO_language): """echo fulltext in xml""" meta_type="ECHO_fullText" - def donatusVariant2Lemma(self,nr='1'): - """analyze by donatus""" - return donatusVariant2Lemma(donatus(self.lemmatize(nr))) - - def tagLex(self,nr="1"): - """generate Links""" - global retLex - global toggle - - toggle=0 - retLex="" - - lemmatized=self.lemmatize(nr)[0:] - #print "ho",repr(lemmatized) - variants=donatusVariant2Lemma(donatus(lemmatized)) - - def createTag(name,attrs): - global toggle - - if name=="w": - toggle=1 - return "" - else: - tag="<" - tag+=name - for attr in attrs.keys(): - tag+=""" %s="%s" """%(attr,attrs[attr]) - tag+=">" - return tag - - def createData(data): - global toggle - astring="""%s """ - if toggle: # tag war ein w - toggle=0 - if variants.has_key(data): - return astring%(variants[data][0],data) - else: - return astring%(data,data) - - - - # 3 handler functions - def start_element(name, attrs): - global retLex - - retLex+=createTag(name,attrs) - def end_element(name): - global retLex - if not name=="w": - retLex+=""%(name.encode('utf-8')) - - - def char_data(data): - global retLex - if data: - try: - retLex+=createData(data) - except: - """no""" - - p = xml.parsers.expat.ParserCreate() - - p.StartElementHandler = start_element - p.EndElementHandler = end_element - p.CharacterDataHandler = char_data - - p.Parse(lemmatized.encode('utf-8'),1) - #print repr(lemmatized.encode('utf-8')) - - return retLex - - - def lemmatize(self,nr='1',lang="de"): - """lemmatize""" - global ret - ret="" - - def createTag(name,attrs): - tag="<" - tag+=name - for attr in attrs.keys(): - tag+=""" %s="%s" """%(attr,attrs[attr]) - tag+=">" - return tag - - def insertW(str): - splitted=str.split() - wordlist=["%s"%split for split in splitted] - return string.join(wordlist,'\n') - - # 3 handler functions - def start_element(name, attrs): - global ret - ret+=createTag(name,attrs) - def end_element(name): - global ret - ret+=""%(name.encode('utf-8')) - - def char_data(data): - global ret - ret+=insertW(data) - - p = xml.parsers.expat.ParserCreate() - - p.StartElementHandler = start_element - p.EndElementHandler = end_element - p.CharacterDataHandler = char_data - - p.Parse(self.getPage(nr), 1) - txt=""" -
%s
- """ - ret=txt%(lang,ret) - - return ret def getPage(self,nr='1'): """get page n""" @@ -789,7 +272,7 @@ def manage_addECHO_fullText(self, id, ti REQUEST.RESPONSE.redirect(u+'/manage_main') return '' -class ECHO_resource(Folder,Persistent): +class ECHO_resource(Folder,Persistent,ECHO_basis): """ECHO Ressource""" security=ClassSecurityInfo() meta_type='ECHO_resource' @@ -800,65 +283,12 @@ class ECHO_resource(Folder,Persistent): 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:colllectionroot")+"\n" - - ret+="""""" - return ret - def getRDF(self,urn=None): """rdf""" ret=getRDFDescription(self,self.link,urn=urn) return ret+self.createSubElementRDF(urn=urn) - - def createSubElementRDF(self,urn=None): - """rdf list""" - if not urn: - urn=self.absolute_url() - ret="" - - rettemp="""\n"""%urn - flag=0 - - li="""\n""" - if not ('' in self.getFullTextXML(noredirect='Yes')): - nurn=self.absolute_url()+'/getFullTextXML' - rettemp+=li%nurn - flag=1 - if not ('' in self.getImageView(noredirect='Yes')): - nurn=self.absolute_url()+'/getImageView' - rettemp+=li%nurn - flag=1 - - - if not ('' in self.showMetaDataXML()): - nurn=self.absolute_url()+'/showMetaDataXML' - rettemp+=li%nurn - flag=1 - - rettemp+="" - - if flag==1: - ret+=rettemp - - if not ('' in self.getFullTextXML(noredirect='Yes')): - nurn=self.absolute_url()+'/getFullTextXML' - ret+=getRDFDescription(self,self.absolute_url()+'/getFullTextXML',urn=nurn,nameDef="Fulltext",typeName="ECHO_fulltext") - - if not ('' in self.getImageView(noredirect='Yes')): - nurn=self.absolute_url()+'/getImageView' - ret+=getRDFDescription(self,self.absolute_url()+'/getImageView',urn=nurn,nameDef="Image View",typeName="ECHO_imageview") - - if not ('' in self.showMetaDataXML()): - nurn=self.absolute_url()+'/showMetaDataXML' - ret+=getRDFDescription(self,self.absolute_url()+'/showMetaDataXML',urn=nurn,nameDef="Metadata",typeName="ECHO_metaData") - - return ret - + def getAccessRightSelectorHTML(self,outlook="select"): """htmlselector""" values=['free','mpiwg'] @@ -1000,19 +430,73 @@ class ECHO_resource(Folder,Persistent): pt.content_type="text/html" return pt() + + def createImageUrl(self,pn=1): + """create ImageUrl""" + + + resourcepath=readFieldFromXML(self.metalink,'resource','archive-path') + + digiliburlprefix=readFieldFromXML(self.metalink,'texttool','digiliburlprefix') + images=readFieldFromXML(self.metalink,'texttool','image') + + + 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 + + return "%sfn=%s&pn=%i"%(digiliburlprefix,resourcepath+"/"+images,pn) + def copyTitleToInfoXML(self,RESPONSE=None): + """copy title from the resource""" + presentationXML=readFieldFromXML(self.metalink,'texttool','presentation') + resourcepath=readFieldFromXML(self.metalink,'resource','archive-path') + if (not presentationXML) or (not resourcepath): + if RESPONSE: + RESPONSE.write("Error: %s\n"%self.getId()) + else: + return None,self.absolute_url() + + try: + fh=file(os.path.join(resourcepath,presentationXML),'w') + fh.write(""" + + %s + + yes + """%self.title) + fh.close() + return 1,self.getId() + except: + if RESPONSE: + RESPONSE.write("Error: %s\n"%self.getId()) + else: + return None,self.absolute_url() + + def setStartPage(self,startpage=None,RESPONSE=None): """set start page, if no startpage defined use the generic one of the resource""" - if (not (type(startpage)==StringType)) and ("__generic" in startpage): # checke ob generic in der liste + if (not (type(startpage)==StringType)): + if ("__generic" in startpage): # checke ob generic in der liste + startpage=self.absolute_url()+"/startpage_html" + elif ("__firstPage" in startpage): # checke ob generic in der liste + startpage=self.createImageUrl() + + if (not startpage): startpage=self.absolute_url()+"/startpage_html" - - if (not startpage) or (startpage=="__generic"): - startpage=self.absolute_url()+"/startpage_html" - + elif (startpage=="__generic"): + startpage=self.absolute_url()+"/startpage_html" + elif (startpage=="__firstPage"): + startpage=self.createImageUrl() params="startpage=%s"%startpage - + 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)) + 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()+'/newMetaXML'+urllib.quote('?'+params))).read() @@ -1020,13 +504,15 @@ class ECHO_resource(Folder,Persistent): 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://content.mpiwg-berlin.mpg.de','',path) # falls content als server path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server - path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server + path=re.sub('http://vision.mpiwg-berlin.mpg.de','',path) # falls vision als server + path=re.sub('http://xserve02.mpiwg-berlin.mpg.de:18880','',path) # falls vision als server + path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo path=re.sub('/index.meta','',path) @@ -1041,6 +527,7 @@ class ECHO_resource(Folder,Persistent): return pt() + def getTextToolsField(self,name,default=''): """Lese Textoolsfelder aus index.meta im path aus""" @@ -1090,6 +577,7 @@ class ECHO_resource(Folder,Persistent): 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('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server + path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server @@ -1100,25 +588,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'): @@ -1128,15 +602,29 @@ class ECHO_resource(Folder,Persistent): def getFullTextXML(self,noredirect=None): """getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong.""" + try: + #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink) fh=ECHO_helpers.urlopen(self.metalink) + #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink) dom=xml.dom.minidom.parse(fh) texttools=dom.getElementsByTagName('texttool') text=texttools[0].getElementsByTagName('text') texturl=getText(text[0].childNodes) - + + #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl) + fh.close() + #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh") + #keine url + if not (texturl.split(":")[0] in ['http','ftp','file']): + if not noredirect: + return file(texturl).read() + else: + return texturl + if not noredirect: self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') + zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl) self.REQUEST.RESPONSE.redirect(texturl) else: return texturl @@ -1162,6 +650,8 @@ class ECHO_resource(Folder,Persistent): archivepath=getText(text[0].childNodes) archivepath=re.sub('/mpiwg/online/','',archivepath) imageurl="http://echo.mpiwg-berlin.mpg.de/zogilib?fn="+archivepath+"/"+imagetemp + fh.close() + if not noredirect: self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') self.REQUEST.RESPONSE.redirect(imageurl) @@ -1408,9 +898,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') @@ -1694,10 +1188,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 behind 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): @@ -1767,30 +1278,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): @@ -1874,9 +1370,9 @@ 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""" @@ -1895,7 +1391,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() @@ -1927,17 +1423,6 @@ 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): @@ -2088,7 +1573,7 @@ class ECHO_collection(Folder, Persistent pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self) return pt() - def getViewerTemplateSets(self,obj_ids=None): + def getViewerTemplateSets(self,obj_ids=None,RESPONSE=None): """Get the ViewerTemplateSet title for configuration""" ret=[] @@ -2097,7 +1582,7 @@ class ECHO_collection(Folder, Persistent for viewerTemplateSet in viewerTemplateSets: ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1])) - + return ret except: @@ -2150,8 +1635,28 @@ class ECHO_collection(Folder, Persistent if RESPONSE is not None: RESPONSE.redirect('manage_main') + def copyTitleToInfoXMLFolder(self,RESPONSE=None): + """copy title into the title field of info.xml + author and date werden leer!!! + """ - + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) + + + for resource in resources: + ret,txt=resource[1].copyTitleToInfoXML() + if (not ret) and RESPONSE: + RESPONSE.write("error: %s\n"%txt) + if ret and RESPONSE: + RESPONSE.write("ok: %s\n"%txt) + + #zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt) + if RESPONSE is not None: + RESPONSE.write("done!\n") + RESPONSE.close() + RESPONSE.redirect('manage_main') + def copySearchFields(self,RESPONSE=None): """copys import metadatafields to the object""" resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) @@ -2209,21 +1714,6 @@ 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""" @@ -2277,6 +1767,11 @@ class ECHO_collection(Folder, Persistent def getCollectionTreeXML(self): """Tree as XML""" + def addPassWd(str): + """adds a user/passwd to an url""" + txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str) + return txt2 + def getCollection(object,depth=0): depth+=1 collections="" @@ -2284,7 +1779,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""" @@ -2541,7 +2036,7 @@ class ECHO_collection(Folder, Persistent else: return "#dddddd" - 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): + 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""" self.secondaryLink=secondaryLink @@ -2550,6 +2045,7 @@ class ECHO_collection(Folder, Persistent self.bgcolour=bgcolour self.viewClassification=viewClassification self.location=location + self.isAlwaysClickable=isAlwaysClickable if coords: coordsnew=[ string.split(x,",") for x in coords] @@ -2569,7 +2065,15 @@ class ECHO_collection(Folder, Persistent if RESPONSE is not None: RESPONSE.redirect('manage_main') + def setAlwaysClickable(self,flag="yes"): + """set clickable""" + if flag=="yes": + self.isAlwaysClickable="yes" + else: + self.isAlwaysClickable=None + return flag + def showOverview(self): """overview""" if 'ECHO_overview.html' in self.__dict__.keys(): @@ -2605,9 +2109,10 @@ class ECHO_collection(Folder, Persistent 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""" @@ -2701,15 +2206,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""" @@ -2803,7 +2299,7 @@ class ECHO_group(ECHO_collection): def content_html(self): """template fuer content""" - return content_html(self,'group') + return ECHO_basis.content_html(self,'group') @@ -2941,51 +2437,13 @@ def manage_addECHO_userFolderForm(self): """add a user folder form""" return manage_addECHO_userFolder(self) -def getEdges(seqs,urn): - """edges""" - ret=[] - #print urn,seqs - for seqsList in seqs[urn]: - - try: - for seq in seqsList: - ret+=seq.getElementsByTagName("RDF:li") - except: - ret+=seqsList.getElementsByTagName("RDF:li") - return ret -def createSubs(self,seqs,descrs,urn): - """create subs""" - for edge in getEdges(seqs,urn): - cn=createNode(self,descrs[edge.getAttribute('RDF:resource')]) - if cn[0]=="CDLI_group": - #print "HHHHHH",cn[1],seqs,descrs,cn[2] - createSubs(cn[1],seqs,descrs,cn[2]) -def getEdges2(seqs,urn): - """edges""" - ret=[] - #print urn,seqs - - return seqs[urn] - -def createSubs2(self,seqs,descrs,urn,level=0): - """create subs""" - - for edge in getEdges2(seqs,urn): - print "urnXX",urn.encode('utf-8'),level - cn=createNode2(self,descrs,edge) - if cn[0]=="CDLI_group": - - createSubs2(cn[1],seqs,descrs,cn[2],level+1) - print "urnddonesubs",urn.encode('utf-8') - print "urndonenode",urn.encode('utf-8') - return -def createNode2(self,descrs,node): +def createNode(self,descrs,node): name=descrs[node]['name'] type=descrs[node]['type'] urn=node - print " will create",node.encode('utf-8') + #print " will create",node.encode('utf-8') id=re.sub('[^a-zA-Z0-9]','',name).encode('ascii','ignore') #print "id",id #print type @@ -3012,28 +2470,6 @@ def createNode2(self,descrs,node): return "XX" -def createNode(self,nodes): - for node in nodes: - name=getTextFromNode(node.getElementsByTagName("ECHONAVIGATION:name")[0]) - type=getTextFromNode(node.getElementsByTagName("ECHONAVIGATION:type")[0]) - urn=node.getAttribute("RDF:about") - - id=re.sub('[^a-zA-Z0-9]','',name).encode('ascii','ignore') - #print "id",id - #print type - self.REQUEST.RESPONSE.write("

%s

\n"%id) - if type=="CDLI_group": - print self.getId() - - manage_addECHO_collection(self,id,name,name,"","","","","") - print "done::::",getattr(self,id) - return type,getattr(self,id),urn - - if type=="CDLI_item": - manage_addECHO_resource(self,id,name,name,"","",urn,"","") - return "XX" - - class ECHO_root(Folder,Persistent,Implicit): """ECHO Root Folder""" @@ -3042,15 +2478,57 @@ class ECHO_root(Folder,Persistent,Implic meta_type="ECHO_root" + ###CDLI adds -> have to be removed def getTablet(self,item): - read=urllib.urlopen("http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"%item).read() - - read=re.sub("\[search\]","search",read) + #print "getTablet" + try: + read=urllib.urlopen("http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"%item).read() + read=re.sub("\[search\]","search",read) + return read[read.find("")+6:read.rfind("")] + except: + return "

Sorry no connection to the data server enlil.museum.upenn.edu

" + #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] - return read[read.find("")+6:read.rfind("")] + def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'): + """sendform""" + toaddrs=["dwinter@mpiwg-berlin.mpg.de"] + + msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" + % (fromaddr, ", ".join(toaddrs),"testsub")) + server = smtplib.SMTP(server) + #server.set_debuglevel(1) + msg=msg+content + server.sendmail(fromaddr, toaddrs, msg) + server.quit() + + def generateFromRDFForm(self): + """change form""" + pt=PageTemplateFile('Products/ECHO_content/zpt/generateFromRDFForm').__of__(self) + pt.content_type="text/html" + return pt() + + def generateFromRDF(self,file,startNode="/Cuneiform Corpus"): + + """generate from RDF""" - def generateFromRDF2(self): - """generate from RDF2""" global seqs seqs={} global descrs @@ -3059,6 +2537,20 @@ class ECHO_root(Folder,Persistent,Implic key="" global value value="" + + def getEdges(seqs,urn): + """edges""" + ret=[] + return seqs[urn] + + def createSubs(self,seqs,descrs,urn,level=0): + """create subs""" + for edge in getEdges(seqs,urn): + cn=createNode(self,descrs,edge) + if cn[0]=="CDLI_group": + createSubs(cn[1],seqs,descrs,cn[2],level+1) + return + def start_element(name,attrs): global seqs @@ -3115,40 +2607,20 @@ class ECHO_root(Folder,Persistent,Implic p.StartElementHandler = start_element p.EndElementHandler = end_element p.CharacterDataHandler = char_data - fileName="/Users/dwinter/Documents/Projekte/CDLI/test11.rdf" - p.ParseFile(file(fileName)) + + p.ParseFile(file) self.REQUEST.RESPONSE.write("

Start

") - createSubs2(self,seqs,descrs,"/Cuneiform Corpus") + createSubs(self,seqs,descrs,startNode) self.REQUEST.RESPONSE.write("

done

") - print "done" + #print "done" return "done" - def generateFromRDF(self): - """generate Structure from rdf""" - dom=xml.dom.minidom.parse("/Users/dwinter/Documents/Projekte/CDLI/test10.rdf") - seqs={} - descrs={} - for seq in dom.getElementsByTagName("RDF:Seq"): - key=seq.getAttribute('RDF:about') - try: - seqs[key].append(seq) - except: - seqs[key]=[seq] - - - for descr in dom.getElementsByTagName("RDF:Description"): - key=descr.getAttribute('RDF:about') - try: - descrs[key].append(descr) - except: - descrs[key]=[descr] - createSubs(self,seqs,descrs,"echo:collectionroot") - - + + def changeWeightsInCollection(self): """change all lables of a collection""" ret="" @@ -3175,18 +2647,11 @@ class ECHO_root(Folder,Persistent,Implic {'label':'Main Config','action':'ECHO_copyright_configForm'}, {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'}, {'label':'Change Weights','action':'changeWeights'}, - ) + {'label':'Generate from RDF','action':'generateFromRDFForm'}, - - 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""" @@ -3441,6 +2906,26 @@ class ECHO_root(Folder,Persistent,Implic return "changed all contenttypes in: "+self.title + def deleteCache(self,obj=None,RESPONSE=None): + """setze alle collections auf cache = CacheManager""" + + + if not obj: + obj = self + + entries=obj.ZopeFind(obj,search_sub=1) + + for entry in entries: + if hasattr(entry[1],'_v_hash'): + entry[1]._v_hash=None + + + + + return "changed all CM in: "+self.title + + + def ECHO_newViewerLink(self,obj=None): """change links (:86 faellt weg)""" @@ -3506,9 +2991,15 @@ class ECHO_root(Folder,Persistent,Implic for link in links: link.tagName="a" - ref=link.getAttribute("ref") + ref=link.getAttribute("ref") + pn=link.getAttribute("page") + if self.checkRef(ref): - link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref) + if pn: + link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&p="+pn) + else: + link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref) + newxml=dom.toxml('utf-8') @@ -3521,35 +3012,65 @@ class ECHO_root(Folder,Persistent,Implic def xml2html(self,str,quote="yes"): """link2html fuer VLP muss hier noch raus""" - print str + if str: if quote=="yes2": str=re.sub("\&","&",str) - dom=xml.dom.minidom.parseString(str) - links=dom.getElementsByTagName("link") - - + #dom=xml.dom.minidom.parseString(str) + dom = NonvalidatingReader.parseString(str,"http://www.mpiwg-berlin.mpg.de/") + #links=dom.getElementsByTagName("link") + links=Ft.Xml.XPath.Evaluate(".//link", contextNode=dom) for link in links: - link.tagName="a" - ref=link.getAttribute("ref") + #link.tagName="a" + + ref=link.getAttributeNS(EMPTY_NAMESPACE,"ref") + pn=link.getAttributeNS(EMPTY_NAMESPACE,"page") + + cns=link.childNodes[0:] + + newLink=dom.createElementNS(EMPTY_NAMESPACE,"a") + for x in cns: + newLink.appendChild(x) + + + + link.parentNode.replaceChild(newLink,link) if self.checkRef(ref): - link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref) + if pn: + newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn) + else: + newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref) - str= dom.toxml() - + #str= dom.toxml('utf-8') + buf = cStringIO.StringIO() + PrettyPrint(dom, stream=buf, encoding='UTF-8') + str = buf.getvalue() + buf.close() + #str=PrettyPrint(dom.documentElement,encoding='UTF-8') #print link.toxml('utf-8') + #print type(str) retStr=regexpPage.search(str) - - return retStr.group(1) + try: # hack warum fehtl manchmal page?? + return retStr.group(1) + except: + return str return "" def checkRef(self,ref): - dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''} - res=None - for db in dbs.keys(): - - res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db]))) - return res + if ref[0:3]=='lit': + if len(self.library_data({ 'id':ref}))>0: + return 1 + try: + if ref[0:7]=="tec_cat": + return 1 + except: + """nothing""" + + dbs={'vl_technology':'','vl_people':'','vl_sites':''} + res=None + for db in dbs.keys(): + res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db]))) + return res #Ende Methode fuer vlp @@ -3560,9 +3081,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""" @@ -3577,7 +3099,7 @@ class ECHO_root(Folder,Persistent,Implic """ for partner in partners: - ret+="""\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace')) + ret+="""\n"""%(partner.getId(),partner.title) return ret+"\n" @@ -3684,11 +3206,22 @@ class ECHO_root(Folder,Persistent,Implic def getMetaDatasXML(self,viewerType=None,filter=None): """gebe all ressourcen aus""" + # check if the request's host part was OK + http_host = self.REQUEST['HTTP_HOST'] + host_port = self.REQUEST['SERVER_PORT'] + fix_host = None + if http_host and http_host.rfind(host_port) == -1: + print "HTTP_HOST needs fixing!" + fix_host = http_host + ":" + host_port + ret=""" """ for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1): echo_url=resource[1].absolute_url() + if fix_host: + #print "replacing ", http_host, " by ", fix_host + echo_url = string.replace(echo_url, http_host, fix_host, 1) if hasattr(resource[1],'link'): meta_url=echo_url+"/getMetaDataXML" @@ -3706,8 +3239,7 @@ class ECHO_root(Folder,Persistent,Implic ret +="""\n""" - - + self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml") self.REQUEST.RESPONSE.write(ret) @@ -3746,7 +3278,7 @@ def manage_addECHO_rootForm(self): pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self) return pt() -class ECHO_copyrightType(Folder): +class ECHO_copyrightType(Folder,ECHO_basis): """copyright typ""" meta_type="ECHO_copyrightType" @@ -3795,7 +3327,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" @@ -3879,7 +3411,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" @@ -3891,7 +3423,7 @@ 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""" @@ -3975,8 +3507,8 @@ def manage_addECHO_linkList(self, id, la return '' -class ECHO_support(Folder): - """gefšrdert durch""" +class ECHO_support(Folder,ECHO_basis): + """gefoerdert durch""" meta_type="ECHO_support" @@ -4029,7 +3561,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" @@ -4108,3 +3640,4 @@ def manage_addECHO_institution(self, id, except: url=REQUEST['URL1'] REQUEST.RESPONSE.redirect('%s/manage_main' % url) return id +