--- documentViewer/MpdlXmlTextServer.py	2010/10/25 10:41:12	1.194
+++ documentViewer/MpdlXmlTextServer.py	2010/11/03 14:59:05	1.204
@@ -38,7 +38,7 @@ class MpdlXmlTextServer(SimpleItem):
         url = self.serverUrl+method
         return documentViewer.getHttpData(url,data,timeout=self.timeout)
 
-    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None):
+    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None, optionsClose=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
         url = docinfo['url']
@@ -135,9 +135,13 @@ class MpdlXmlTextServer(SimpleItem):
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
         dom = Parse(text)
         result= dom.xpath("//result/resultPage")
+         
         docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo
     
+    #def getQueryResultHits(self, docinfo=None, pageinfo=None):
+        
+    
     def getGisPlaces(self, docinfo=None, pageinfo=None):
         """ Show all Gis Places of whole Page"""
         xpath='//place'
@@ -178,9 +182,25 @@ class MpdlXmlTextServer(SimpleItem):
             logging.debug("getALLGisPlaces :%s"%(myList))
         return myList
     
+    
+    def getPDF (self, docinfo=None, pageinfo=None):
+        """Show and Save different Pages as PDF in Options"""
+        selfurl=self.absolute_url()
+        pn=pageinfo['current']
+        
+        viewMode =pageinfo['viewMode']
+        
+        #text = ("page-fragment.xql","document=%s&mode=%s&pn=%s&export=%s"%(docinfo['textURLPath'], 'text',  pn,'pdf'))
+        #text = self.getServerData("page-fragment.xql", "document=%s&mode=%s&pn=%s&export=%s"(docinfo['textURLPath'],'text', pn,'pdf'))
+        #logging.debug("text :%s"%(text))
+        #dom =Parse(text)
+        #logging.debug("text :%s"%(text))
+        #return text 
+           
     def getOrigPages (self, docinfo=None, pageinfo=None):
         """Show original page """
         docpath = docinfo['textURLPath'] 
+        logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
         #url = docinfo['url']
         selfurl = self.absolute_url()
         pn =pageinfo['current']
@@ -196,16 +216,17 @@ class MpdlXmlTextServer(SimpleItem):
             return originalPage
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None,  viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionsClose=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
         url = docinfo['url']
         name = docinfo['name']
         viewMode= pageinfo['viewMode']
+        sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
+        
         tocMode = pageinfo['tocMode']
-        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
@@ -213,13 +234,13 @@ class MpdlXmlTextServer(SimpleItem):
             textmode = "textPollux"
         else:
             textmode = mode
-        logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
+        #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
         if highlightQuery is not None:
-            textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
-            #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn)           
-            logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
+            textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)           
+            #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         pagexml = self.getServerData("page-fragment.xql",textParam)
+        logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)
         
         pagedom = Parse(pagexml)
@@ -315,7 +336,7 @@ class MpdlXmlTextServer(SimpleItem):
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
         return data
     
-    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):
+    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionsClose=None):
          """number of"""
          docpath = docinfo['textURLPath'] 
          pagesize = pageinfo['queryPageSize']
@@ -330,6 +351,7 @@ class MpdlXmlTextServer(SimpleItem):
          pagedom = Parse(pagexml)
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))
+         logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch))
          tc=int((tocSearch/10)+1)
          logging.debug("documentViewer (gettoc) tc: %s"%(tc))
          return tc