--- documentViewer/documentViewer.py	2010/06/18 19:41:28	1.65.2.2
+++ documentViewer/documentViewer.py	2010/06/17 17:38:59	1.71
@@ -7,7 +7,7 @@ from AccessControl import getSecurityMan
 from Globals import package_home
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
-import Ft.Xml.Domlette
+from Ft.Xml.Domlette import PrettyPrint, Print
 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()
-    Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding)
+    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, docinfo):
+    def getNumPages(self, **args):
         """get numpages"""
-        return self.template.fulltextclient.getNumPages(docinfo)
+        return self.template.fulltextclient.getNumPages(**args)
 
     def getTranslate(self, **args):
         """get translate"""
@@ -266,7 +266,7 @@ class documentViewer(Folder):
         ret=""
         if mk is None:
             return ""
-        if not isinstance(mk, list):
+        if type(mk) is not ListType:
             mk=[mk]
         for m in mk:
             ret+="mk=%s"%m
@@ -305,8 +305,7 @@ 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 = urllib.urlencode(params)
+        ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
         url=self.REQUEST['URL1']+"?"+ps
         return url
 
@@ -588,7 +587,7 @@ class documentViewer(Folder):
             docinfo['textURLPath'] = textUrl
             if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getNumPages(docinfo)
+                docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht    
          
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag