--- ECHO_content/VLPExtension.py 2007/06/29 08:21:16 1.60 +++ ECHO_content/VLPExtension.py 2007/10/04 14:15:33 1.64 @@ -21,7 +21,7 @@ import os from stat import * from types import * from Globals import package_home - +import transaction def lemmatize(str): @@ -145,7 +145,7 @@ def manage_addSendMailForm(self, id, toA class VLP_essay(Folder): - """classe für VLP essays""" + """classe fr VLP essays""" meta_type="VLP_essay" @@ -263,6 +263,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: @@ -425,38 +431,47 @@ 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)')") - - 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() + """erzeuge subcollectionen""" + logging.debug("generateSubCollections") + founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')") + + self.REQUEST.RESPONSE.write("

Create Subcollections

\n") + for found in founds: - 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 + try: + litid = str(found.reference) + foundCol=self.ZopeFind(self,obj_ids=[litid]) + if foundCol: + logging.debug("generateSubCollections: deleting collection %s"%found.reference) + self.manage_delObjects([foundCol[0][0]]) + + logging.debug("generateSubCollections: creating collection %s"%found.reference) + manage_addVLP_subCollection(self,litid,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,litid)): + logging.debug("generateSubCollections: found collection dir %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() - return errorsTXT + self.REQUEST.RESPONSE.write("

%s

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

No subcollection of %s "%litid + #errorsTXT+="

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

"%error + + return errorsTXT def VLP_path_configForm(self): """change pt""" @@ -483,35 +498,39 @@ class VLP_collection(ECHO_collection): 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): + logging.debug("updateCollection: new %s"%fileName) + RESPONSE.write("

new: %s\n

"%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) + logging.debug("updateCollection: inspecting %s"%fileName) + if hasattr(genObj,'createIndexFile'): + try: + logging.debug("updateCollection: creating index for %s"%fileName) + 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": + logging.debug("updateCollection: %s is subcollection"%fileName) + 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)

"%(fileName,error[0],error[1]) + 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)

"%(fileName,error[0],error[1]) errorsTXT+=self.generateSubCollections() errorsTXT+="\n" RESPONSE.write(errorsTXT) - if RESPONSE is not None: - RESPONSE.redirect('manage_main') + def updateCollectionMD(self,RESPONSE=None): """updateMD""" @@ -756,7 +775,7 @@ class VLP_resource(ECHO_resource,Cacheab def dir2index(self): """dir to index""" - excludeNames=['Icon',':2eD'] + excludeNames=['Icon'] def calculateName(str): @@ -773,8 +792,7 @@ class VLP_resource(ECHO_resource,Cacheab temp=[] 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 @@ -884,19 +902,18 @@ class VLP_resource(ECHO_resource,Cacheab def createIndexFile(self,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'): zt=ZopePageTemplate('index.xml') self._setObject('index.xml',zt) else: zt=getattr(self,'index.xml') - + #logging.debug("createindexfile uses %s"%pt) zt.pt_edit(pt, 'text/xml') + transaction.get().commit() if RESPONSE is not None: RESPONSE.redirect('manage_main')