--- ECHO_content/VLPExtension.py 2005/09/13 16:10:44 1.48 +++ ECHO_content/VLPExtension.py 2008/08/05 16:17:46 1.70 @@ -8,9 +8,9 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from OFS.Image import File try: - from Products.zogiLib import zogiLib + from Products.zogiLib import zogiLib except: - print "Zogilib not installed, VLP_resource will not work" + print "Zogilib not installed, VLP_resource will not work" import xml.dom.minidom import urllib @@ -21,80 +21,95 @@ import os from stat import * from types import * from Globals import package_home - +import transaction def lemmatize(str): - """takes a str and addes links the dictionary service""" - server = xmlrpclib.ServerProxy("http://archimedes.fas.harvard.edu/cgi-bin/donatus-rpc") - if server: - splitted=str.split(" ") - wordlist=["%s"%split for split in splitted].join() - return wordlist + """takes a str and addes links the dictionary service""" + server = xmlrpclib.ServerProxy("http://archimedes.fas.harvard.edu/cgi-bin/donatus-rpc") + if server: + splitted=str.split(" ") + wordlist=["%s"%split for split in splitted].join() + return wordlist - + - + def makeXML(str): - - try: - dom=xml.dom.minidom.parseString(str) - return str - except: - str=str.replace("& ","& ") - return """ - %s - """%str - - - + + try: + dom=xml.dom.minidom.parseString(str) + return str + except: + str=str.replace("& ","& ") + return """ + %s + """%str + + +def checkXMLfrag(str): + """checks and returns str as XML fragment""" + + xmltempl = """ + %s""" + try: + dom=xml.dom.minidom.parseString(xmltempl%str) + return str + except: + str=str.replace("& ","& ") + + dom=xml.dom.minidom.parseString(xmltempl%str) + return str + + + def getText(nodelist): rc = "" for node in nodelist: - if node.nodeType == node.TEXT_NODE: + if node.nodeType == node.TEXT_NODE: rc = rc + node.data return rc class sendMailForm(ZopePageTemplate): - """sendMailForm""" - meta_type="sendMailForm" + """sendMailForm""" + meta_type="sendMailForm" - _default_content_fn = os.path.join(package_home(globals()), 'vlp','sendMail_template.zpt') + _default_content_fn = os.path.join(package_home(globals()), 'vlp','sendMail_template.zpt') - manage_options = ZopePageTemplate.manage_options+( + manage_options = ZopePageTemplate.manage_options+( {'label':'Main Config','action':'main_configForm'}, ) - main_configForm = PageTemplateFile( + 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() + 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) + if RESPONSE: + RESPONSE.redirect(nextPage) manage_addSendMailFormForm = PageTemplateFile( 'vlp/addSendMailForm', globals(), __name__='manage_addSendMailFormFrom') @@ -111,9 +126,9 @@ def manage_addSendMailForm(self, id, toA ob = getattr(self, id) if title: ob.pt_setTitle(title) - setattr(ob,'toAddrs',toAddrsList) - setattr(ob,'mailServer',mailServer) - setattr(ob,'subjectAdd',subjectAdd) + setattr(ob,'toAddrs',toAddrsList) + setattr(ob,'mailServer',mailServer) + setattr(ob,'subjectAdd',subjectAdd) return ob else: file = REQUEST.form.get('file') @@ -132,26 +147,26 @@ def manage_addSendMailForm(self, id, toA if submit == " Add and Edit ": u = "%s/%s" % (u, quote(id)) - - ob = getattr(self, id) + + ob = getattr(self, id) if title: ob.pt_setTitle(title) - - setattr(ob,'toAddrs',toAddrsList) - setattr(ob,'mailServer',mailServer) - setattr(ob,'subjectAdd',subjectAdd) + + 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""" + """classe fr VLP essays""" meta_type="VLP_essay" manage_options = Folder.manage_options+( - {'label':'Main Config','action':'ConfigVLP_essayForm'}, - {'label':'Generate Essay Template','action':'generateEssayTemplateHTML'}, + {'label':'Main Config','action':'ConfigVLP_essayForm'}, + {'label':'Generate Essay Template','action':'generateEssayTemplateHTML'}, ) def content_html(self,type='collection'): @@ -160,7 +175,7 @@ class VLP_essay(Folder): # #if templates: # return templates[0][1]() - + if hasattr(self,type+"_template"): obj=getattr(self,type+"_template") return obj() @@ -190,20 +205,20 @@ class VLP_essay(Folder): self.label=label def index_html(self): - - """show the rendered file""" - - if hasattr(self,'essayTemplate.html'): - return getattr(self,'essayTemplate.html')() - - pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','essay_template.zpt')).__of__(self) - pt.content_type="text/html" - return pt() + + """show the rendered file""" + + if hasattr(self,'essayTemplate.html'): + return getattr(self,'essayTemplate.html')() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','essay_template.zpt')).__of__(self) + pt.content_type="text/html" + return pt() def generateEssayTemplateHTML(self,RESPONSE=None): """lege standard index.html an""" - if not hasattr(self,'essayTemplate.html'): + if not hasattr(self,'essayTemplate.html'): zt=ZopePageTemplate('essayTemplate.html') self._setObject('essayTemplate.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -217,6 +232,44 @@ class VLP_essay(Folder): if RESPONSE is not None: RESPONSE.redirect('manage_main') + def getPageList(self): + """returns sorted list of (id,object) of page objects""" + + def sortFind(x,y): + return cmp(x[0],y[0]) + +# pages=[] +# pagestmp=self.ZopeFind(self,obj_metatypes=['DTML Document','File']) +# for page in pagestmp: +# if not (page[1].getId()[0]=="."): +# pages.append(page) + + pages = self.objectItems(['DTML Document','File']) + pages.sort(sortFind) + + + def getPageXMLfrag(self, pageNum=None, pageId=None, pageObj=None): + """returns XML fragment of page with id""" + if pageNum is not None: + pl = self.getPageList() + pageObj = pl[int(pageNum)-1][1] + + if pageId is not None: + pageObj = getattr(self, pageId, None) + + if pageObj is not None: + txt = "" + data = pageObj.data + while data is not None: + txt += data + if isinstance(data, str): + data = None + else: + data = data.next + + xml = checkXMLfrag(txt) + return xml + def getPage(self,pagenum): """gibt essay page mit num aus""" @@ -224,25 +277,21 @@ class VLP_essay(Folder): return cmp(x[0],y[0]) pages=[] pagestmp=self.ZopeFind(self,obj_metatypes=['DTML Document','File']) - for page in pagestmp: - if not (page[1].getId()[0]=="."): - pages.append(page) - + for page in pagestmp: + if not (page[1].getId()[0]=="."): + pages.append(page) + 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])) - #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") + #return makeXML(str(pages[int(pagenum)-1][1])) + #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: - - - - return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no") + return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no") def nextPage(self,pagenum,url): pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document','File'])) # teste ob performance ok, sonst in variable @@ -262,6 +311,12 @@ class VLP_essay(Folder): retstr=url+"?p="+str(int(pagenum)+1) return retstr + def lastURL(self,pagenum,url): + # teste ob performance ok, sonst in variable + pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document','File'])) + + return url+"?p="+str(pages) + def previousURL(self,pagenum,url): if int(pagenum)-1 > 0: @@ -275,109 +330,139 @@ def manage_addVLP_essayForm(self): return pt() def manage_addVLP_essay(self, id,title,label,RESPONSE=None): - """add the copyright""" + """add the copyright""" - - self._setObject(id, VLP_essay(id, title,label)) + + self._setObject(id, VLP_essay(id, title,label)) - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + class VLP_encyclopaedia(VLP_essay): - """essay""" + """essay""" + + meta_type="VLP_encyclopaedia" + + manage_options = VLP_essay.manage_options+( + {'label':'Load File','action':'loadNewFileForm'}, + ) - 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 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""" + """add the copyright""" - - self._setObject(id, VLP_encyclopaedia(id, title,label)) + + self._setObject(id, VLP_encyclopaedia(id, title,label)) - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + class VLP_subcollection(ECHO_collection): - """ subcollection of elements""" + """ subcollection of elements""" + + meta_type="VLP_subcollection" + + def getVLPSubcollectionToc(self,type): + + #different ordering depending on the type + if(type == "(Collection)"): + sort= "shortreference" + else: + sort = "startpages" + + #content of journals also displayed if not online + + if (type == "(JournalVolume)"): + online ="" + else: + online ="AND online = 1" + sort=self.collectionSort(type) + + item = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature + WHERE volumeid ~ '%s\\\\M' """%self.getId() + + """ %s AND not referenceType='%s' """%(online,type) + + """ORDER BY """ + sort)] + + tocItem = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature + WHERE reference = '%s' """%self.getId() + + """AND online = 1 AND referenceType='%s' """%type + + """ORDER BY """ + sort)] + + + + return tocItem+item + + def checkForFrontMatter(self,item): + """Teste ob Frontmatter exists""" + if not item==self.getId(): + return False + + if self.ZopeFind(self,obj_ids=[self.getId()]): + return True + else: + return False + + def generateSubCollectionFromDB(self): + """erzeuge subcollection""" + for item in self.ZSQLSimpleSearch("select * from vl_literature where volumeid like '%s'"%self.id): + manage_addECHO_link(self,item.reference,item.titlerefdisplay,item.titlerefdisplay) - meta_type="VLP_subcollection" - - def checkForFrontMatter(self,item): - """Teste ob Frontmatter exists""" - if not item==self.getId(): - return False - - if self.ZopeFind(self,obj_ids=[self.getId()]): - return True - else: - return False - - def generateSubCollectionFromDB(self): - """erzeuge subcollection""" - for item in self.ZSQLSimpleSearch("select * from vl_literature where volumeid like '%s'"%self.id): - manage_addECHO_link(self,item.reference,item.titlerefdisplay,item.titlerefdisplay) - - - def index_html(self): - """erzeuge darstellung""" - - if hasattr(self,'subCollection_template.html'): - return getattr(self,'subCollection_template.html')() - pt=zptFile(self, 'vlp/subCollection_template.zpt') - return pt() + def index_html(self): + """erzeuge darstellung""" + + if hasattr(self,'subCollection_template.html'): + return getattr(self,'subCollection_template.html')() + + pt=zptFile(self, 'vlp/subCollection_template.zpt') + return pt() def manage_addVLP_subCollection(self,id,title,label,RESPONSE=None): - self._setObject(id,VLP_subcollection(id,title,label)) + self._setObject(id,VLP_subcollection(id,title,label)) - if RESPONSE is not None: - RESPONSE.redirect('manage_main') + if RESPONSE is not None: + RESPONSE.redirect('manage_main') class VLP_collection(ECHO_collection): @@ -393,39 +478,57 @@ class VLP_collection(ECHO_collection): - def generateSubCollections(self,errorsTXT=""): - """erzeuge subcollectionen""" - founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Book)','(Collection)','(Journal)')") - - self.REQUEST.RESPONSE.write("

Create Subcollections

\n") - for found in founds: - try: - foundCol=self.ZopeFind(self,obj_ids=[found.reference]) - if foundCol: - - self.manage_delObjects([foundCol[0][0]]) - - manage_addVLP_subCollection(self,found.reference,found.titlerefdisplay,found.titlerefdisplay) - #getattr(self,found.reference).generateSubCollectionFromDB() - #teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter) - if os.path.exists(os.path.join(self.vlp_basis,found.reference)): - - obj=getattr(self,found.reference) - if not self.ZopeFind(obj,obj_ids=[found.reference]): - metalink=self.REQUEST['URL1']+"/"+found.reference+"/"+found.reference+"/index_meta" - newObj=VLP_resource(found.reference,'',metalink,found.reference,found.reference,found.reference,'generated','book','','','','','','') - obj._setObject(found.reference,newObj) - genObj=getattr(obj,found.reference) - genObj.createIndexFile() - - self.REQUEST.RESPONSE.write("

%s

\n"%found.reference) - except: - error=sys.exc_info()[0:2] - RESPONSE.write("(ERROR (%s): %s %s)\n"%(found.reference,error[0],error[1])) - errorsTXT+="

No subcollection of %s "+"(ERROR: %s %s)

"%error - - return errorsTXT - + def generateSubCollections(self,errorsTXT="",forceUpdate=False,RESPONSE=None): + """erzeuge subcollectionen""" + logging.debug("generateSubCollections") + founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')") + + if RESPONSE is not None: + RESPONSE.setHeader('Content-Type','text/html') + self.REQUEST.RESPONSE.write("

Create Subcollections

\n") + for found in founds: + try: + litid = str(found.reference) + foundCol=self.ZopeFind(self,obj_ids=[litid]) + if foundCol: + col = foundCol[0][1] + logging.debug("generateSubCollections: subcollection %s exists (%s)"%(col.getId(),found.reference)) + if (col.title != found.titlerefdisplay) or (col.label != found.titlerefdisplay): + # subcollection seems to have changed + logging.debug("generateSubCollections: subcollection has changed, recreating!") + self.manage_delObjects([foundCol[0][0]]) + manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay) + else: + logging.debug("generateSubCollections: creating new subcollection %s"%found.reference) + manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay) + + #teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter) + if os.path.exists(os.path.join(self.vlp_basis,litid)): + logging.debug("generateSubCollections: found frontmatter in %s"%litid) + obj=getattr(self,litid) + if not self.ZopeFind(obj,obj_ids=[litid]): + metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta" + newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','') + obj._setObject(litid,newObj) + + genObj=getattr(obj,litid) + genObj.createIndexFile(forceUpdate=forceUpdate) + + if RESPONSE is not None: + self.REQUEST.RESPONSE.write("

%s

\n"%litid) + + except: + error=sys.exc_info()[0:2] + logging.error("generateSubCollections: ERROR in %s"%litid) + if RESPONSE is not None: + RESPONSE.write("

(ERROR (%s): %s %s)

\n"%(litid,error[0],error[1])) + #logging.error("generateSubCollections: %s %s"%error) + #self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1]))) + errorsTXT+="

ERROR: No subcollection of %s (ERROR: %s %s)

\n"%(litid,error[0],error[1]) + #errorsTXT+="

No subcollection of %s "%litid+"(ERROR: %s %s)

"%error + + return errorsTXT + def VLP_path_configForm(self): """change pt""" pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','ChangeVLPPath.zpt')).__of__(self) @@ -437,48 +540,68 @@ class VLP_collection(ECHO_collection): if RESPONSE is not None: RESPONSE.redirect('manage_main') - def updateCollection(self,RESPONSE=None): + def updateCollection(self,forceUpdate=False,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" - errorsTXT="

Errors

" - RESPONSE.write("") - files=os.listdir(self.vlp_basis) + errorsTXT="

Errors

" + if RESPONSE is not None: + RESPONSE.setHeader('Content-Type','text/html') + RESPONSE.write("") - errorsTXT+="

New Ressources

" + files=os.listdir(self.vlp_basis) for fileName in files: - if fileName[0:3]=="lit": - metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta" - try: - if not hasattr(self,fileName): - newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','') - self._setObject(fileName,newObj) - - RESPONSE.write("

got: %s\n

"%fileName) - genObj=getattr(self,fileName) - if hasattr(genObj,'createIndexFile'): - try: - genObj.createIndexFile() - except: - error=sys.exc_info()[0:2] - RESPONSE.write("

(ERROR (%s): %s %s)

\n"%(fileName,error[0],error[1])) - errorsTXT+="

No indexfile of %s "+"(ERROR: %s %s)

"%error - - if genObj.meta_type=="VLP_subcollection": - genObj.pageSizeSum=getattr(genObj,fileName).getPageSizeSum() - else: - genObj.pageSizeSum=genObj.getPageSizeSum() - - except: - error=sys.exc_info()[0:2] - RESPONSE.write("

(ERROR (%s): %s %s)

\n"%(fileName,error[0],error[1])) - errorsTXT+="

File not created:%s "+"(ERROR: %s %s)

"%error - - errorsTXT+=self.generateSubCollections() - errorsTXT+="/n" - RESPONSE.write(errorsTXT) + try: + if not hasattr(self,fileName): + # create new resource + logging.debug("updateCollection: new %s"%fileName) + if RESPONSE is not None: + RESPONSE.write("

new: %s

\n"%fileName) + newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','') + self._setObject(fileName,newObj) + + if RESPONSE is not None: + RESPONSE.write("

got: %s "%fileName) + genObj=getattr(self,fileName) + logging.debug("updateCollection: inspecting %s"%fileName) + # create index + if hasattr(genObj,'createIndexFile'): + try: + logging.debug("updateCollection: creating index for %s"%fileName) + msg = genObj.createIndexFile(forceUpdate=forceUpdate) + if msg and RESPONSE is not None: + RESPONSE.write(msg) + except: + error=sys.exc_info()[0:2] + if RESPONSE is not None: + RESPONSE.write("(ERROR (%s): %s %s) "%(fileName,error[0],error[1])) + errorsTXT+="

ERROR creating index for %s "%fileName+"(ERROR: %s %s)

\n"%error + + # update pageSizeSum for subcollections + if genObj.meta_type=="VLP_subcollection": + if RESPONSE is not None: + RESPONSE.write(" is subcollection") + logging.debug("updateCollection: %s is subcollection"%fileName) + genObj.pageSizeSum=getattr(genObj,fileName).getPageSizeSum() + else: + genObj.pageSizeSum=genObj.getPageSizeSum() + + if RESPONSE is not None: + RESPONSE.write("

\n") + + except: + error=sys.exc_info()[0:2] + logging.error("updateCollection: ERROR in %s (%s %s)"%(fileName,error[0],error[1])) + if RESPONSE is not None: + RESPONSE.write("

(ERROR (%s): %s %s)

\n"%(fileName,error[0],error[1])) + errorsTXT+="

File not created:%s (ERROR: %s %s)

\n"%(fileName,error[0],error[1]) + + # update subcollections + errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE) + errorsTXT+="\n" if RESPONSE is not None: - RESPONSE.redirect('manage_main') + RESPONSE.write(errorsTXT) + RESPONSE.write("") def updateCollectionMD(self,RESPONSE=None): """updateMD""" @@ -493,22 +616,22 @@ class VLP_collection(ECHO_collection): RESPONSE.redirect('manage_main') def copyFullTextsFromDB(self,RESPONSE=None): - """copy fulltext aus DB""" + """copy fulltext aus DB""" - ress=self.ZopeFind(self,obj_metatypes=['VLP_resource']) - ret="" - for res in ress: - tmp=res[1].copyTranscriptionFromDB() - ret+=tmp - - if RESPONSE: - RESPONSE.write(tmp+"\n") - if not RESPONSE: - return ret - else: - RESPONSE.write("END\n") - - + ress=self.ZopeFind(self,obj_metatypes=['VLP_resource']) + ret="" + for res in ress: + tmp=res[1].copyTranscriptionFromDB() + ret+=tmp + + if RESPONSE: + RESPONSE.write(tmp+"\n") + if not RESPONSE: + return ret + else: + RESPONSE.write("END\n") + + def manage_addVLP_collectionForm(self): """Form for adding a ressource""" pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','AddVLP_collectionForm.zpt')).__of__(self) @@ -544,73 +667,73 @@ class VLP_resource(ECHO_resource,Cacheab {'label':'Update Index','action':'createIndexFile'}, {'label':'Reset MetaLink','action':'resetMetaLink'}, {'label':'Generate Title','action':'generate_title'}, - {'label':'Generate Library Template','action':'generateLibraryTemplateHTML'}, + {'label':'Generate Library Template','action':'generateLibraryTemplateHTML'}, ) def getImagePath(self): - """Pfad zu den Images""" - - if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')): - return os.path.join(self.vlp_basis,self.resourceID,'pageimg') - elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')): - return os.path.join(self.vlp_basis,self.resourceID,'pagesHi') - else: - return "no images " + """Pfad zu den Images""" + + if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')): + return os.path.join(self.vlp_basis,self.resourceID,'pageimg') + elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')): + return os.path.join(self.vlp_basis,self.resourceID,'pages') + else: + return "no images " - + def transcription(self): - """show the rendered transcriptiofile""" - - if hasattr(self,'libraryTranscriptionTemplate.html'): - return getattr(self,'libraryTranscriptionTemplate.html')() - - pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_transcriptionTemplate.zpt')).__of__(self) - pt.content_type="text/html" - return pt() + """show the rendered transcriptiofile""" + + if hasattr(self,'libraryTranscriptionTemplate.html'): + return getattr(self,'libraryTranscriptionTemplate.html')() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_transcriptionTemplate.zpt')).__of__(self) + pt.content_type="text/html" + return pt() def copyTranscriptionFromDB(self): - """checks if transcription exits in DB""" - founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id') + """checks if transcription exits in DB""" + founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id') - ret=""" + ret=""" """ - if founds: - - for found in founds: - - text=found.transcript - if not text: text="" - ret+=""+text+"" - - ret+="" - re2=ret[0:] - re3=re2.decode('latin-1').encode('utf-8') - #re3=re2 - ft=self.ZopeFind(self,obj_metatypes=['ECHO_fullText']) - - if ft: - - ft[0][1].pt_edit(re3,'text/xml') - - else: - - self._setObject('fulltext',ECHO_fullText(id,'')) - - try: - getattr(self,'fulltext').pt_edit(re3.encode('utf-8','ignore'),'text/xml') - except: + if founds: + + for found in founds: + + text=found.transcript + if not text: text="" + ret+=""+text+"" + + ret+="" + re2=ret[0:] + re3=re2.decode('latin-1').encode('utf-8') + #re3=re2 + ft=self.ZopeFind(self,obj_metatypes=['ECHO_fullText']) + + if ft: + + ft[0][1].pt_edit(re3,'text/xml') + + else: + + self._setObject('fulltext',ECHO_fullText(id,'')) + + try: + getattr(self,'fulltext').pt_edit(re3.encode('utf-8','ignore'),'text/xml') + except: getattr(self,'fulltext').pt_edit(re3.encode('latin-1').decode('utf-8'),'text/xml') - return "FT: %s"%self.getId() - else: - return "no: %s"%self.getId() - + return "FT: %s"%self.getId() + else: + return "no: %s"%self.getId() + def resetMetaLink(self,all="no",RESPONSE=None): """resets metalink to standard resp. in case of server change it sets to the new server url""" if all=="yes": @@ -628,28 +751,31 @@ class VLP_resource(ECHO_resource,Cacheab if 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))) - + params = "pn=%s"%self.file2page(self.REQUEST.get('p',None)) + mk = self.REQUEST.get('mk',None) + if mk: + params += "&mk=%s"%mk + self.REQUEST.RESPONSE.redirect(self.REQUEST['URL']+'?'+params) - if hasattr(self,'libraryTemplate.html'): - return getattr(self,'libraryTemplate.html')() - + if hasattr(self,'libraryTemplate.html'): + return getattr(self,'libraryTemplate.html')() + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_template.zpt')).__of__(self) pt.content_type="text/html" return pt() def index_html(self): - """index_html""" - #return self.REQUEST - if not self.REQUEST.has_key("ws"): - self.REQUEST.form["ws"]="1.5" + """index_html""" + #return self.REQUEST + if not self.REQUEST.has_key("ws"): + self.REQUEST.form["ws"]="1.5" - return self.show() + return self.show() def generateLibraryTemplateHTML(self,RESPONSE=None): """lege standard index.html an""" - if not hasattr(self,'libraryTemplate.html'): + if not hasattr(self,'libraryTemplate.html'): zt=ZopePageTemplate('libraryTemplate.html') self._setObject('libraryTemplate.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -676,58 +802,58 @@ class VLP_resource(ECHO_resource,Cacheab dom=xml.dom.minidom.parse(ECHO_helpers.urlopen(getattr(self,'index.xml').absolute_url())) for page in dom.getElementsByTagName('page'): - # 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') + # 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 def getPageSizeSum(self): - """generate average page size""" + """generate average page size""" + + #size of hi resolution + files=[] + try: + pathHi=os.path.join(self.vlp_basis,self.resourceID,'pages') + files=os.listdir(pathHi) + hi=0 + for f in files: + hi+=os.stat(os.path.join(pathHi,f))[ST_SIZE] + + except: + hi=0 + + #size of hi resolution + try: + pathHi=os.path.join(self.vlp_basis,self.resourceID,'pagesLo') + files=os.listdir(pathHi) + lo=0 + for f in files: + lo+=os.stat(os.path.join(pathHi,f))[ST_SIZE] - #size of hi resolution - files=[] - try: - pathHi=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') - files=os.listdir(pathHi) - hi=0 - for f in files: - hi+=os.stat(os.path.join(pathHi,f))[ST_SIZE] - - except: - hi=0 - - #size of hi resolution - try: - pathHi=os.path.join(self.vlp_basis,self.resourceID,'pagesLo') - files=os.listdir(pathHi) - lo=0 - for f in files: - lo+=os.stat(os.path.join(pathHi,f))[ST_SIZE] - - except: - lo=0 - - - return (hi,lo,len(files)) - + except: + lo=0 + + + return (hi,lo,len(files)) + def getPageWeights(self): - """average Page sizes in kBytes""" + """average Page sizes in kBytes""" - res=getattr(self,'pageSizeSum',(0,0,1)) - return (res[0]/(1024*res[2]),res[1]/(1024*res[2])) - - - + res=getattr(self,'pageSizeSum',(0,0,1)) + return (res[0]/(1024*res[2]),res[1]/(1024*res[2])) + + + def dir2index(self): """dir to index""" - excludeNames=['Icon'] - - + excludeNames=['Icon'] + + def calculateName(str): - name=os.path.splitext(str[1:])[0] + name=os.path.splitext(str[1:])[0] ret="%s: %s"%(str[0],name) return ret @@ -735,13 +861,12 @@ class VLP_resource(ECHO_resource,Cacheab ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')) self.imagePath='pageimg' except: - ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')) - self.imagePath='pagesHi' + ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pages')) + self.imagePath='pages' temp=[] - ret.sort() + ret.sort() for x in ret: - if (not (x[0]==".")) and (not x[0:4] in excludeNames): - + if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames): temp.append((calculateName(x),os.path.splitext(x)[0])) return temp @@ -749,12 +874,12 @@ class VLP_resource(ECHO_resource,Cacheab def firstPage(self,url=None): """showlink to the first image""" if self.REQUEST.get('pn','1')=="1": #erste seinte dann kein a tag - return """first
first""" + return """first
first""" else: - ws=self.REQUEST.get('ws','1') - return """ - first
first + ws=self.REQUEST.get('ws','1') + return """ + first
first """%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws) @@ -765,12 +890,12 @@ class VLP_resource(ECHO_resource,Cacheab ln=len(pages) if (self.REQUEST.get('pn')==str(ln)) or (ln==1): #letzte seite dann kein a tag oder nur eine Seite - return """last
last""" + return """last
last""" else: - ws=self.REQUEST.get('ws','1') - return """ - last
last + ws=self.REQUEST.get('ws','1') + return """ + last
last """%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws) @@ -780,12 +905,12 @@ class VLP_resource(ECHO_resource,Cacheab nn = int(self.REQUEST.get('pn','1'))-1 if nn < 1: #letzte seite dann kein a tag - return """prev
prev""" + return """prev
prev""" else: - ws=self.REQUEST.get('ws','1') - return """ - prev
prev + ws=self.REQUEST.get('ws','1') + return """ + prev
prev """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws) @@ -797,68 +922,85 @@ class VLP_resource(ECHO_resource,Cacheab nn = int(self.REQUEST.get('pn','1'))+1 if (nn>int(ln)) or (ln==1): #letzte seite dann kein a tag - return """next
next""" + return """next
next""" else: - ws=self.REQUEST.get('ws','1') - return """ - next
next + ws=self.REQUEST.get('ws','1') + return """ + next
next """%(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.""" - if not url: - url=self.absolute_url()+"/index.xml" + if not url: + urlTmp=self.absolute_url()+"/index.xml" - if self.ZCacheable_isCachingEnabled(): - - result = self.ZCacheable_get(view_name=url) + if self.ZCacheable_isCachingEnabled(): + + result = self.ZCacheable_get(view_name=urlTmp) if result is not None: # Got a cached value. return result pagelist=[] - - fh=ECHO_helpers.urlopen(url) - dom=xml.dom.minidom.parse(fh) + + if not url: + + xmlTxt=getattr(self,'index.xml')() + dom=xml.dom.minidom.parseString(xmlTxt) + else: + fh=ECHO_helpers.urlopen(urlTmp) + dom=xml.dom.minidom.parse(fh) for page in dom.getElementsByTagName('page'): text=getText(page.childNodes) pageNum=page.getAttribute('nr') - fileName=page.getAttribute('file') + fileName=page.getAttribute('file') pagelist.append((pageNum,text,fileName)) - self.ZCacheable_set(pagelist,view_name=url) + self.ZCacheable_set(pagelist,view_name=urlTmp) return pagelist def getFileName(self): - """getNameOfCurrentFile""" - try: - pn=int(self.REQUEST.get('pn','1')) - except: - pn=1 - pageinfo=self.readIndexFile()[pn-1] - return pageinfo[2] + """getNameOfCurrentFile""" + try: + pn=int(self.REQUEST.get('pn','1')) + except: + pn=1 + pageinfo=self.readIndexFile()[pn-1] + return pageinfo[2] - def createIndexFile(self,RESPONSE=None): + def createIndexFile(self,forceUpdate=False,RESPONSE=None): """create index file""" + logging.debug("createindexfile of %s"%self.id) - - pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_template.zpt')).__of__(self)() - - - - if not hasattr(self,'index.xml'): + if hasattr(self,'index.xml'): + # index exists + zt=getattr(self,'index.xml') + if not forceUpdate: + # check if directory is newer (self.imagePath sould be set by now) + imgdir = os.path.join(self.vlp_basis, self.resourceID, self.imagePath) + dirtime = os.path.getmtime(imgdir) + zttime = zt.bobobase_modification_time() + logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime)) + if dirtime < zttime: + # nothing to do + logging.debug("createindexfile: dir %s older than index"%(imgdir)) + return "index is up to date" + + else: + # create new index template zt=ZopePageTemplate('index.xml') self._setObject('index.xml',zt) - else: - zt=getattr(self,'index.xml') - - + + # fill index template + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_template.zpt')).__of__(self)() + #logging.debug("createindexfile uses %s"%pt) zt.pt_edit(pt, 'text/xml') + transaction.get().commit() if RESPONSE is not None: RESPONSE.redirect('manage_main')