--- documentViewer/documentViewer.py 2011/07/28 13:00:07 1.175.2.10 +++ documentViewer/documentViewer.py 2011/08/04 14:57:02 1.175.2.17 @@ -98,10 +98,13 @@ def browserCheck(self): return bt -def getParentDir(path): - """returns pathname shortened by one""" - return '/'.join(path.split('/')[0:-1]) - +def getParentPath(path, cnt=1): + """returns pathname shortened by cnt""" + # make sure path doesn't end with / + path = path.rstrip('/') + # split by /, shorten, and reassemble + return '/'.join(path.split('/')[0:-cnt]) + ## ## documentViewer class @@ -260,18 +263,18 @@ class documentViewer(Folder): viewMode="images" return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) + security.declareProtected('View','index_html') - def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None): - ''' - view it - @param mode: defines how to access the document behind url + def index_html(self,url,mode="texttool",viewMode="auto",viewTYpe=None,tocMode="thumbs"): + """ + view page @param url: url which contains display information - @param viewMode: if images display images, if text display text, default is auto (text,images or auto) + @param mode: defines how to access the document behind url + @param viewMode: 'images': display images, 'text': display text, default is 'auto' + @param viewType: sub-type of viewMode, e.g. 'dict' for viewMode='text' @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) - @param characterNormalization type of text display (reg, norm, none) - @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma) - ''' + """ logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn)) @@ -289,25 +292,20 @@ class documentViewer(Folder): # get table of contents docinfo = self.getToc(mode=tocMode, docinfo=docinfo) - # auto viewMode: text_dict if text else images + # auto viewMode: text if there is a text else images if viewMode=="auto": if docinfo.get('textURL', None) or docinfo.get('textURLPath', None): - #texturl gesetzt und textViewer konfiguriert - viewMode="text_dict" + viewMode = "text" + viewType = "dict" else: - viewMode="images" + viewMode = "images" - pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, tocMode=tocMode) - - if viewMode != 'images' and docinfo.get('textURLPath', None): - # get full text page - page = self.getTextPage(mode=viewMode, pn=pn, docinfo=docinfo, pageinfo=pageinfo) - pageinfo['textPage'] = page - + pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viweType=viewType, tocMode=tocMode) + # get template /template/viewer_main pt = getattr(self.template, 'viewer_main') # and execute with parameters - return pt(docinfo=docinfo, pageinfo=pageinfo, viewMode=viewMode, mk=self.generateMarks(mk)) + return pt(docinfo=docinfo, pageinfo=pageinfo) def generateMarks(self,mk): ret="" @@ -343,17 +341,20 @@ class documentViewer(Folder): else: return style - def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'): - """returns URL to documentviewer with parameter param set to val or from dict params""" + def getParams(self, param=None, val=None, params=None): + """returns dict with URL parameters. + + Takes URL parameters and additionally param=val or dict params. + Deletes key if value is None.""" # copy existing request params - urlParams=self.REQUEST.form.copy() + newParams=self.REQUEST.form.copy() # change single param if param is not None: if val is None: - if urlParams.has_key(param): - del urlParams[param] + if newParams.has_key(param): + del newParams[param] else: - urlParams[param] = str(val) + newParams[param] = str(val) # change more params if params is not None: @@ -361,34 +362,32 @@ class documentViewer(Folder): v = params[k] if v is None: # val=None removes param - if urlParams.has_key(k): - del urlParams[k] + if newParams.has_key(k): + del newParams[k] else: - urlParams[k] = v - - # FIXME: does this belong here? - if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath - urlParams["mode"] = "imagepath" - urlParams["url"] = getParentDir(urlParams["url"]) - + newParams[k] = v + + return newParams + + def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'): + """returns URL to documentviewer with parameter param set to val or from dict params""" + urlParams = self.getParams(param=param, val=val, params=params) # quote values and assemble into query string (not escaping '/') ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(v,'/')) for (k, v) in urlParams.items()]) - #ps = urllib.urlencode(urlParams) if baseUrl is None: - baseUrl = self.REQUEST['URL1'] + baseUrl = self.getDocumentViewerURL() url = "%s?%s"%(baseUrl, ps) return url - def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None): """link to documentviewer with parameter param set to val""" return self.getLink(param, val, params, baseUrl, '&') + def getInfo_xml(self,url,mode): """returns info about the document as XML""" - if not self.digilibBaseUrl: self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" @@ -396,28 +395,14 @@ class documentViewer(Folder): pt = getattr(self.template, 'info_xml') return pt(docinfo=docinfo) - def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True): - """returns new option state""" - if not self.REQUEST.SESSION.has_key(optionName): - # not in session -- initial - opt = {'lastState': newState, 'state': initialState} - else: - opt = self.REQUEST.SESSION.get(optionName) - if opt['lastState'] != newState: - # state in session has changed -- toggle - opt['state'] = not opt['state'] - opt['lastState'] = newState - - self.REQUEST.SESSION[optionName] = opt - return opt['state'] - def isAccessible(self, docinfo): """returns if access to the resource is granted""" access = docinfo.get('accessType', None) logging.debug("documentViewer (accessOK) access type %s"%access) - if access is not None and access == 'free': + if access == 'free': logging.debug("documentViewer (accessOK) access is free") return True + elif access is None or access in self.authgroups: # only local access -- only logged in users user = getSecurityManager().getUser() @@ -431,241 +416,146 @@ class documentViewer(Folder): logging.error("documentViewer (accessOK) unknown access type %s"%access) return False - - def getDirinfoFromDigilib(self,path,docinfo=None,cut=0): - """gibt param von dlInfo aus""" - if docinfo is None: - docinfo = {} - - for x in range(cut): - path=getParentDir(path) - - infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path - - logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl)) - - txt = getHttpData(infoUrl) - if txt is None: - raise IOError("Unable to get dir-info from %s"%(infoUrl)) - dom = ET.fromstring(txt) - #dom = Parse(txt) - size=getText(dom.find("size")) - #sizes=dom.xpath("//dir/size") - logging.debug("documentViewer (getparamfromdigilib) dirInfo:size=%s"%size) - - if size: - docinfo['numPages'] = int(size) - else: - docinfo['numPages'] = 0 + + def getDocinfo(self, mode, url): + """returns docinfo depending on mode""" + logging.debug("getDocinfo: mode=%s, url=%s"%(mode,url)) + # look for cached docinfo in session + if self.REQUEST.SESSION.has_key('docinfo'): + docinfo = self.REQUEST.SESSION['docinfo'] + # check if its still current + if docinfo is not None and docinfo.get('mode', None) == mode and docinfo.get('url', None) == url: + logging.debug("getDocinfo: docinfo in session. keys=%s"%docinfo.keys()) + return docinfo - # TODO: produce and keep list of image names and numbers - - return docinfo - - def getIndexMetaPath(self,url): - """gib nur den Pfad zurueck""" - regexp = re.compile(r".*(experimental|permanent)/(.*)") - regpath = regexp.match(url) - if (regpath==None): - return "" - logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2)) - return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2)) - - - - def getIndexMetaUrl(self,url): - """returns utr of index.meta document at url""" - - metaUrl = None - if url.startswith("http://"): - # real URL - metaUrl = url + # new docinfo + docinfo = {'mode': mode, 'url': url} + # add self url + docinfo['viewerUrl'] = self.getDocumentViewerURL() + # get index.meta DOM + docUrl = None + metaDom = None + if mode=="texttool": + # url points to document dir or index.meta + metaDom = self.metadataService.getDomFromPathOrUrl(url) + docUrl = url.replace('/index.meta', '') + if metaDom is None: + raise IOError("Unable to find index.meta for mode=texttool!") + + elif mode=="imagepath": + # url points to folder with images, index.meta optional + # asssume index.meta in parent dir + docUrl = getParentPath(url) + metaDom = self.metadataService.getDomFromPathOrUrl(docUrl) + + elif mode=="filepath": + # url points to image file, index.meta optional + # asssume index.meta is two path segments up + docUrl = getParentPath(url, 2) + metaDom = self.metadataService.getDomFromPathOrUrl(docUrl) + else: - # online path - server=self.digilibBaseUrl+"/servlet/Texter?fn=" - metaUrl=server+url.replace("/mpiwg/online","") - if not metaUrl.endswith("index.meta"): - metaUrl += "/index.meta" + logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) + raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) - return metaUrl - - def getDomFromIndexMeta(self, url): - """get dom from index meta""" - dom = None - metaUrl = self.getIndexMetaUrl(url) + docinfo['documentUrl'] = docUrl + # process index.meta contents + if metaDom is not None: + # document directory name and path + resource = self.metadataService.getResourceData(dom=metaDom) + if resource: + docinfo = self.getDocinfoFromResource(docinfo, resource) + + # texttool info + texttool = self.metadataService.getTexttoolData(dom=metaDom) + if texttool: + docinfo = self.getDocinfoFromTexttool(docinfo, texttool) + + # bib info + bib = self.metadataService.getBibData(dom=metaDom) + if bib: + docinfo = self.getDocinfoFromBib(docinfo, bib) + else: + # no bib - try info.xml + docinfo = self.getDocinfoFromPresentationInfoXml(docinfo) - logging.debug("(getDomFromIndexMeta): METAURL: %s"%metaUrl) - txt=getHttpData(metaUrl) - if txt is None: - raise IOError("Unable to read index meta from %s"%(url)) - - dom = ET.fromstring(txt) - #dom = Parse(txt) - return dom - - def getPresentationInfoXML(self, url): - """returns dom of info.xml document at url""" - dom = None - metaUrl = None - if url.startswith("http://"): - # real URL - metaUrl = url - else: - # online path - server=self.digilibBaseUrl+"/servlet/Texter?fn=" - metaUrl=server+url.replace("/mpiwg/online","") - - txt=getHttpData(metaUrl) - if txt is None: - raise IOError("Unable to read infoXMLfrom %s"%(url)) - - dom = ET.fromstring(txt) - #dom = Parse(txt) - return dom - - - def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): - """gets authorization info from the index.meta file at path or given by dom""" - logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path)) - - access = None - - if docinfo is None: - docinfo = {} - - if dom is None: - for x in range(cut): - path=getParentDir(path) - dom = self.getDomFromIndexMeta(path) - - acc = dom.find(".//access-conditions/access") - if acc is not None: - acctype = acc.get('type') - #acctype = dom.xpath("//access-conditions/access/@type") - if acctype: - access=acctype - if access in ['group', 'institution']: - access = dom.find(".//access-conditions/access/name").text.lower() - - docinfo['accessType'] = access + # auth info + access = self.metadataService.getAccessData(dom=metaDom) + if access: + docinfo = self.getDocinfoFromAccess(docinfo, access) + + # attribution info + attribution = self.metadataService.getAttributionData(dom=metaDom) + if attribution: + logging.debug("getDocinfo: attribution=%s"%repr(attribution)) + docinfo['attribution'] = attribution + #docinfo = self.getDocinfoFromAccess(docinfo, access) + + # copyright info + copyright = self.metadataService.getCopyrightData(dom=metaDom) + if copyright: + logging.debug("getDocinfo: copyright=%s"%repr(copyright)) + docinfo['copyright'] = copyright + #docinfo = self.getDocinfoFromAccess(docinfo, access) + + # image path + if mode != 'texttool': + # override image path from texttool + docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1) + + # number of images from digilib + if docinfo.get('imagePath', None): + docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath'] + docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath']) + + logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys()) + #logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) + # store in session + self.REQUEST.SESSION['docinfo'] = docinfo return docinfo - - - def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): - """gets bibliographical info from the index.meta file at path or given by dom""" - logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path)) - - if docinfo is None: - docinfo = {} - - if dom is None: - for x in range(cut): - path=getParentDir(path) - dom = self.getDomFromIndexMeta(path) - - docinfo['indexMetaPath']=self.getIndexMetaPath(path); - - logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) - if self.metadataService is not None: - # put all raw bib fields in dict "bib" - bib = self.metadataService.getBibData(dom=dom) - docinfo['bib'] = bib - bibtype = bib.get('@type', None) - docinfo['bib_type'] = bibtype - # also store DC metadata for convenience - dc = self.metadataService.getDCMappedData(bib) - docinfo['creator'] = dc.get('creator',None) - docinfo['title'] = dc.get('title',None) - docinfo['date'] = dc.get('date',None) + + def getDocinfoFromResource(self, docinfo, resource): + """reads contents of resource element into docinfo""" + docName = resource.get('name', None) + docinfo['documentName'] = docName + docPath = resource.get('archive-path', None) + if docPath: + # clean up document path + if docPath[0] != '/': + docPath = '/' + docPath + + if docName and (not docPath.endswith(docName)): + docPath += "/" + docName + else: - logging.error("MetadataService not found!") - return docinfo - - - # TODO: is this needed? - def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): - """gets name info from the index.meta file at path or given by dom""" - if docinfo is None: - docinfo = {} - - if dom is None: - for x in range(cut): - path=getParentDir(path) - dom = self.getDomFromIndexMeta(path) + # use docUrl as docPath + docUrl = docinfo['documentURL'] + if not docUrl.startswith('http:'): + docPath = docUrl + if docPath: + # fix URLs starting with /mpiwg/online + docPath = docPath.replace('/mpiwg/online', '', 1) - docinfo['name']=getText(dom.find("name")) - logging.debug("documentViewer docinfo[name] %s"%docinfo['name']) + docinfo['documentPath'] = docPath return docinfo - - def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): - """parse texttool tag in index meta""" - logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url)) - if docinfo is None: - docinfo = {} - if docinfo.get('lang', None) is None: - docinfo['lang'] = '' # default keine Sprache gesetzt - if dom is None: - dom = self.getDomFromIndexMeta(url) - - texttool = self.metadata.getTexttoolData(dom=dom) - - archivePath = None - archiveName = None - - archiveName = getText(dom.find("name")) - if not archiveName: - logging.warning("documentViewer (getdocinfofromtexttool) resource/name missing in: %s" % (url)) - - archivePath = getText(dom.find("archive-path")) - if archivePath: - # clean up archive path - if archivePath[0] != '/': - archivePath = '/' + archivePath - if archiveName and (not archivePath.endswith(archiveName)): - archivePath += "/" + archiveName - else: - # try to get archive-path from url - logging.warning("documentViewer (getdocinfofromtexttool) resource/archive-path missing in: %s" % (url)) - if (not url.startswith('http')): - archivePath = url.replace('index.meta', '') - - if archivePath is None: - # we balk without archive-path - raise IOError("Missing archive-path (for text-tool) in %s" % (url)) - + def getDocinfoFromTexttool(self, docinfo, texttool): + """reads contents of texttool element into docinfo""" + # image dir imageDir = texttool.get('image', None) - - if not imageDir: - # we balk with no image tag / not necessary anymore because textmode is now standard - #raise IOError("No text-tool info in %s"%(url)) - imageDir = "" - #xquery="//pb" - docinfo['imagePath'] = "" # keine Bilder - docinfo['imageURL'] = "" - - if imageDir and archivePath: + docPath = docinfo.get('documentPath', None) + if imageDir and docPath: #print "image: ", imageDir, " archivepath: ", archivePath - imageDir = os.path.join(archivePath, imageDir) - imageDir = imageDir.replace("/mpiwg/online", '') - docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo) + imageDir = os.path.join(docPath, imageDir) + imageDir = imageDir.replace('/mpiwg/online', '', 1) docinfo['imagePath'] = imageDir - - docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + imageDir - - viewerUrl = texttool.get('digiliburlprefix', None) - if viewerUrl: - docinfo['viewerURL'] = viewerUrl # old style text URL textUrl = texttool.get('text', None) - if textUrl: + if textUrl and docPath: if urlparse.urlparse(textUrl)[0] == "": #keine url - textUrl = os.path.join(archivePath, textUrl) - # fix URLs starting with /mpiwg/online - if textUrl.startswith("/mpiwg/online"): - textUrl = textUrl.replace("/mpiwg/online", '', 1) + textUrl = os.path.join(docPath, textUrl) docinfo['textURL'] = textUrl @@ -673,107 +563,117 @@ class documentViewer(Folder): textUrl = texttool.get('text-url-path', None) if textUrl: docinfo['textURLPath'] = textUrl - textUrlkurz = string.split(textUrl, ".")[0] - docinfo['textURLPathkurz'] = textUrlkurz - #if not docinfo['imagePath']: - # text-only, no page images - #docinfo = self.getNumTextPages(docinfo) - - # get bib info - docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag - # TODO: is this needed here? - 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 - # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten - # durch den relativen Pfad auf die presentation infos - presentationPath = presentationUrl - if url.endswith("index.meta"): - presentationUrl = url.replace('index.meta', presentationPath) + + # page flow + docinfo['pageFlow'] = texttool.get('page-flow', 'ltr') + + # odd pages are left + docinfo['oddPage'] = texttool.get('odd-scan-orientation', 'left') + + # number of title page (0: not defined) + docinfo['titlePage'] = texttool.get('title-scan-no', 0) + + # old presentation stuff + presentation = texttool.get('presentation', None) + if presentation and docPath: + if presentation.startswith('http:'): + docinfo['presentationUrl'] = presentation else: - presentationUrl = url + "/" + presentationPath - - docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl, docinfo=docinfo, dom=dom) - - # get authorization - docinfo = self.getAuthinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get access info + docinfo['presentationUrl'] = os.path.join(docPath, presentation) + return docinfo - - - def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None): - """gets the bibliographical information from the preseantion entry in texttools - """ - dom=self.getPresentationInfoXML(url) - docinfo['author']=getText(dom.find(".//author")) - docinfo['title']=getText(dom.find(".//title")) - docinfo['year']=getText(dom.find(".//date")) + + def getDocinfoFromBib(self, docinfo, bib): + """reads contents of bib element into docinfo""" + logging.debug("getDocinfoFromBib bib=%s"%repr(bib)) + # put all raw bib fields in dict "bib" + docinfo['bib'] = bib + bibtype = bib.get('@type', None) + docinfo['bibType'] = bibtype + # also store DC metadata for convenience + dc = self.metadataService.getDCMappedData(bib) + docinfo['creator'] = dc.get('creator',None) + docinfo['title'] = dc.get('title',None) + docinfo['date'] = dc.get('date',None) return docinfo - - def getDocinfoFromImagePath(self,path,docinfo=None,cut=0): - """path ist the path to the images it assumes that the index.meta file is one level higher.""" - logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path)) - if docinfo is None: - docinfo = {} - path=path.replace("/mpiwg/online","") - docinfo['imagePath'] = path - docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut) - - pathorig=path - for x in range(cut): - path=getParentDir(path) - logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path) - imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path - docinfo['imageURL'] = imageUrl - - #TODO: use getDocinfoFromIndexMeta - #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.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) + + def getDocinfoFromAccess(self, docinfo, acc): + """reads contents of access element into docinfo""" + #TODO: also read resource type + logging.debug("getDocinfoFromAccess acc=%s"%repr(acc)) + try: + acctype = acc['@attr']['type'] + if acctype: + access=acctype + if access in ['group', 'institution']: + access = acc['name'].lower() + + docinfo['accessType'] = access + + except: + pass + return docinfo - - - def getDocinfo(self, mode, url): - """returns docinfo depending on mode""" - logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url)) - # look for cached docinfo in session - if self.REQUEST.SESSION.has_key('docinfo'): - docinfo = self.REQUEST.SESSION['docinfo'] - # check if its still current - if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url: - logging.debug("documentViewer (getdocinfo) docinfo in session. keys=%s"%docinfo.keys()) - return docinfo + + def getDocinfoFromDigilib(self, docinfo, path): + infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path + # fetch data + txt = getHttpData(infoUrl) + if not txt: + logging.error("Unable to get dir-info from %s"%(infoUrl)) + return docinfo + + dom = ET.fromstring(txt) + size = getText(dom.find("size")) + logging.debug("getDocinfoFromDigilib: size=%s"%size) + if size: + docinfo['numPages'] = int(size) + else: + docinfo['numPages'] = 0 - # new docinfo - docinfo = {'mode': mode, 'url': url} - # add self url - docinfo['viewerUrl'] = self.getDocumentViewerURL() - if mode=="texttool": - # index.meta with texttool information - docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo) - elif mode=="imagepath": - # folder with images, index.meta optional - docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) - elif mode=="filepath": - # filename - docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1) + # TODO: produce and keep list of image names and numbers + return docinfo + + + def getDocinfoFromPresentationInfoXml(self,docinfo): + """gets DC-like bibliographical information from the presentation entry in texttools""" + url = docinfo.get('presentationUrl', None) + if not url: + logging.error("getDocinfoFromPresentation: no URL!") + return docinfo + + dom = None + metaUrl = None + if url.startswith("http://"): + # real URL + metaUrl = url else: - logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) - raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) - - logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys()) - #logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) - # store in session - self.REQUEST.SESSION['docinfo'] = docinfo + # online path + + server=self.digilibBaseUrl+"/servlet/Texter?fn=" + metaUrl=server+url + + txt=getHttpData(metaUrl) + if txt is None: + logging.error("Unable to read info.xml from %s"%(url)) + return docinfo + + dom = ET.fromstring(txt) + docinfo['creator']=getText(dom.find(".//author")) + docinfo['title']=getText(dom.find(".//title")) + docinfo['date']=getText(dom.find(".//date")) return docinfo - - def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): + + + def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, viewType=None, tocMode=None): """returns pageinfo with the given parameters""" pageinfo = {} + pageinfo['viewMode'] = viewMode + pageinfo['viewType'] = viewType + pageinfo['tocMode'] = tocMode + current = getInt(current) - pageinfo['current'] = current rows = int(rows or self.thumbrows) pageinfo['rows'] = rows @@ -786,28 +686,32 @@ class documentViewer(Folder): # int(current / grpsize) * grpsize +1)) pageinfo['start'] = start pageinfo['end'] = start + grpsize - if (docinfo is not None) and ('numPages' in docinfo): - np = int(docinfo['numPages']) - pageinfo['end'] = min(pageinfo['end'], np) - pageinfo['numgroups'] = int(np / grpsize) - if np % grpsize > 0: - pageinfo['numgroups'] += 1 + pn = self.REQUEST.get('pn','1') + pageinfo['pn'] = pn + np = int(docinfo.get('numPages', 0)) + if np == 0: + # numPages unknown - maybe we can get it from text page + if docinfo.get('textURLPath', None): + # cache text page as well + pageinfo['textPage'] = self.getTextPage(mode=viewType, pn=pn, docinfo=docinfo, pageinfo=pageinfo) + np = int(docinfo.get('numPages', 0)) + + pageinfo['end'] = min(pageinfo['end'], np) + pageinfo['numgroups'] = int(np / grpsize) + if np % grpsize > 0: + pageinfo['numgroups'] += 1 - pageinfo['viewMode'] = viewMode - pageinfo['tocMode'] = tocMode pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') - #pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','1') pageinfo['query'] = self.REQUEST.get('query','') pageinfo['queryType'] = self.REQUEST.get('queryType','') pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') - pageinfo['textPN'] = self.REQUEST.get('textPN','1') pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') # WTF?: toc = int(pageinfo['tocPN']) - pageinfo['textPages'] =int(toc) + pageinfo['textPages'] = int(toc) # What does this do? if 'tocSize_%s'%tocMode in docinfo: @@ -822,7 +726,6 @@ class documentViewer(Folder): pageinfo['tocPN'] = min(tocPages,toc) pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') - pageinfo['sn'] =self.REQUEST.get('sn','') return pageinfo