documentViewer/documentViewer.py - diff

Return to documentViewer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.166 and 1.167

-version 1.166, 2011/01/20 16:04:21
+version 1.167, 2011/02/14 14:41:13
  Line 231  class documentViewer(Folder):
          """get page"""
          return self.template.fulltextclient.getTextPage(**args)
+     def getText(self, **args):
+         """get page text"""
+         return self.template.fulltextclient.getText(**args)
+     def getXML(self, **args):
+         """get page xml"""
+         return self.template.fulltextclient.getXML(**args)
+     def getDictionary(self, **args):
+         """get page dictionary"""
+         return self.template.fulltextclient.getDictionary(**args)
      def getQuery(self, **args):
          """get query in search"""
          return self.template.fulltextclient.getQuery(**args)
- Line 336  class documentViewer(Folder):
+ Line 348  class documentViewer(Folder):
          if (docinfo.get('textURLPath',None)):
              page = self.getTextPage(docinfo=docinfo, pageinfo=pageinfo)
              pageinfo['textPage'] = page
-         pt = getattr(self.template, 'viewer_main')
+         tt = getattr(self, 'template')
+         pt = getattr(tt, 'viewer_main')
          return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
      def generateMarks(self,mk):
- Line 628  class documentViewer(Folder):
+ Line 641  class documentViewer(Folder):
                  docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
              except:
                  docinfo['lang']=''
+             try:
+                 docinfo['city']=getTextFromNode(dom.xpath("//bib/city")[0])
+             except:
+                 docinfo['city']=''
+             try:
+                 docinfo['number_of_pages']=getTextFromNode(dom.xpath("//bib/number_of_pages")[0])
+             except:
+                 docinfo['number_of_pages']=''
+             try:
+                 docinfo['series_volume']=getTextFromNode(dom.xpath("//bib/series_volume")[0])
+             except:
+                 docinfo['series_volume']=''
+             try:
+                 docinfo['number_of_volumes']=getTextFromNode(dom.xpath("//bib/number_of_volumes")[0])
+             except:
+                 docinfo['number_of_volumes']=''
+             try:
+                 docinfo['translator']=getTextFromNode(dom.xpath("//bib/translator")[0])
+             except:
+                 docinfo['translator']=''
+             try:
+                 docinfo['edition']=getTextFromNode(dom.xpath("//bib/edition")[0])
+             except:
+                 docinfo['edition']=''
+             try:
+                 docinfo['series_author']=getTextFromNode(dom.xpath("//bib/series_author")[0])
+             except:
+                 docinfo['series_author']=''
+             try:
+                 docinfo['publisher']=getTextFromNode(dom.xpath("//bib/publisher")[0])
+             except:
+                 docinfo['publisher']=''
+             try:
+                 docinfo['series_title']=getTextFromNode(dom.xpath("//bib/series_title")[0])
+             except:
+                 docinfo['series_title']=''
+             try:
+                 docinfo['isbn_issn']=getTextFromNode(dom.xpath("//bib/isbn_issn")[0])
+             except:
+                 docinfo['isbn_issn']=''
          return docinfo

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

Removed from v.1.166
changed lines
	Added in v.1.167