version 1.175.2.6, 2011/07/20 08:22:36
|
version 1.175.2.10, 2011/07/28 13:00:07
|
Line 102 def getParentDir(path):
|
Line 102 def getParentDir(path):
|
"""returns pathname shortened by one""" |
"""returns pathname shortened by one""" |
return '/'.join(path.split('/')[0:-1]) |
return '/'.join(path.split('/')[0:-1]) |
|
|
def getBibdataFromDom(dom): |
|
"""returns dict with all elements from bib-tag""" |
|
bibinfo = {} |
|
bib = dom.find(".//meta/bib") |
|
if bib is not None: |
|
# put type in @type |
|
type = bib.get('type') |
|
bibinfo['@type'] = type |
|
# put all subelements in dict |
|
for e in bib: |
|
bibinfo[e.tag] = getText(e) |
|
|
|
return bibinfo |
|
|
|
## |
## |
## documentViewer class |
## documentViewer class |
Line 128 class documentViewer(Folder):
|
Line 115 class documentViewer(Folder):
|
{'label':'main config','action':'changeDocumentViewerForm'}, |
{'label':'main config','action':'changeDocumentViewerForm'}, |
) |
) |
|
|
|
metadataService = None |
|
"""MetaDataFolder instance""" |
|
|
# templates and forms |
# templates and forms |
viewer_main = PageTemplateFile('zpt/viewer_main', globals()) |
viewer_main = PageTemplateFile('zpt/viewer_main', globals()) |
toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals()) |
toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals()) |
Line 146 class documentViewer(Folder):
|
Line 136 class documentViewer(Folder):
|
|
|
|
|
thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals()) |
thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals()) |
security.declareProtected('View management screens','changeDocumentViewerForm') |
|
changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals()) |
|
|
|
|
|
def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"): |
def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"): |
Line 170 class documentViewer(Folder):
|
Line 158 class documentViewer(Folder):
|
templateFolder._setObject('fulltextclient',textServer) |
templateFolder._setObject('fulltextclient',textServer) |
except Exception, e: |
except Exception, e: |
logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e)) |
logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e)) |
|
|
try: |
try: |
from Products.zogiLib.zogiLib import zogiLib |
from Products.zogiLib.zogiLib import zogiLib |
zogilib = zogiLib(id="zogilib", title="zogilib for docuviewer", dlServerURL=imageScalerUrl, layout="book") |
zogilib = zogiLib(id="zogilib", title="zogilib for docuviewer", dlServerURL=imageScalerUrl, layout="book") |
Line 178 class documentViewer(Folder):
|
Line 167 class documentViewer(Folder):
|
except Exception, e: |
except Exception, e: |
logging.error("Unable to create zogiLib for zogilib: "+str(e)) |
logging.error("Unable to create zogiLib for zogilib: "+str(e)) |
|
|
|
try: |
|
# assume MetaDataFolder instance is called metadata |
|
self.metadataService = getattr(self, 'metadata') |
|
except Exception, e: |
|
logging.error("Unable to find MetaDataFolder 'metadata': "+str(e)) |
|
|
|
|
# proxy text server methods to fulltextclient |
# proxy text server methods to fulltextclient |
def getTextPage(self, **args): |
def getTextPage(self, **args): |
Line 572 class documentViewer(Folder):
|
Line 567 class documentViewer(Folder):
|
docinfo['indexMetaPath']=self.getIndexMetaPath(path); |
docinfo['indexMetaPath']=self.getIndexMetaPath(path); |
|
|
logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) |
logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) |
|
if self.metadataService is not None: |
# put all raw bib fields in dict "bib" |
# put all raw bib fields in dict "bib" |
bib = getBibdataFromDom(dom) |
bib = self.metadataService.getBibData(dom=dom) |
docinfo['bib'] = bib |
docinfo['bib'] = bib |
|
bibtype = bib.get('@type', None) |
# extract some fields (author, title, year) according to their mapping |
|
metaData=self.metadata.main.meta.bib |
|
bibtype=bib.get("@type") |
|
#bibtype=dom.xpath("//bib/@type") |
|
if not bibtype: |
|
bibtype="generic" |
|
|
|
bibtype=bibtype.replace("-"," ") # wrong types in index meta "-" instead of " " (not wrong! ROC) |
|
docinfo['bib_type'] = bibtype |
docinfo['bib_type'] = bibtype |
bibmap=metaData.generateMappingForType(bibtype) |
# also store DC metadata for convenience |
logging.debug("documentViewer (getbibinfofromindexmeta) bibmap:"+repr(bibmap)) |
dc = self.metadataService.getDCMappedData(bib) |
logging.debug("documentViewer (getbibinfofromindexmeta) bibtype:"+repr(bibtype)) |
docinfo['creator'] = dc.get('creator',None) |
# if there is no mapping bibmap is empty (mapping sometimes has empty fields) |
docinfo['title'] = dc.get('title',None) |
if len(bibmap) > 0 and bibmap.get('author',None) or bibmap.get('title',None): |
docinfo['date'] = dc.get('date',None) |
try: |
else: |
docinfo['author']=bib.get(bibmap['author'][0]) |
logging.error("MetadataService not found!") |
except: pass |
|
try: |
|
docinfo['title']=bib.get(bibmap['title'][0]) |
|
except: pass |
|
try: |
|
docinfo['year']=bib.get(bibmap['year'][0]) |
|
except: pass |
|
|
|
# ROC: why is this here? |
|
# logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) |
|
# try: |
|
# docinfo['lang']=getTextFromNode(dom.find(".//bib/lang")[0]) |
|
# except: |
|
# docinfo['lang']='' |
|
# try: |
|
# docinfo['city']=getTextFromNode(dom.find(".//bib/city")[0]) |
|
# except: |
|
# docinfo['city']='' |
|
# try: |
|
# docinfo['number_of_pages']=getTextFromNode(dom.find(".//bib/number_of_pages")[0]) |
|
# except: |
|
# docinfo['number_of_pages']='' |
|
# try: |
|
# docinfo['series_volume']=getTextFromNode(dom.find(".//bib/series_volume")[0]) |
|
# except: |
|
# docinfo['series_volume']='' |
|
# try: |
|
# docinfo['number_of_volumes']=getTextFromNode(dom.find(".//bib/number_of_volumes")[0]) |
|
# except: |
|
# docinfo['number_of_volumes']='' |
|
# try: |
|
# docinfo['translator']=getTextFromNode(dom.find(".//bib/translator")[0]) |
|
# except: |
|
# docinfo['translator']='' |
|
# try: |
|
# docinfo['edition']=getTextFromNode(dom.find(".//bib/edition")[0]) |
|
# except: |
|
# docinfo['edition']='' |
|
# try: |
|
# docinfo['series_author']=getTextFromNode(dom.find(".//bib/series_author")[0]) |
|
# except: |
|
# docinfo['series_author']='' |
|
# try: |
|
# docinfo['publisher']=getTextFromNode(dom.find(".//bib/publisher")[0]) |
|
# except: |
|
# docinfo['publisher']='' |
|
# try: |
|
# docinfo['series_title']=getTextFromNode(dom.find(".//bib/series_title")[0]) |
|
# except: |
|
# docinfo['series_title']='' |
|
# try: |
|
# docinfo['isbn_issn']=getTextFromNode(dom.find(".//bib/isbn_issn")[0]) |
|
# except: |
|
# docinfo['isbn_issn']='' |
|
return docinfo |
return docinfo |
|
|
|
|
Line 664 class documentViewer(Folder):
|
Line 598 class documentViewer(Folder):
|
logging.debug("documentViewer docinfo[name] %s"%docinfo['name']) |
logging.debug("documentViewer docinfo[name] %s"%docinfo['name']) |
return docinfo |
return docinfo |
|
|
|
|
def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): |
def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): |
"""parse texttool tag in index meta""" |
"""parse texttool tag in index meta""" |
logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url)) |
logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url)) |
Line 674 class documentViewer(Folder):
|
Line 609 class documentViewer(Folder):
|
if dom is None: |
if dom is None: |
dom = self.getDomFromIndexMeta(url) |
dom = self.getDomFromIndexMeta(url) |
|
|
|
texttool = self.metadata.getTexttoolData(dom=dom) |
|
|
archivePath = None |
archivePath = None |
archiveName = None |
archiveName = None |
|
|
Line 698 class documentViewer(Folder):
|
Line 635 class documentViewer(Folder):
|
# we balk without archive-path |
# we balk without archive-path |
raise IOError("Missing archive-path (for text-tool) in %s" % (url)) |
raise IOError("Missing archive-path (for text-tool) in %s" % (url)) |
|
|
imageDir = getText(dom.find(".//texttool/image")) |
imageDir = texttool.get('image', None) |
|
|
if not imageDir: |
if not imageDir: |
# we balk with no image tag / not necessary anymore because textmode is now standard |
# we balk with no image tag / not necessary anymore because textmode is now standard |
Line 717 class documentViewer(Folder):
|
Line 654 class documentViewer(Folder):
|
|
|
docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + imageDir |
docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + imageDir |
|
|
viewerUrl = getText(dom.find(".//texttool/digiliburlprefix")) |
viewerUrl = texttool.get('digiliburlprefix', None) |
if viewerUrl: |
if viewerUrl: |
docinfo['viewerURL'] = viewerUrl |
docinfo['viewerURL'] = viewerUrl |
|
|
# old style text URL |
# old style text URL |
textUrl = getText(dom.find(".//texttool/text")) |
textUrl = texttool.get('text', None) |
if textUrl: |
if textUrl: |
if urlparse.urlparse(textUrl)[0] == "": #keine url |
if urlparse.urlparse(textUrl)[0] == "": #keine url |
textUrl = os.path.join(archivePath, textUrl) |
textUrl = os.path.join(archivePath, textUrl) |
Line 733 class documentViewer(Folder):
|
Line 670 class documentViewer(Folder):
|
docinfo['textURL'] = textUrl |
docinfo['textURL'] = textUrl |
|
|
# new style text-url-path |
# new style text-url-path |
textUrl = getText(dom.find(".//texttool/text-url-path")) |
textUrl = texttool.get('text-url-path', None) |
if textUrl: |
if textUrl: |
docinfo['textURLPath'] = textUrl |
docinfo['textURLPath'] = textUrl |
textUrlkurz = string.split(textUrl, ".")[0] |
textUrlkurz = string.split(textUrl, ".")[0] |
Line 742 class documentViewer(Folder):
|
Line 679 class documentViewer(Folder):
|
# text-only, no page images |
# text-only, no page images |
#docinfo = self.getNumTextPages(docinfo) |
#docinfo = self.getNumTextPages(docinfo) |
|
|
|
# get bib info |
presentationUrl = getText(dom.find(".//texttool/presentation")) |
|
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
# TODO: is this needed here? |
# TODO: is this needed here? |
docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) |
docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) |
|
|
|
# TODO: what to do with presentation? |
|
presentationUrl = texttool.get('presentation', None) |
if presentationUrl: # ueberschreibe diese durch presentation informationen |
if presentationUrl: # ueberschreibe diese durch presentation informationen |
# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten |
# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten |
# durch den relativen Pfad auf die presentation infos |
# durch den relativen Pfad auf die presentation infos |
Line 760 class documentViewer(Folder):
|
Line 697 class documentViewer(Folder):
|
|
|
docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl, docinfo=docinfo, dom=dom) |
docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl, docinfo=docinfo, dom=dom) |
|
|
|
# get authorization |
docinfo = self.getAuthinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get access info |
docinfo = self.getAuthinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get access info |
|
|
return docinfo |
return docinfo |
Line 790 class documentViewer(Folder):
|
Line 728 class documentViewer(Folder):
|
imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
docinfo['imageURL'] = imageUrl |
docinfo['imageURL'] = imageUrl |
|
|
|
#TODO: use getDocinfoFromIndexMeta |
#path ist the path to the images it assumes that the index.meta file is one level higher. |
#path ist the path to the images it assumes that the index.meta file is one level higher. |
docinfo = self.getBibinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
docinfo = self.getBibinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
Line 824 class documentViewer(Folder):
|
Line 763 class documentViewer(Folder):
|
logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) |
logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) |
raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) |
raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) |
|
|
# FIXME: fake texturlpath |
|
if not docinfo.has_key('textURLPath'): |
|
docinfo['textURLPath'] = None |
|
|
|
logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys()) |
logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys()) |
#logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) |
#logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) |
|
# store in session |
self.REQUEST.SESSION['docinfo'] = docinfo |
self.REQUEST.SESSION['docinfo'] = docinfo |
return docinfo |
return docinfo |
|
|
Line 845 class documentViewer(Folder):
|
Line 781 class documentViewer(Folder):
|
pageinfo['cols'] = cols |
pageinfo['cols'] = cols |
grpsize = cols * rows |
grpsize = cols * rows |
pageinfo['groupsize'] = grpsize |
pageinfo['groupsize'] = grpsize |
|
# what does this do? |
start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1))) |
start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1))) |
# int(current / grpsize) * grpsize +1)) |
# int(current / grpsize) * grpsize +1)) |
pageinfo['start'] = start |
pageinfo['start'] = start |
Line 855 class documentViewer(Folder):
|
Line 792 class documentViewer(Folder):
|
pageinfo['numgroups'] = int(np / grpsize) |
pageinfo['numgroups'] = int(np / grpsize) |
if np % grpsize > 0: |
if np % grpsize > 0: |
pageinfo['numgroups'] += 1 |
pageinfo['numgroups'] += 1 |
|
|
pageinfo['viewMode'] = viewMode |
pageinfo['viewMode'] = viewMode |
pageinfo['tocMode'] = tocMode |
pageinfo['tocMode'] = tocMode |
pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') |
pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') |
Line 867 class documentViewer(Folder):
|
Line 805 class documentViewer(Folder):
|
pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
|
# WTF?: |
toc = int (pageinfo['tocPN']) |
toc = int (pageinfo['tocPN']) |
pageinfo['textPages'] =int (toc) |
pageinfo['textPages'] =int (toc) |
|
|
|
# What does this do? |
if 'tocSize_%s'%tocMode in docinfo: |
if 'tocSize_%s'%tocMode in docinfo: |
tocSize = int(docinfo['tocSize_%s'%tocMode]) |
tocSize = int(docinfo['tocSize_%s'%tocMode]) |
tocPageSize = int(pageinfo['tocPageSize']) |
tocPageSize = int(pageinfo['tocPageSize']) |
Line 878 class documentViewer(Folder):
|
Line 818 class documentViewer(Folder):
|
tocPages=tocSize/tocPageSize+1 |
tocPages=tocSize/tocPageSize+1 |
else: |
else: |
tocPages=tocSize/tocPageSize |
tocPages=tocSize/tocPageSize |
|
|
pageinfo['tocPN'] = min (tocPages,toc) |
pageinfo['tocPN'] = min (tocPages,toc) |
|
|
pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
pageinfo['sn'] =self.REQUEST.get('sn','') |
pageinfo['sn'] =self.REQUEST.get('sn','') |
return pageinfo |
return pageinfo |
|
|
|
|
|
security.declareProtected('View management screens','changeDocumentViewerForm') |
|
changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals()) |
|
|
def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None): |
def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None): |
"""init document viewer""" |
"""init document viewer""" |
self.title=title |
self.title=title |
Line 890 def changeDocumentViewer(self,title="",d
|
Line 836 def changeDocumentViewer(self,title="",d
|
self.thumbrows = thumbrows |
self.thumbrows = thumbrows |
self.thumbcols = thumbcols |
self.thumbcols = thumbcols |
self.authgroups = [s.strip().lower() for s in authgroups.split(',')] |
self.authgroups = [s.strip().lower() for s in authgroups.split(',')] |
|
try: |
|
# assume MetaDataFolder instance is called metadata |
|
self.metadataService = getattr(self, 'metadata') |
|
except Exception, e: |
|
logging.error("Unable to find MetaDataFolder 'metadata': "+str(e)) |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|