--- ECHO_content/VLPExtension.py 2007/07/26 08:29:06 1.62 +++ ECHO_content/VLPExtension.py 2008/08/05 16:17:46 1.70 @@ -46,6 +46,21 @@ def makeXML(str): %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): @@ -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""" @@ -225,25 +278,20 @@ class VLP_essay(Folder): pages=[] pagestmp=self.ZopeFind(self,obj_metatypes=['DTML Document','File']) for page in pagestmp: - if not (page[1].getId()[0]=="."): - pages.append(page) + 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 @@ -430,39 +478,56 @@ class VLP_collection(ECHO_collection): - def generateSubCollections(self,errorsTXT=""): - """erzeuge subcollectionen""" - founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')") - + 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: - 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() + 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) - 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 + if RESPONSE is not None: + self.REQUEST.RESPONSE.write("

%s

\n"%litid) - return errorsTXT + 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""" @@ -475,49 +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+="

New Ressources

" + if RESPONSE is not None: + RESPONSE.setHeader('Content-Type','text/html') + RESPONSE.write("") + 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() - + 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] + 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)

"%(fileName,error[0],error[1]) - - errorsTXT+=self.generateSubCollections() + 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" - RESPONSE.write(errorsTXT) if RESPONSE is not None: - RESPONSE.redirect('manage_main') + RESPONSE.write(errorsTXT) + RESPONSE.write("") def updateCollectionMD(self,RESPONSE=None): """updateMD""" @@ -592,8 +676,8 @@ class VLP_resource(ECHO_resource,Cacheab 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') + 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 " @@ -667,8 +751,11 @@ 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')() @@ -727,7 +814,7 @@ class VLP_resource(ECHO_resource,Cacheab #size of hi resolution files=[] try: - pathHi=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') + pathHi=os.path.join(self.vlp_basis,self.resourceID,'pages') files=os.listdir(pathHi) hi=0 for f in files: @@ -774,8 +861,8 @@ 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() for x in ret: @@ -787,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 + first
first """%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws) @@ -803,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 + last
last """%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws) @@ -818,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 + prev
prev """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws) @@ -835,12 +922,12 @@ 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 + next
next """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws) @@ -886,18 +973,31 @@ class VLP_resource(ECHO_resource,Cacheab 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()