--- documentViewer/documentViewer.py	2010/06/18 19:41:28	1.65.2.2
+++ documentViewer/documentViewer.py	2010/06/28 10:37:12	1.69.2.13
@@ -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
@@ -145,7 +145,7 @@ class documentViewer(Folder):
         self._setObject('template',templateFolder) # old style
         try:
             import MpdlXmlTextServer
-            textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName)
+            textServer = MpdlXmlTextServer(id='fulltextclient')
             #templateFolder['fulltextclient'] = xmlRpcClient
             templateFolder._setObject('fulltextclient',textServer)
         except Exception, e:
@@ -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"""
@@ -243,16 +243,17 @@ class documentViewer(Folder):
             return "ERROR: template folder missing!"
             
         if not getattr(self, 'digilibBaseUrl', None):
-            self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
+            self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
             
         docinfo = self.getDocinfo(mode=mode,url=url)
         
+        
         if tocMode != "thumbs":
             # get table of contents
             docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
             
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text_dict"
             else:
                 viewMode="images"
@@ -266,8 +267,8 @@ class documentViewer(Folder):
         ret=""
         if mk is None:
             return ""
-        if not isinstance(mk, list):
-            mk=[mk]
+    	if type(mk) is not ListType:
+    		mk=[mk]
         for m in mk:
             ret+="mk=%s"%m
         return ret
@@ -305,8 +306,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 +588,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
@@ -721,6 +721,12 @@ class documentViewer(Folder):
         pageinfo['searchPN'] =self.REQUEST.get('searchPN','1')
         pageinfo['sn'] =self.REQUEST.get('sn','')
         return pageinfo
+       
+    def getOverview(self, mode="text" , docinfo=None, pageinfo=None, url=None, viewMode="auto", start=None,pn=1,textURLPath="auto", **args):
+        """overview mode all thumbnails in one window"""      
+        docinfo = self.getDocinfo(mode=mode,url=url)
+        pageinfo = self.getPageinfo(current=pn,docinfo=docinfo)
+        return (docinfo, pageinfo, viewMode)
     
 def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None):
         """init document viewer"""