--- ECHO_content/VLPExtension.py 2004/08/18 15:59:04 1.22 +++ ECHO_content/VLPExtension.py 2004/11/18 12:35:48 1.33 @@ -1,8 +1,12 @@ +""" +This module contains extensions which where originally made for the VLP. +""" +from OFS.Cache import Cacheable from Products.ECHO_content.ECHO_collection import * from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate - +from OFS.Image import File try: from Products.zogiLib import zogiLib except: @@ -11,7 +15,9 @@ except: import xml.dom.minidom import urllib import xmlrpclib - +import vlp_xmlhelpers +from types import * +from Globals import package_home @@ -27,15 +33,17 @@ def lemmatize(str): def makeXML(str): + try: dom=xml.dom.minidom.parseString(str) return str except: - - return """ + str=str.replace("& ","& ") + return """ %s """%str + def getText(nodelist): @@ -45,6 +53,94 @@ def getText(nodelist): rc = rc + node.data return rc +class sendMailForm(ZopePageTemplate): + """sendMailForm""" + meta_type="sendMailForm" + + _default_content_fn = os.path.join(package_home(globals()), 'vlp','sendMail_template.zpt') + + manage_options = ZopePageTemplate.manage_options+( + {'label':'Main Config','action':'main_configForm'}, + ) + + main_configForm = PageTemplateFile( + 'vlp/changeSendMailForm', globals()) + + def main_config(self, toAddrs,mailServer, subjectAdd=None, RESPONSE=None): + """main_config""" + self.toAddrs=toAddrs.split("\n") + self.mailServer=mailServer + self.subjectAdd=subjectAdd + if RESPONSE: + RESPONSE.redirect('manage_main') + + def sendForm(self,fromaddr,subject,content,nextPage="index_html",RESPONSE=None): + """sendform""" + fromaddr=fromaddr.strip("\r\n\t") # sicherstellen dass keine zusaetzlichen headerzeilen eingefuegt werden + subject=subject.strip("\r\n\t") # sicherstellen dass keine zusaetzlichen headerzeilen eingefuegt werden + toaddrs=self.toAddrs + + subject="%s %s"%(self.subjectAdd,subject) + + msg = ("From: %s\r\nSubject: %s\r\nTo: %s\r\n\r\n" + % (fromaddr, subject, ", ".join(toaddrs))) + server = smtplib.SMTP(self.mailServer) + #server.set_debuglevel(1) + msg=msg+content + server.sendmail(fromaddr, toaddrs, msg) + server.quit() + + if RESPONSE: + RESPONSE.redirect(nextPage) + +manage_addSendMailFormForm = PageTemplateFile( + 'vlp/addSendMailForm', globals(), __name__='manage_addSendMailFormFrom') + +from urllib import quote + +def manage_addSendMailForm(self, id, toAddrs,mailServer, title=None, text=None, subjectAdd=None, + REQUEST=None, submit=None): + "Add a Page Template with optional file content." + toAddrsList=toAddrs.split("\n") + id = str(id) + if REQUEST is None: + self._setObject(id, sendMailForm(id, text)) + ob = getattr(self, id) + if title: + ob.pt_setTitle(title) + setattr(ob,'toAddrs',toAddrsList) + setattr(ob,'mailServer',mailServer) + setattr(ob,'subjectAdd',subjectAdd) + return ob + else: + file = REQUEST.form.get('file') + headers = getattr(file, 'headers', None) + if headers is None or not file.filename: + zpt = sendMailForm(id) + else: + zpt = sendMailForm(id, file, headers.get('content_type')) + + self._setObject(id, zpt) + + try: + u = self.DestinationURL() + except AttributeError: + u = REQUEST['URL1'] + + if submit == " Add and Edit ": + u = "%s/%s" % (u, quote(id)) + + ob = getattr(self, id) + if title: + ob.pt_setTitle(title) + + setattr(ob,'toAddrs',toAddrsList) + setattr(ob,'mailServer',mailServer) + setattr(ob,'subjectAdd',subjectAdd) + REQUEST.RESPONSE.redirect(u+'/manage_main') + return '' + + class VLP_essay(Folder): """classe für VLP essays""" @@ -66,13 +162,13 @@ class VLP_essay(Folder): obj=getattr(self,type+"_template") return obj() else: - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%type)).__of__(self) pt.content_type="text/html" return pt() def ConfigVLP_essayForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/vlp/ChangeVLP_essay.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','ChangeVLP_essay.zpt')).__of__(self) return pt() def ChangeVLP_essay(self,title,label,description,RESPONSE=None): @@ -97,7 +193,7 @@ class VLP_essay(Folder): if hasattr(self,'essayTemplate.html'): return getattr(self,'essayTemplate.html')() - pt=PageTemplateFile('Products/ECHO_content/vlp/essay_template.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','essay_template.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -132,12 +228,17 @@ class VLP_essay(Folder): pages.sort(sortFind) #print str(pages[int(pagenum)][1]()) if pages[int(pagenum)-1][1].meta_type=='File': + #return makeXML(str(pages[int(pagenum)-1][1])) - print "A" - return self.xml2html(makeXML(str(pages[int(pagenum)-1][1])),quote="no") + #txt=pages[int(pagenum)-1][1].data.decode('utf-8') + txt=pages[int(pagenum)-1][1].data + #print txt.encode('utf-8') + + return self.xml2html(makeXML(txt),quote="no") else: - print "B" - #return makeXML(str(pages[int(pagenum)-1][1])) + + + return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no") def nextPage(self,pagenum,url): @@ -167,7 +268,7 @@ class VLP_essay(Folder): def manage_addVLP_essayForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/vlp/AddVLP_essay.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','AddVLP_essay.zpt')).__of__(self) return pt() def manage_addVLP_essay(self, id,title,label,RESPONSE=None): @@ -180,6 +281,63 @@ def manage_addVLP_essay(self, id,title,l RESPONSE.redirect('manage_main') +class VLP_encyclopaedia(VLP_essay): + """essay""" + + meta_type="VLP_encyclopaedia" + + manage_options = VLP_essay.manage_options+( + {'label':'Load File','action':'loadNewFileForm'}, + ) + + + def loadNewFileForm(self): + """Neues XML-File einlesen""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','VLP_newfile.zpt')).__of__(self) + return pt() + + def loadNewFile(self,RESPONSE=None): + """einlesen des neuen files""" + fileupload=self.REQUEST['fileupload'] + if fileupload: + file_name=fileupload.filename + filedata=fileupload.read() + + argv=vlp_xmlhelpers.proj2hash(self,filedata) + textsStr=string.join(argv['text']).encode('utf-8') + + texts=textsStr.split("") + + i=0 + for text in texts: + i+=1 + pageName='page%03d.xml'%i + pages=self.ZopeFind(self,obj_ids=[pageName]) + if pages: + pages[0][1].update_data(text) + + else: + zt=File(pageName,pageName,text,content_type="text/plain") + self._setObject(pageName,zt) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + +def manage_addVLP_encycForm(self): + """Form for adding""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','AddVLP_encyc.zpt')).__of__(self) + return pt() + +def manage_addVLP_encyc(self, id,title,label,RESPONSE=None): + """add the copyright""" + + + self._setObject(id, VLP_encyclopaedia(id, title,label)) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + class VLP_collection(ECHO_collection): """VLP spezifische Erweiterung der Collection""" @@ -193,7 +351,7 @@ class VLP_collection(ECHO_collection): def VLP_path_configForm(self): """change pt""" - path=PageTemplateFile('Products/ECHO_content/vlp/ChangeVLPPath.zpt').__of__(self) + path=PageTemplateFile(os.path.join(package_home(globals()),'vlp','ChangeVLPPath.zpt')).__of__(self) return pt() def VLP_path_config(self,path,RESPONSE=None): @@ -210,8 +368,9 @@ class VLP_collection(ECHO_collection): if fileName[0:3]=="lit": metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta" - newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','') - self._setObject(fileName,newObj) + if not hasattr(self,fileName): + newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','') + self._setObject(fileName,newObj) genObj=getattr(self,fileName) genObj.createIndexFile() @@ -251,7 +410,7 @@ class VLP_collection(ECHO_collection): def manage_addVLP_collectionForm(self): """Form for adding a ressource""" - pt=PageTemplateFile('Products/ECHO_content/vlp/AddVLP_collectionForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','AddVLP_collectionForm.zpt')).__of__(self) return pt() @@ -270,7 +429,7 @@ def manage_addVLP_collection(self,id,tit -class VLP_resource(ECHO_resource): +class VLP_resource(ECHO_resource,Cacheable): """VLP spezifische Erweiterung""" meta_type="VLP_resource" @@ -294,7 +453,7 @@ class VLP_resource(ECHO_resource): if hasattr(self,'libraryTranscriptionTemplate.html'): return getattr(self,'libraryTranscriptionTemplate.html')() - pt=PageTemplateFile('Products/ECHO_content/vlp/library_transcriptionTemplate.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_transcriptionTemplate.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -348,12 +507,14 @@ class VLP_resource(ECHO_resource): """show the rendered file""" if self.REQUEST.get('p',None): - self.REQUEST.set('pn',self.file2page(self.REQUEST.get('p',None))) + #self.REQUEST.set('pn',self.file2page(self.REQUEST.get('p',None))) + self.REQUEST.RESPONSE.redirect(self.REQUEST['URL']+"?pn="+self.file2page(self.REQUEST.get('p',None))) + if hasattr(self,'libraryTemplate.html'): return getattr(self,'libraryTemplate.html')() - pt=PageTemplateFile('Products/ECHO_content/vlp/library_template.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_template.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -380,7 +541,7 @@ class VLP_resource(ECHO_resource): def index_meta(self): """index_meta""" - pt=PageTemplateFile('Products/ECHO_content/vlp/index_meta.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_meta.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -389,8 +550,9 @@ class VLP_resource(ECHO_resource): dom=xml.dom.minidom.parse(ECHO_helpers.urlopen(getattr(self,'index.xml').absolute_url())) for page in dom.getElementsByTagName('page'): - if page.getAttribute('file')==p: - return page.getAttribute('nr') + # pageummer mit lo oder hi sind aequivalent + if (page.getAttribute('file')==p) or ("%slo"%page.getAttribute('file')==p) or ("%shi"%page.getAttribute('file')==p): + return page.getAttribute('nr') return 0 @@ -398,7 +560,8 @@ class VLP_resource(ECHO_resource): """dir to index""" def calculateName(str): - ret="%s: %s"%(str[0],str[1:5]) + name=os.path.splitext(str[1:])[0] + ret="%s: %s"%(str[0],name) return ret try: @@ -408,6 +571,7 @@ class VLP_resource(ECHO_resource): ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')) self.imagePath='pagesHi' temp=[] + ret.sort() for x in ret: if not (x[0]=="."): @@ -417,14 +581,15 @@ class VLP_resource(ECHO_resource): def firstPage(self,url=None): """showlink to the first image""" - if self.REQUEST.get('pn')=="1": #erste seinte dann kein a tag + if self.REQUEST.get('pn','1')=="1": #erste seinte dann kein a tag return """first
first""" else: - return """ + ws=self.REQUEST.get('ws','1') + return """ first
first - """%(self.REQUEST['URL']+"?pn=1") + """%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws) def lastPage(self,url=None): """showlink to the first image""" @@ -432,14 +597,15 @@ class VLP_resource(ECHO_resource): if pages: ln=len(pages) - if self.REQUEST.get('pn')==str(ln): #letzte seite dann kein a tag + if (self.REQUEST.get('pn')==str(ln)) or (ln==1): #letzte seite dann kein a tag oder nur eine Seite return """last
last""" else: - return """ - last
last + ws=self.REQUEST.get('ws','1') + return """ + last
last - """%(self.REQUEST['URL']+"?pn="+str(ln)) + """%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws) def prevPage(self,url=None): """showlink to the first image""" @@ -450,10 +616,11 @@ class VLP_resource(ECHO_resource): return """prev
prev""" else: - return """ + ws=self.REQUEST.get('ws','1') + return """ prev
prev - """%(self.REQUEST['URL']+"?pn="+str(nn)) + """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws) def nextPage(self,url=None): """showlink to the first image""" @@ -462,22 +629,32 @@ class VLP_resource(ECHO_resource): ln=len(pages) nn = int(self.REQUEST.get('pn','1'))+1 - if nn>int(ln): #letzte seite dann kein a tag + if (nn>int(ln)) or (ln==1): #letzte seite dann kein a tag return """next
next""" else: - return """ + ws=self.REQUEST.get('ws','1') + return """ next
next - """%(self.REQUEST['URL']+"?pn="+str(nn)) + """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws) def readIndexFile(self,url=None): """reads the indexfile. presently url not None isn't implemented. In the future url can be defined.""" - pagelist=[] - if not url: + if not url: url=self.absolute_url()+"/index.xml" + if self.ZCacheable_isCachingEnabled(): + + result = self.ZCacheable_get(view_name=url) + if result is not None: + # Got a cached value. + print "CACHEXX" + return result + + pagelist=[] + fh=ECHO_helpers.urlopen(url) dom=xml.dom.minidom.parse(fh) @@ -488,11 +665,15 @@ class VLP_resource(ECHO_resource): fileName=page.getAttribute('file') pagelist.append((pageNum,text,fileName)) - return pagelist + self.ZCacheable_set(pagelist,view_name=url) + return pagelist def getFileName(self): """getNameOfCurrentFile""" - pn=int(self.REQUEST.get('pn','1')) + try: + pn=int(self.REQUEST.get('pn','1')) + except: + pn=1 pageinfo=self.readIndexFile()[pn-1] return pageinfo[2] @@ -500,7 +681,7 @@ class VLP_resource(ECHO_resource): """create index file""" - pt=PageTemplateFile('Products/ECHO_content/vlp/index_template.zpt').__of__(self)() + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_template.zpt')).__of__(self)() @@ -519,7 +700,7 @@ class VLP_resource(ECHO_resource): def manage_addVLP_resourceForm(self): """Form for adding a ressource""" - pt=PageTemplateFile('Products/ECHO_content/vlp/AddVLP_resourceForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','AddVLP_resourceForm.zpt')).__of__(self) return pt()