--- ECHO_content/VLPExtension.py 2008/12/17 12:02:53 1.86 +++ ECHO_content/VLPExtension.py 2010/10/11 13:15:00 1.94 @@ -17,6 +17,8 @@ from types import * from Globals import package_home import transaction import Acquisition +import re +import logging from Products.ECHO_content.ECHO_collection import * from vlp_xmlhelpers import * @@ -163,7 +165,7 @@ def manage_addSendMailForm(self, id, toA class VLP_collectionFolder(Folder): - """klasse fŸr folder innheralb der collection""" + """klasse fuer folder innerhalb der collection""" meta_type="VLP_collectionFolder" class VLP_essay(Folder): @@ -308,7 +310,9 @@ class VLP_essay(Folder): #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") + tmp =makeXML(txt) + logging.debug(txt) + return self.xml2html(tmp,quote="no") else: return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no") @@ -486,7 +490,7 @@ def manage_addVLP_subCollection(self,id, from zope.publisher.interfaces import IPublishTraverse from zope.interface import implements from zope.publisher.interfaces import NotFound -from zope.app import zapi +#from zope.app import zapi from zope.component import queryMultiAdapter try: from ZPublisher.BaseRequest import DefaultPublishTraverse @@ -499,6 +503,23 @@ class VLP_collection(ECHO_collection,Acq implements(IPublishTraverse) + + + def foxridgePath2vlp(self,url,mk,RESPONSE=None): + """convertiert einen pfad zu einer url in vlp""" + litRe = re.match(r".*lit([0-9]*)",url) + logging.debug("foxridgePath2vlp URL:"+repr(url)) + lit = "lit"+litRe.group(1) + splitted=url.split("/") + path=splitted[-1].split(".")[0] + newUrl=lit+"?p=%s&mk=%s"%(path,mk) + + if RESPONSE: + RESPONSE.redirect(newUrl) + return + + return newUrl + def findObjFromLitName(self,fileName): if not fileName[0:3]=="lit": logging.error("getOrCreateFolder wrong filename: %s"%fileName) @@ -527,7 +548,7 @@ class VLP_collection(ECHO_collection,Acq if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk # umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird - if lastActual.startswith("lit") or (lastActual=="index_html") or (lastActual=="index_meta") or (lastActual=="getTitle") or (lastActual=="getMetaDataLink"): + if lastActual.startswith("lit") or (lastActual=="index_html") or (lastActual=="index_meta") or (lastActual=="getTitle") or (lastActual=="getMetaDataLink") or (lastActual=="hasTranscription") or (lastActual=="transcription"): #obj=self. ZopeFind(self,obj_ids=[name],search_sub=1) ob=self.findObjFromLitName(name) if not ob: @@ -586,7 +607,7 @@ class VLP_collection(ECHO_collection,Acq col = foundCol logging.debug("generateSubCollections: subcollection %s exists (%s)"%(repr(col),found.reference)) logging.debug(repr([col.title,found.titlerefdisplay,col.label,found.titlerefdisplay])) - if (unicodify(col.title) != found.titlerefdisplay) or (unicodify(col.label) != found.titlerefdisplay): + if (unicodify(col.title) != unicodify(found.titlerefdisplay)) or (unicodify(col.label) != unicodify(found.titlerefdisplay)): # subcollection seems to have changed logging.debug("generateSubCollections: subcollection has changed, recreating!") col.aq_parent.manage_delObjects([col.getId()]) @@ -642,8 +663,11 @@ class VLP_collection(ECHO_collection,Acq logging.error("getOrCreateFolder wrong filename: %s"%fileName) return None - - restName="%08d"%int(fileName[3:]) + try: + restName="%08d"%int(fileName[3:]) + except: + logging.error("getOrCreateFolder wrong filename: %s"%fileName) + return None fs=(restName[0:2],restName[0:4],restName[0:6]) @@ -740,7 +764,7 @@ class VLP_collection(ECHO_collection,Acq errorsTXT+="

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

\n"%(fileName,error[0],error[1]) return errorsTXT - def updateCollection(self,forceUpdate=False,RESPONSE=None): + def updateCollection(self,forceUpdate=True,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" # update subcollections @@ -807,6 +831,10 @@ class VLP_resource(ECHO_resource,Cacheab meta_type="VLP_resource" + def _p_resolveConflict(self,oldstate,savedstate,newstate): + logging.debug("updateCollection: Have to resolve conflict!") + return newstate + #vlp_basis="/mpiwg/online/permanent/vlp" @@ -831,6 +859,8 @@ class VLP_resource(ECHO_resource,Cacheab logging.debug(title) return title + + def getImagePath(self): """Pfad zu den Images""" path=None @@ -842,12 +872,46 @@ class VLP_resource(ECHO_resource,Cacheab # workaround in some cases there seem to be no pictures in pages if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')): - if len (os.listdir(self.vlp_basis,self.resourceID,'pagesHi')) > len(os.listdir(path)): + + + pagesHi = os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')) + if path is None: + return os.path.join(self.vlp_basis,self.resourceID,'pagesHi') + + pages = os.listdir(path) + + if len (pagesHi) > len(pages): + + countHi=0 + for p in pagesHi: + dat,ext = os.path.splitext(p) + if ext.lower() in [".tiff",".tif",".jpg"]: + countHi+=1 + count=0 + for p in pages: + dat,ext = os.path.splitext(p) + if ext.lower() in [".tiff",".tif",".jpg"]: + count+=1 + + if countHi > count: + path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') + + logging.error("pages < pagesHi: %s"%self.resourceID) + if path is None: + + + if len (os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi'))) > len(os.listdir(path)): + + + path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') logging.error("pages < pagesHi: %s"%self.resourceID) - else: + else: + logging.error("no images: %s"%self.resourceID) - return None + return None + + return path def transcription(self): @@ -908,7 +972,7 @@ class VLP_resource(ECHO_resource,Cacheab ret+="" re2=ret[0:] - re3=re2.decode('latin-1').encode('utf-8') + re3=self.unicodify(re2) #re3=re2 ft=self.ZopeFind(self,obj_metatypes=['ECHO_fullText']) @@ -929,6 +993,16 @@ class VLP_resource(ECHO_resource,Cacheab else: return "no: %s"%self.getId() + def hasTranscription(self): + """transcription""" + + if not hasattr(self,'fulltext'): + self.copyTranscriptionFromDB() + if not hasattr(self,'fulltext'): #still not + return False + + return True + 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": @@ -1074,12 +1148,13 @@ class VLP_resource(ECHO_resource,Cacheab ret="%s: %s"%(str[0],name) return ret - self.imagePath=self.getImagePath(); - if (selfImagePath is None): + self.imagePathFull=self.getImagePath(); + self.imagePath=self.imagePathFull.split("/")[-1] + if (self.imagePath is None): return None temp=[] - ret = os.listdir(self.imagePathj); + ret = os.listdir(self.imagePathFull) ret.sort() for x in ret: