Changeset 436:0baf4e761be7 in documentViewer

Timestamp:

Mar 7, 2011, 2:08:07 PM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (6 diffs)
• documentViewer.py (modified) (2 diffs)

MpdlXmlTextServer.py

@@ -86 +86 @@
                             pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))
                             hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)                                           
-                logging.debug("PUREXML :%s"%(serializeNode(pagenode)))
+                #logging.debug("PUREXML :%s"%(serializeNode(pagenode)))
                 return serializeNode(pagenode)        
         if (queryType=="fulltextMorph"):
@@ -151 +151 @@
             hrefList.append(href)
             myList = ",".join(hrefList)
-        logging.debug("getGisPlaces :%s"%(myList))                             
+        #logging.debug("getGisPlaces :%s"%(myList))                             
         return myList
     
@@ -172 +172 @@
             hrefList.append(href)
             myList = ",".join(hrefList)
-            logging.debug("getALLGisPlaces :%s"%(myList))
+            #logging.debug("getALLGisPlaces :%s"%(myList))
         return myList
           
@@ -203 +203 @@
         #original Pages
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
-        if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
+        """if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
             if len(pagedivs)>0:
                 docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])
+                logging.debug("ORIGINAL PAGE: %s"%(docinfo['pageNumberOrig']))
         
         #original Pages Norm
@@ -212 +213 @@
             if len(pagedivs)>0:
                 docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0])
-        
+                logging.debug("ORIGINAL PAGE NORM: %s"%(docinfo['pageNumberOrigNorm']))
+        """
         #figureEntries
         pagedivs = dom.xpath("//div[@class='countFigureEntries']")
@@ -364 +366 @@
         return "no text here"
     
+    def getOrigPages(self, docinfo=None, pageinfo=None):
+        docpath = docinfo['textURLPath']
+        pn =pageinfo['current']
+        selfurl = self.absolute_url()   
+        pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn))
+        dom = Parse(pagexml)
+        pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
+        if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
+            if len(pagedivs)>0:
+                docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])        
+                return docinfo['pageNumberOrig']
+    
+    def getOrigPagesNorm(self, docinfo=None, pageinfo=None):
+        docpath = docinfo['textURLPath']
+        pn =pageinfo['current']
+        selfurl = self.absolute_url()   
+        pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn))
+        dom = Parse(pagexml)
+        pagedivs = dom.xpath("//div[@class='pageNumberOrigNorm']")
+        if pagedivs == dom.xpath("//div[@class='pageNumberOrigNorm']"):
+            if len(pagedivs)>0:
+                docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0])        
+                return docinfo['pageNumberOrigNorm']
+
+                
     def getTranslate(self, query=None, language=None):
         """translate into another languages"""

documentViewer.py

@@ -47 +47 @@
     """returns a string containing node as XML"""
     stream = cStringIO.StringIO()
-    logging.debug("BUF: %s"%(stream))
+    #logging.debug("BUF: %s"%(stream))
     Ft.Xml.Domlette.PrettyPrint(node, stream=stream, encoding=encoding)
     s = stream.getvalue()
-    logging.debug("BUF: %s"%(s))
+    #logging.debug("BUF: %s"%(s))
     stream.close()
     return s
@@ -231 +231 @@
         """get page"""
         return self.template.fulltextclient.getTextPage(**args)
-    
+
+    def getOrigPages(self, **args):
+        """get page"""
+        return self.template.fulltextclient.getOrigPages(**args)
+    
+    def getOrigPagesNorm(self, **args):
+        """get page"""
+        return self.template.fulltextclient.getOrigPagesNorm(**args)
+
     def getQuery(self, **args):
         """get query in search"""