Changeset 419:69205c9d9404 in documentViewer for documentViewer.py

Timestamp:

Jan 6, 2011, 3:44:18 PM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• documentViewer.py (modified) (5 diffs)

documentViewer.py

@@ -199 +199 @@
 
     def getQuery(self, **args):
-        """get query"""
+        """get query in search"""
         return self.template.fulltextclient.getQuery(**args)
-    
-    def getQueryResultHits(self, **args):
-        """get query"""
-        return self.template.fulltextclient.getQueryResultHits(**args)
-    
-    def getQueryResultHitsText(self, **args):
-        """get query"""
-        return self.template.fulltextclient.getQueryResultHitsText(**args)
-    
-    def getQueryResultHitsFigures(self, **args):
-        """get query"""
-        return self.template.fulltextclient.getQueryResultHitsFigures(**args)
-    
+     
     def getSearch(self, **args):
         """get search"""
@@ -225 +213 @@
         """get all gis places """
         return self.template.fulltextclient.getAllGisPlaces(**args)
-    
-    def getOrigPages(self, **args):
-        """get original page number """
-        return self.template.fulltextclient.getOrigPages(**args)
-    
-    def getAllPlaces(self, **args):
-        """get original page number """
-        return self.template.fulltextclient.getAllPlaces(**args)
-    
-    def getTocEntries(self, **args):
-        """get original page number """
-        return self.template.fulltextclient.getTocEntries(**args)
-    
-    def getFigureEntries(self, **args):
-        """get original page number """
-        return self.template.fulltextclient.getFigureEntries(**args)    
-    
-    def getNumPages(self, docinfo):
-        """get numpages"""
-        return self.template.fulltextclient.getNumPages(docinfo)
-   
-    def getNumTextPages(self, docinfo):
-        """get numpages text"""
-        return self.template.fulltextclient.getNumTextPages(docinfo)
-   
+       
     def getTranslate(self, **args):
         """get translate"""
@@ -336 +300 @@
         pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
         
+        if (docinfo.get('textURLPath',None)):
+            page = self.getTextPage(docinfo=docinfo, pageinfo=pageinfo)
+            pageinfo['textPage'] = page
         pt = getattr(self.template, 'viewer_main')               
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
@@ -725 +692 @@
             textUrl = getTextFromNode(textUrls[0])
             docinfo['textURLPath'] = textUrl
-            if not docinfo['imagePath']:
+            #if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getNumTextPages(docinfo)
+                #docinfo = self.getNumTextPages(docinfo)
+                  
          
         presentationUrls = dom.xpath("//texttool/presentation")
@@ -855 +823 @@
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
         pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
+        
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)