--- ECHO_content/VLPExtension.py 2004/08/19 20:28:18 1.23 +++ ECHO_content/VLPExtension.py 2004/10/06 16:29:27 1.28 @@ -2,7 +2,7 @@ from Products.ECHO_content.ECHO_collecti 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 +11,8 @@ except: import xml.dom.minidom import urllib import xmlrpclib - +import vlp_xmlhelpers +from types import * @@ -27,15 +28,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): @@ -132,12 +135,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): @@ -180,6 +188,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('Products/ECHO_content/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('Products/ECHO_content/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""" @@ -348,7 +413,9 @@ 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')() @@ -418,7 +485,7 @@ 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: @@ -433,7 +500,7 @@ 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: @@ -463,7 +530,7 @@ 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: @@ -493,7 +560,10 @@ class VLP_resource(ECHO_resource): 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]