--- ECHO_content/VLPExtension.py 2004/10/13 14:55:15 1.29 +++ ECHO_content/VLPExtension.py 2005/03/15 13:38:02 1.45 @@ -1,3 +1,7 @@ +""" +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 @@ -13,6 +17,7 @@ import urllib import xmlrpclib import vlp_xmlhelpers from types import * +from Globals import package_home @@ -52,7 +57,7 @@ class sendMailForm(ZopePageTemplate): """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+( {'label':'Main Config','action':'main_configForm'}, @@ -157,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): @@ -188,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() @@ -263,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): @@ -288,7 +293,7 @@ class VLP_encyclopaedia(VLP_essay): def loadNewFileForm(self): """Neues XML-File einlesen""" - pt=PageTemplateFile('Products/ECHO_content/vlp/VLP_newfile.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','VLP_newfile.zpt')).__of__(self) return pt() def loadNewFile(self,RESPONSE=None): @@ -321,7 +326,7 @@ class VLP_encyclopaedia(VLP_essay): def manage_addVLP_encycForm(self): """Form for adding""" - pt=PageTemplateFile('Products/ECHO_content/vlp/AddVLP_encyc.zpt').__of__(self) + 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): @@ -333,10 +338,49 @@ def manage_addVLP_encyc(self, id,title,l if RESPONSE is not None: RESPONSE.redirect('manage_main') +class VLP_subcollection(ECHO_collection): + """ subcollection of elements""" + + 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 manage_addVLP_subCollection(self,id,title,label,RESPONSE=None): + + self._setObject(id,VLP_subcollection(id,title,label)) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + class VLP_collection(ECHO_collection): """VLP spezifische Erweiterung der Collection""" + meta_type="VLP_collection" manage_options=ECHO_collection.manage_options+( {'label':'Change Path','action':'VLP_path_configForm'}, @@ -344,38 +388,72 @@ class VLP_collection(ECHO_collection): {'label':'Update Metadata','action':'updateCollectionMD'}, ) + + + def generateSubCollections(self): + """erzeuge subcollectionen""" + founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Book)','(Collection)','(Journal)')") + + self.REQUEST.RESPONSE.write("\n") + for found in founds: + + 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) + + def VLP_path_configForm(self): """change pt""" - path=PageTemplateFile('Products/ECHO_content/vlp/ChangeVLPPath.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','ChangeVLPPath.zpt')).__of__(self) return pt() def VLP_path_config(self,path,RESPONSE=None): """config""" - self.path=path + self.vlp_basis=path if RESPONSE is not None: RESPONSE.redirect('manage_main') def updateCollection(self,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" - files=os.listdir(self.path) + files=os.listdir(self.vlp_basis) for fileName in files: 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) + + RESPONSE.write("got: %s\n"%fileName) genObj=getattr(self,fileName) - genObj.createIndexFile() - - + if hasattr(genObj,'createIndexFile'): + genObj.createIndexFile() + + self.generateSubCollections() + if RESPONSE is not None: RESPONSE.redirect('manage_main') def updateCollectionMD(self,RESPONSE=None): """updateMD""" - files=os.listdir(self.path) + files=os.listdir(self.vlp_basis) for fileName in files: if fileName[0:3]=="lit": genObj=getattr(self,fileName) @@ -404,7 +482,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() @@ -423,31 +501,43 @@ 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" - vlp_basis="/mpiwg/online/permanent/vlp" + #vlp_basis="/mpiwg/online/permanent/vlp" referencetypes=[] - manage_options=ECHO_resource.manage_options+( + manage_options=ECHO_resource.manage_options+Cacheable.manage_options+( {'label':'Update Index','action':'createIndexFile'}, {'label':'Reset MetaLink','action':'resetMetaLink'}, {'label':'Generate Title','action':'generate_title'}, {'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 " + + def transcription(self): """show the rendered transcriptiofile""" 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() @@ -455,32 +545,39 @@ class VLP_resource(ECHO_resource): def copyTranscriptionFromDB(self): """checks if transcription exits in DB""" - founds=self.search(var='select * from vl_transcript where source=\''+self.resourceID+'\' order by id') + founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id') + - 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') - + 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.encode('utf-8','ignore'),'text/xml') + ft[0][1].pt_edit(re3,'text/xml') else: - self._setObject('fulltext',ECHO_fullText(id,re3)) - + + 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() @@ -508,11 +605,17 @@ class VLP_resource(ECHO_resource): 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() - - index_html=show + + def index_html(self): + """index_html""" + #return self.REQUEST + if not self.REQUEST.has_key("ws"): + self.REQUEST.form["ws"]="1.5" + + return self.show() def generateLibraryTemplateHTML(self,RESPONSE=None): """lege standard index.html an""" @@ -535,7 +638,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() @@ -553,8 +656,11 @@ class VLP_resource(ECHO_resource): def dir2index(self): """dir to index""" + excludeNames=['Icon'] + 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: @@ -564,8 +670,9 @@ 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]=="."): + if (not (x[0]==".")) and (not x[0:4] in excludeNames): temp.append((calculateName(x),os.path.splitext(x)[0])) return temp @@ -577,10 +684,11 @@ class VLP_resource(ECHO_resource): 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""" @@ -592,10 +700,11 @@ class VLP_resource(ECHO_resource): 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""" @@ -606,10 +715,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""" @@ -622,18 +732,27 @@ class VLP_resource(ECHO_resource): 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. + return result + + pagelist=[] + fh=ECHO_helpers.urlopen(url) dom=xml.dom.minidom.parse(fh) @@ -644,7 +763,8 @@ 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""" @@ -659,7 +779,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)() @@ -678,7 +798,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()