--- documentViewer/documentViewer.py	2010/06/17 17:35:24	1.65.2.1
+++ documentViewer/documentViewer.py	2010/06/18 19:41:28	1.65.2.2
@@ -7,7 +7,7 @@ from AccessControl import getSecurityMan
 from Globals import package_home
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
-from Ft.Xml.Domlette import PrettyPrint, Print
+import Ft.Xml.Domlette
 import os.path
 import sys
 import urllib
@@ -43,7 +43,7 @@ def getTextFromNode(nodename):
 def serializeNode(node, encoding='utf-8'):
     """returns a string containing node as XML"""
     buf = cStringIO.StringIO()
-    Print(node, stream=buf, encoding=encoding)
+    Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding)
     s = buf.getvalue()
     buf.close()
     return s
@@ -172,9 +172,9 @@ class documentViewer(Folder):
         """get search"""
         return self.template.fulltextclient.getSearch(**args)
 
-    def getNumPages(self, **args):
+    def getNumPages(self, docinfo):
         """get numpages"""
-        return self.template.fulltextclient.getNumPages(**args)
+        return self.template.fulltextclient.getNumPages(docinfo)
 
     def getTranslate(self, **args):
         """get translate"""
@@ -266,8 +266,8 @@ class documentViewer(Folder):
         ret=""
         if mk is None:
             return ""
-    	if type(mk) is not ListType:
-    		mk=[mk]
+        if not isinstance(mk, list):
+            mk=[mk]
         for m in mk:
             ret+="mk=%s"%m
         return ret
@@ -305,7 +305,8 @@ class documentViewer(Folder):
                 params["url"] = getParentDir(params["url"])
                 
         # quote values and assemble into query string
-        ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
+        #ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
+        ps = urllib.urlencode(params)
         url=self.REQUEST['URL1']+"?"+ps
         return url
 
@@ -587,7 +588,7 @@ class documentViewer(Folder):
             docinfo['textURLPath'] = textUrl
             if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht    
+                docinfo = self.getNumPages(docinfo)
          
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag