Changeset 386:48d27e100d19 in documentViewer

Timestamp:

Oct 28, 2010, 3:44:20 PM (15 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (1 diff)
• documentViewer.py (modified) (2 diffs)

MpdlXmlTextServer.py

@@ -184 +184 @@
         selfurl=self.absolute_url()
         pn=pageinfo['current']
-        viewmode =pageinfo['viewMode']
-        text = self.getServerData("page-fragment.xql", "document=%s&mode=%s&pn=%s&export=%s"(docinfo['textURLPath'],mode, pn,'pdf'))
-        dom =Parse(text)
-        logging.debug("dom :%s"%(dom))
-        return dom
-        
+        
+        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 getBrowserType(self):
+        """get browser type object"""
+        if self.REQUEST.SESSION.has_key('browserType'):
+            return self.REQUEST.SESSION['browserType']
+        else:
+            bt = browserCheck(self)
+            self.REQUEST.SESSION.set('browserType', bt)    
+            logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt)                    
+            return bt
+   
         
     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()

documentViewer.py

@@ -182 +182 @@
         """get query"""
         return self.template.fulltextclient.getQuery(**args)
+    
+    def getPDF(self, **args):
+        """get query"""
+        return self.template.fulltextclient.getPDF(**args)
 
     def getSearch(self, **args):
@@ -663 +667 @@
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
-        #docinfo =self.getOrigPages(docinfo=docinfo)
+        
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen