[BACK]Return to documentViewer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.175.2.10 and 1.175.2.14

version 1.175.2.10, 2011/07/28 13:00:07 version 1.175.2.14, 2011/08/02 10:35:05
Line 98  def browserCheck(self): Line 98  def browserCheck(self):
   
     return bt      return bt
   
 def getParentDir(path):  def getParentPath(path, cnt=1):
     """returns pathname shortened by one"""      """returns pathname shortened by cnt"""
     return '/'.join(path.split('/')[0:-1])      # make sure path doesn't end with /
       path = path.rstrip('/')
       # split by /, shorten, and reassemble
       return '/'.join(path.split('/')[0:-cnt])
                   
   
 ##  ##
Line 261  class documentViewer(Folder): Line 264  class documentViewer(Folder):
                                 
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)          return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
       
     
     security.declareProtected('View','index_html')      security.declareProtected('View','index_html')
     def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None):      def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None):
         '''          """
         view it          view it
         @param mode: defines how to access the document behind url           @param mode: defines how to access the document behind url 
         @param url: url which contains display information          @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 viewMode: if images display images, if text display text, default is auto (text,images or auto)
         @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none)          @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))          logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
                   
Line 292  class documentViewer(Folder): Line 294  class documentViewer(Folder):
         # auto viewMode: text_dict if text else images          # auto viewMode: text_dict if text else images
         if viewMode=="auto":           if viewMode=="auto": 
             if docinfo.get('textURL', None) or docinfo.get('textURLPath', None):               if docinfo.get('textURL', None) or docinfo.get('textURLPath', None): 
                 #texturl gesetzt und textViewer konfiguriert  
                 viewMode="text_dict"                  viewMode="text_dict"
             else:              else:
                 viewMode="images"                  viewMode="images"
Line 370  class documentViewer(Folder): Line 371  class documentViewer(Folder):
         # FIXME: does this belong here?          # FIXME: does this belong here?
         if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath          if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath
                 urlParams["mode"] = "imagepath"                  urlParams["mode"] = "imagepath"
                 urlParams["url"] = getParentDir(urlParams["url"])                  urlParams["url"] = getParentPath(urlParams["url"])
                                   
         # quote values and assemble into query string (not escaping '/')          # 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 = paramSep.join(["%s=%s"%(k,urllib.quote_plus(v,'/')) for (k, v) in urlParams.items()])
Line 388  class documentViewer(Folder): Line 389  class documentViewer(Folder):
           
     def getInfo_xml(self,url,mode):      def getInfo_xml(self,url,mode):
         """returns info about the document as XML"""          """returns info about the document as XML"""
   
         if not self.digilibBaseUrl:          if not self.digilibBaseUrl:
             self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"              self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
                   
Line 396  class documentViewer(Folder): Line 396  class documentViewer(Folder):
         pt = getattr(self.template, 'info_xml')          pt = getattr(self.template, 'info_xml')
         return pt(docinfo=docinfo)          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):      def isAccessible(self, docinfo):
         """returns if access to the resource is granted"""          """returns if access to the resource is granted"""
         access = docinfo.get('accessType', None)          access = docinfo.get('accessType', None)
         logging.debug("documentViewer (accessOK) access type %s"%access)          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")              logging.debug("documentViewer (accessOK) access is free")
             return True              return True
           
         elif access is None or access in self.authgroups:          elif access is None or access in self.authgroups:
             # only local access -- only logged in users              # only local access -- only logged in users
             user = getSecurityManager().getUser()              user = getSecurityManager().getUser()
Line 432  class documentViewer(Folder): Line 418  class documentViewer(Folder):
         return False          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):      def getDocinfo(self, mode, url):
             path=getParentDir(path)          """returns docinfo depending on mode"""
                  logging.debug("getDocinfo: mode=%s, url=%s"%(mode,url))
         infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path          # 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
           
         logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl))          # 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!")
                   
         txt = getHttpData(infoUrl)          elif mode=="imagepath":
         if txt is None:              # url points to folder with images, index.meta optional
             raise IOError("Unable to get dir-info from %s"%(infoUrl))              # asssume index.meta in parent dir
               docUrl = getParentPath(url)
               metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
   
         dom = ET.fromstring(txt)          elif mode=="filepath":
         #dom = Parse(txt)              # url points to image file, index.meta optional
         size=getText(dom.find("size"))              # asssume index.meta is two path segments up
         #sizes=dom.xpath("//dir/size")              docUrl = getParentPath(url, 2)
         logging.debug("documentViewer (getparamfromdigilib) dirInfo:size=%s"%size)              metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
                   
         if size:  
             docinfo['numPages'] = int(size)  
         else:          else:
             docinfo['numPages'] = 0              logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode)
               raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
                           
         # TODO: produce and keep list of image names and numbers          docinfo['documentUrl'] = docUrl
           # process index.meta contents
           if metaDom is not None:
               # document directory name and path
               logging.debug("RESOURCE: %s"%repr(self.metadataService.resource.getData(dom=metaDom,recursive=1)))
               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)
                   
               # 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          return docinfo
           
     def getIndexMetaPath(self,url):      def getDocinfoFromResource(self, docinfo, resource):
         """gib nur den Pfad zurueck"""          """reads contents of resource element into docinfo"""
         regexp = re.compile(r".*(experimental|permanent)/(.*)")          docName = resource.get('name', None)
         regpath = regexp.match(url)          docinfo['documentName'] = docName
         if (regpath==None):          docPath = resource.get('archive-path', None)
             return ""          if docPath:
         logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))                          # clean up document path
         return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))              if docPath[0] != '/':
                        docPath = '/' + docPath
                       
                   if docName and (not docPath.endswith(docName)):
     def getIndexMetaUrl(self,url):                  docPath += "/" + docName
         """returns utr  of index.meta document at url"""              
                 else:
         metaUrl = None              # use docUrl as docPath
         if url.startswith("http://"):              docUrl = docinfo['documentURL']
             # real URL              if not docUrl.startswith('http:'):
             metaUrl = url                  docPath = docUrl
         else:          if docPath:
             # online path              # fix URLs starting with /mpiwg/online
             server=self.digilibBaseUrl+"/servlet/Texter?fn="              docPath = docPath.replace('/mpiwg/online', '', 1)
             metaUrl=server+url.replace("/mpiwg/online","")  
             if not metaUrl.endswith("index.meta"):  
                 metaUrl += "/index.meta"  
                   
         return metaUrl          docinfo['documentPath'] = docPath
           return docinfo
           
     def getDomFromIndexMeta(self, url):      def getDocinfoFromTexttool(self, docinfo, texttool):
         """get dom from index meta"""          """reads contents of texttool element into docinfo"""
         dom = None          # image dir
         metaUrl = self.getIndexMetaUrl(url)          imageDir = texttool.get('image', None)
           docPath = docinfo.get('documentPath', None)
           if imageDir and docPath:
               #print "image: ", imageDir, " archivepath: ", archivePath
               imageDir = os.path.join(docPath, imageDir)
               imageDir = imageDir.replace('/mpiwg/online', '', 1)
               docinfo['imagePath'] = imageDir
                                   
         logging.debug("(getDomFromIndexMeta): METAURL: %s"%metaUrl)          # old style text URL
         txt=getHttpData(metaUrl)          textUrl = texttool.get('text', None)
         if txt is None:          if textUrl and docPath:
             raise IOError("Unable to read index meta from %s"%(url))              if urlparse.urlparse(textUrl)[0] == "": #keine url
                   textUrl = os.path.join(docPath, textUrl) 
                   
         dom = ET.fromstring(txt)              docinfo['textURL'] = textUrl
         #dom = Parse(txt)  
         return dom  
           
     def getPresentationInfoXML(self, url):          # new style text-url-path
         """returns dom of info.xml document at url"""          textUrl = texttool.get('text-url-path', None)
         dom = None          if textUrl:
         metaUrl = None              docinfo['textURLPath'] = textUrl
         if url.startswith("http://"):              #TODO: ugly:
             # real URL              #textUrlkurz = string.split(textUrl, ".")[0]
             metaUrl = url              #docinfo['textURLPathkurz'] = textUrlkurz
               
           # old presentation stuff
           presentation = texttool.get('presentation', None)
           if presentation and docPath:
               if presentation.startswith('http:'):
                   docinfo['presentationUrl'] = presentation
         else:          else:
             # online path                  docinfo['presentationUrl'] = os.path.join(docPath, presentation)
             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  
         return docinfo          return docinfo
           
               def getDocinfoFromBib(self, docinfo, bib):
     def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):          """reads contents of bib element into docinfo"""
         """gets bibliographical info from the index.meta file at path or given by dom"""          logging.debug("getDocinfoFromBib bib=%s"%repr(bib))
         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"              # put all raw bib fields in dict "bib"
             bib = self.metadataService.getBibData(dom=dom)  
             docinfo['bib'] = bib              docinfo['bib'] = bib
             bibtype = bib.get('@type', None)              bibtype = bib.get('@type', None)
             docinfo['bib_type'] = bibtype          docinfo['bibType'] = bibtype
             # also store DC metadata for convenience              # also store DC metadata for convenience
             dc = self.metadataService.getDCMappedData(bib)              dc = self.metadataService.getDCMappedData(bib)
             docinfo['creator'] = dc.get('creator',None)              docinfo['creator'] = dc.get('creator',None)
             docinfo['title'] = dc.get('title',None)              docinfo['title'] = dc.get('title',None)
             docinfo['date'] = dc.get('date',None)              docinfo['date'] = dc.get('date',None)
         else:  
             logging.error("MetadataService not found!")  
         return docinfo          return docinfo
           
       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()
           
     # TODO: is this needed?                  docinfo['accessType'] = access
     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:          except:
             for x in range(cut):              pass
                 path=getParentDir(path)  
             dom = self.getDomFromIndexMeta(path)  
   
         docinfo['name']=getText(dom.find("name"))  
         logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])  
         return docinfo          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
           
     def getDocinfoFromTextTool(self, url, dom=None, docinfo=None):          dom = ET.fromstring(txt)
         """parse texttool tag in index meta"""          size = getText(dom.find("size"))
         logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url))          logging.debug("getDocinfoFromDigilib: size=%s"%size)
         if docinfo is None:          if size:
            docinfo = {}              docinfo['numPages'] = int(size)
         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:          else:
             # try to get archive-path from url              docinfo['numPages'] = 0
             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))  
           
         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:  
             #print "image: ", imageDir, " archivepath: ", archivePath  
             imageDir = os.path.join(archivePath, imageDir)  
             imageDir = imageDir.replace("/mpiwg/online", '')  
             docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo)  
             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          # TODO: produce and keep list of image names and numbers
         textUrl = texttool.get('text', None)          return docinfo
         if textUrl:  
             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)  
                           
             docinfo['textURL'] = textUrl  
           
         # new style text-url-path      def getDocinfoFromPresentationInfoXml(self,docinfo):
         textUrl = texttool.get('text-url-path', None)          """gets DC-like bibliographical information from the presentation entry in texttools"""
         if textUrl:          url = docinfo.get('presentationUrl', None)
             docinfo['textURLPath'] = textUrl          if not url:
             textUrlkurz = string.split(textUrl, ".")[0]              logging.error("getDocinfoFromPresentation: no URL!")
             docinfo['textURLPathkurz'] = textUrlkurz              return docinfo
             #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?          dom = None
         presentationUrl = texttool.get('presentation', None)          metaUrl = None
         if presentationUrl: # ueberschreibe diese durch presentation informationen           if url.startswith("http://"):
              # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten              # real URL
              # durch den relativen Pfad auf die presentation infos              metaUrl = url
             presentationPath = presentationUrl  
             if url.endswith("index.meta"):   
                 presentationUrl = url.replace('index.meta', presentationPath)  
             else:              else:
                 presentationUrl = url + "/" + presentationPath              # online path
                   
             docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl, docinfo=docinfo, dom=dom)  
           
         # get authorization              server=self.digilibBaseUrl+"/servlet/Texter?fn="
         docinfo = self.getAuthinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get access info              metaUrl=server+url
                   
           txt=getHttpData(metaUrl)
           if txt is None:
               logging.error("Unable to read info.xml from %s"%(url))
         return docinfo          return docinfo
         
              dom = ET.fromstring(txt)
     def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None):          docinfo['creator']=getText(dom.find(".//author"))
         """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['title']=getText(dom.find(".//title"))
         docinfo['year']=getText(dom.find(".//date"))          docinfo['date']=getText(dom.find(".//date"))
         return docinfo          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)  
         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  
               
         # 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)  
         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  
         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, tocMode=None):
         """returns pageinfo with the given parameters"""          """returns pageinfo with the given parameters"""
Removed from v.1.175.2.10  
changed lines
  Added in v.1.175.2.14

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>