version 1.78, 2008/10/08 08:35:20
|
version 1.85, 2008/12/10 13:37:03
|
Line 520 class VLP_collection(ECHO_collection,Acq
|
Line 520 class VLP_collection(ECHO_collection,Acq
|
|
|
actual_url=request['ACTUAL_URL'] |
actual_url=request['ACTUAL_URL'] |
lastActual=actual_url.split("/")[-1] |
lastActual=actual_url.split("/")[-1] |
|
logging.debug("pub_trav:"+actual_url) |
|
|
if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk |
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 |
# 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"): |
if lastActual.startswith("lit") or (lastActual=="index_html") or (lastActual=="index_meta") or (lastActual=="getTitle") or (lastActual=="getMetaDataLink"): |
#obj=self. ZopeFind(self,obj_ids=[name],search_sub=1) |
#obj=self. ZopeFind(self,obj_ids=[name],search_sub=1) |
ob=self.findObjFromLitName(name) |
ob=self.findObjFromLitName(name) |
if not ob: |
if not ob: |
return "LIt not found" |
return "LIt not found" |
else: |
else: |
|
|
logging.error("request:"+repr(ob)) |
logging.debug("request:"+repr(ob)) |
request.response.setStatus(200) |
request.response.setStatus(200) |
|
#if (lastActual=="index_meta"): |
|
# logging.debug("index_meta requested") |
|
# return ob.index_meta |
return ob |
return ob |
|
|
else: ## andern falls transversiere zum parent. |
else: ## andern falls transversiere zum parent. |
obj = self.aq_parent |
obj = self.aq_parent |
return obj |
return obj |
Line 553 class VLP_collection(ECHO_collection,Acq
|
Line 557 class VLP_collection(ECHO_collection,Acq
|
{'label':'Update Library','action':'updateCollection'}, |
{'label':'Update Library','action':'updateCollection'}, |
{'label':'Update Metadata','action':'updateCollectionMD'}, |
{'label':'Update Metadata','action':'updateCollectionMD'}, |
) |
) |
|
def getAllRessources(self): |
|
"""getallressources""" |
|
res=self.ZopeFind(self,obj_metatypes=['VLP_resource'],search_sub=1) |
|
ret=[] |
|
for r in res: |
|
ret.append([r[0],r[1].absolute_url()]) |
|
|
|
return ret |
|
|
def generateSubCollections(self,errorsTXT="",forceUpdate=False,RESPONSE=None): |
def generateSubCollections(self,errorsTXT="",forceUpdate=False,RESPONSE=None): |
"""erzeuge subcollectionen""" |
"""erzeuge subcollectionen""" |
Line 565 class VLP_collection(ECHO_collection,Acq
|
Line 577 class VLP_collection(ECHO_collection,Acq
|
for found in founds: |
for found in founds: |
try: |
try: |
litid = str(found.reference) |
litid = str(found.reference) |
foundCol=self.ZopeFind(self,obj_ids=[litid]) |
foundCol=self.findObjFromLitName(litid) |
|
#foundCol=self.ZopeFind(self,obj_ids=[litid]) |
if foundCol: |
if foundCol: |
col = foundCol[0][1] |
col = foundCol |
logging.debug("generateSubCollections: subcollection %s exists (%s)"%(col.getId(),found.reference)) |
logging.debug("generateSubCollections: subcollection %s exists (%s)"%(repr(col),found.reference)) |
if (col.title != found.titlerefdisplay) or (col.label != found.titlerefdisplay): |
logging.debug(repr([col.title,found.titlerefdisplay,col.label,found.titlerefdisplay])) |
|
if (unicodify(col.title) != found.titlerefdisplay) or (unicodify(col.label) != found.titlerefdisplay): |
# subcollection seems to have changed |
# subcollection seems to have changed |
logging.debug("generateSubCollections: subcollection has changed, recreating!") |
logging.debug("generateSubCollections: subcollection has changed, recreating!") |
self.manage_delObjects([foundCol[0][0]]) |
col.aq_parent.manage_delObjects([col.getId()]) |
manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay) |
manage_addVLP_subCollection(self.getOrCreateFolderForFile(litid),litid,found.titlerefdisplay,found.titlerefdisplay) |
else: |
else: |
logging.debug("generateSubCollections: creating new subcollection %s"%found.reference) |
logging.debug("generateSubCollections: creating new subcollection %s"%found.reference) |
manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay) |
manage_addVLP_subCollection(self.getOrCreateFolderForFile(litid),litid,found.titlerefdisplay,found.titlerefdisplay) |
|
|
#teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter) |
#teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter) |
if os.path.exists(os.path.join(self.vlp_basis,litid)): |
if os.path.exists(os.path.join(self.vlp_basis,litid)): |
logging.debug("generateSubCollections: found frontmatter in %s"%litid) |
logging.debug("generateSubCollections: found frontmatter in %s"%litid) |
obj=getattr(self,litid) |
obj=self.findObjFromLitName(litid) |
if not self.ZopeFind(obj,obj_ids=[litid]): |
if not self.ZopeFind(obj,obj_ids=[litid]): |
metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta" |
metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta" |
newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','') |
newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','') |
Line 598 class VLP_collection(ECHO_collection,Acq
|
Line 612 class VLP_collection(ECHO_collection,Acq
|
error=sys.exc_info()[0:2] |
error=sys.exc_info()[0:2] |
logging.error("generateSubCollections: ERROR in %s"%litid) |
logging.error("generateSubCollections: ERROR in %s"%litid) |
if RESPONSE is not None: |
if RESPONSE is not None: |
|
RESPONSE.write("<p>(ERROR updateII(%s): %s %s TXT: %s)\n</p>"%(litid,error[0],error[1],sys.exc_info()[2])) |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(litid,error[0],error[1])) |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(litid,error[0],error[1])) |
#logging.error("generateSubCollections: %s %s"%error) |
logging.error("generateSubCollections: %s %s"%error) |
#self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1]))) |
self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1]))) |
errorsTXT+="<p>ERROR: No subcollection of %s (ERROR: %s %s)</p>\n"%(litid,error[0],error[1]) |
errorsTXT+="<p>ERROR: No subcollection of %s (ERROR: %s %s)</p>\n"%(litid,error[0],error[1]) |
#errorsTXT+="<p>No subcollection of %s "%litid+"(ERROR: %s %s)</p>"%error |
errorsTXT+="<p>No subcollection of %s "%litid+"(ERROR: %s %s)</p>"%error |
|
|
return errorsTXT |
return errorsTXT |
|
|
Line 640 class VLP_collection(ECHO_collection,Acq
|
Line 655 class VLP_collection(ECHO_collection,Acq
|
|
|
return current |
return current |
|
|
def updateCollection(self,forceUpdate=False,RESPONSE=None): |
def changeOrAddResources(self,forceUpdate=False,RESPONSE=None): |
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
"""changes ord updates all resources found in the file system""" |
|
|
errorsTXT="<h2>Errors</h2>" |
errorsTXT="<h2>Errors</h2>" |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.setHeader('Content-Type','text/html') |
RESPONSE.setHeader('Content-Type','text/html') |
Line 698 class VLP_collection(ECHO_collection,Acq
|
Line 714 class VLP_collection(ECHO_collection,Acq
|
except: |
except: |
error=sys.exc_info()[0:2] |
error=sys.exc_info()[0:2] |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.write("(ERROR (%s): %s %s) "%(fileName,error[0],error[1])) |
RESPONSE.write("(ERROR Update(%s): %s %s %s) "%(fileName,error[0],error[1],sys.exc_info()[2])) |
errorsTXT+="<p>ERROR creating index for %s "%fileName+"(ERROR: %s %s)</p>\n"%error |
errorsTXT+="<p>ERROR creating index for %s "%fileName+"(ERROR: %s %s)</p>\n"%error |
|
|
# update pageSizeSum for subcollections |
# update pageSizeSum for subcollections |
Line 717 class VLP_collection(ECHO_collection,Acq
|
Line 733 class VLP_collection(ECHO_collection,Acq
|
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])) |
logging.error("updateCollection: ERROR in %s (%s %s)"%(fileName,error[0],error[1])) |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1])) |
RESPONSE.write("(ERROR updateII(%s): %s %s %s) "%(fileName,error[0],error[1],sys.exc_info()[2])) |
errorsTXT+="<p>File not created:%s (ERROR: %s %s)</p>\n"%(fileName,error[0],error[1]) |
errorsTXT+="<p>File not created:%s (ERROR: %s %s)</p>\n"%(fileName,error[0],error[1]) |
|
return errorsTXT |
|
|
|
def updateCollection(self,forceUpdate=False,RESPONSE=None): |
|
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" |
|
|
# update subcollections |
# update subcollections |
|
errorsTXT="" |
|
errorsTXT+=self.changeOrAddResources(forceUpdate, RESPONSE); |
errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE) |
errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE) |
errorsTXT+="\n" |
errorsTXT+="\n" |
if RESPONSE is not None: |
if RESPONSE is not None: |
Line 785 class VLP_resource(ECHO_resource,Cacheab
|
Line 807 class VLP_resource(ECHO_resource,Cacheab
|
#vlp_basis="/mpiwg/online/permanent/vlp" |
#vlp_basis="/mpiwg/online/permanent/vlp" |
|
|
|
|
|
|
referencetypes=[] |
referencetypes=[] |
|
|
manage_options=ECHO_resource.manage_options+Cacheable.manage_options+( |
manage_options=ECHO_resource.manage_options+Cacheable.manage_options+( |
Line 794 class VLP_resource(ECHO_resource,Cacheab
|
Line 817 class VLP_resource(ECHO_resource,Cacheab
|
{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'}, |
{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'}, |
) |
) |
|
|
|
def getMetaDataLink(self): |
|
"""link auf die metatdaten""" |
|
return self.absolute_url()+"/index_meta" |
|
|
|
|
|
def getTitle(self): |
|
"""Title der Ressource""" |
|
title= self.ZSQLSimpleSearch("""select title from vl_literature where reference= \'%s\' """ %self.getId())[0].title |
|
logging.debug(title) |
|
return title |
|
|
def getImagePath(self): |
def getImagePath(self): |
"""Pfad zu den Images""" |
"""Pfad zu den Images""" |
|
path=None |
|
|
if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')): |
if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')): |
return os.path.join(self.vlp_basis,self.resourceID,'pageimg') |
path= os.path.join(self.vlp_basis,self.resourceID,'pageimg') |
elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')): |
elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')): |
return os.path.join(self.vlp_basis,self.resourceID,'pages') |
path = os.path.join(self.vlp_basis,self.resourceID,'pages') |
else: |
# workaround in some cases there seem to be no pictures in pages |
return "<error>no images </error>" |
|
|
|
|
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)): |
|
path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi') |
|
logging.error("pages < pagesHi: %s"%self.resourceID) |
|
else: |
|
logging.error("no images: %s"%self.resourceID) |
|
return None |
|
|
|
|
def transcription(self): |
def transcription(self): |
Line 954 class VLP_resource(ECHO_resource,Cacheab
|
Line 994 class VLP_resource(ECHO_resource,Cacheab
|
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
|
|
def index_meta(self): |
def index_meta(self,RESPONSE=None): |
"""index_meta""" |
"""index_meta""" |
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'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" |
pt.content_type="text/xml" |
return pt() |
x= pt.pt_render() |
|
#logging.debug("index_meta 4:"+x) |
|
if RESPONSE: |
|
RESPONSE.setHeader("Content-Type","text/xml") |
|
return x |
def file2page(self,p): |
def file2page(self,p): |
"""converts filename to pagenumber""" |
"""converts filename to pagenumber""" |
dom=xml.dom.minidom.parse(ECHO_helpers.urlopen(getattr(self,'index.xml').absolute_url())) |
|
|
#dom=xml.dom.minidom.parse(ECHO_helpers.urlopen(getattr(self,'index.xml').absolute_url())) |
|
index=getattr(self,'index.xml') |
|
|
|
txt=index.pt_render() |
|
dom=xml.dom.minidom.parseString(txt) |
|
|
for page in dom.getElementsByTagName('page'): |
for page in dom.getElementsByTagName('page'): |
# pageummer mit lo oder hi sind aequivalent |
# pageummer mit lo oder hi sind aequivalent |
if (page.getAttribute('file')==p) or ("%slo"%page.getAttribute('file')==p) or ("%shi"%page.getAttribute('file')==p): |
if (page.getAttribute('file')==p) or ("%slo"%page.getAttribute('file')==p) or ("%shi"%page.getAttribute('file')==p): |
return page.getAttribute('nr') |
nr=page.getAttribute('nr') |
|
|
|
return nr |
|
|
return 0 |
return 0 |
|
|
Line 1021 class VLP_resource(ECHO_resource,Cacheab
|
Line 1071 class VLP_resource(ECHO_resource,Cacheab
|
ret="%s: %s"%(str[0],name) |
ret="%s: %s"%(str[0],name) |
return ret |
return ret |
|
|
try: |
self.imagePath=self.getImagePath(); |
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')) |
if (selfImagePath is None): |
self.imagePath='pageimg' |
return None |
except: |
|
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pages')) |
|
self.imagePath='pages' |
|
temp=[] |
temp=[] |
|
ret = os.listdir(self.imagePathj); |
|
|
ret.sort() |
ret.sort() |
for x in ret: |
for x in ret: |
if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames): |
if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames): |
Line 1146 class VLP_resource(ECHO_resource,Cacheab
|
Line 1196 class VLP_resource(ECHO_resource,Cacheab
|
zt=getattr(self,'index.xml') |
zt=getattr(self,'index.xml') |
if not forceUpdate: |
if not forceUpdate: |
# check if directory is newer (self.imagePath sould be set by now) |
# check if directory is newer (self.imagePath sould be set by now) |
imgdir = os.path.join(self.vlp_basis, self.resourceID, self.imagePath) |
path = self.getImagePath() |
|
if (path is None): |
|
return "CREATE INDEX FILE NOT POSSIBLE" |
|
imgdir = os.path.join(path) |
dirtime = os.path.getmtime(imgdir) |
dirtime = os.path.getmtime(imgdir) |
zttime = zt.bobobase_modification_time() |
zttime = zt.bobobase_modification_time() |
logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime)) |
logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime)) |