Changeset 427:70db19d7b3b1 in documentViewer

Timestamp:

Jan 20, 2011, 4:04:21 PM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

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

MpdlXmlTextServer.py

@@ -4 +4 @@
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 
+import md5
 import sys
 import logging
@@ -55 +56 @@
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()
-        
         data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&optionToggle=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization,optionToggle ,urllib.quote(highlightQuery)))
-                              
         pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url)
         pagedom = Parse(pagexml)
@@ -480 +479 @@
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
-
-
-    

documentViewer.py

@@ -95 +95 @@
             nav5= string.split(ie1, "/")[1]
             logging.debug("FIREFOX: %s"%(nav5))
-            bt['versFirefox']=string.split(nav5, ".")[1]                   
+            bt['versFirefox']=nav5[0:3]                   
     except:pass
     #Opera identification