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

Diff for /documentViewer/documentViewer.py between versions 1.113 and 1.116

version 1.113, 2010/10/08 14:02:24 version 1.116, 2010/10/11 12:46:52
Line 551  class documentViewer(Folder): Line 551  class documentViewer(Folder):
         #docinfo['numPages']=int(getTextFromNode(result[0]))          #docinfo['numPages']=int(getTextFromNode(result[0]))
                   
         #result =dom.xpath("//name")          #result =dom.xpath("//name")
         docinfo['name']=getTextFromNode(dom.xpath("//name")[0])          docinfo['name']=getTextFromNode(dom.xpath("/resource/name")[0])
         logging.debug("documentViewer docinfo[name] %s"%docinfo[name])          logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])
                         
                 #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)                  #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
         return docinfo          return docinfo
Line 643  class documentViewer(Folder): Line 643  class documentViewer(Folder):
                     
         presentationUrls = dom.xpath("//texttool/presentation")          presentationUrls = dom.xpath("//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
         #docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)          docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
                   
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen           if presentationUrls and (len(presentationUrls) > 0): # 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
Removed from v.1.113  
changed lines
  Added in v.1.116

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