--- documentViewer/documentViewer.py	2010/06/18 19:41:28	1.65.2.2
+++ documentViewer/documentViewer.py	2010/06/16 18:27:04	1.69.2.3
@@ -2,20 +2,32 @@
 from OFS.Folder import Folder
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile 
+from Products.PythonScripts.standard import url_quote
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
 
+from Ft.Xml.Domlette import NonvalidatingReader
+from Ft.Xml.Domlette import PrettyPrint, Print
 from Ft.Xml import EMPTY_NAMESPACE, Parse
-import Ft.Xml.Domlette
+
+from xml.dom.minidom import parse, parseString
+
+from extraFunction import *
+
+
+import Ft.Xml.XPath
+import cStringIO
+import xmlrpclib
 import os.path
 import sys
+import cgi
 import urllib
-import urllib2
 import logging
 import math
+
 import urlparse 
-import cStringIO
+from types import *
 
 def logger(txt,method,txt2):
     """logging"""
@@ -43,7 +55,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
@@ -72,7 +84,7 @@ def getHttpData(url, data=None, num_trie
             if sys.version_info < (2, 6):
                 # set timeout on socket -- ugly :-(
                 import socket
-                socket.setdefaulttimeout(float(timeout))
+                socket.setdefaulttimeout(timeout)
                 response = urllib2.urlopen(url)
             else:
                 response = urllib2.urlopen(url,timeout=float(timeout))
@@ -145,7 +157,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 +184,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"""
@@ -217,7 +229,7 @@ class documentViewer(Folder):
         pt = getattr(self.template, 'thumbs_main_rss')
         
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert
                 viewMode="text"
             else:
                 viewMode="images"
@@ -243,16 +255,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.get("textURL",''): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text_dict"
             else:
                 viewMode="images"
@@ -266,8 +279,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 +318,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
 
@@ -568,8 +580,7 @@ class documentViewer(Folder):
         if viewerUrls and (len(viewerUrls) > 0):
             viewerUrl = getTextFromNode(viewerUrls[0])
             docinfo['viewerURL'] = viewerUrl
-        
-        # old style text URL
+                   
         textUrls = dom.xpath("//texttool/text")
         if textUrls and (len(textUrls) > 0):
             textUrl = getTextFromNode(textUrls[0])
@@ -581,14 +592,13 @@ class documentViewer(Folder):
             
             docinfo['textURL'] = textUrl
     
-        # new style text-url-path
         textUrls = dom.xpath("//texttool/text-url-path")
         if textUrls and (len(textUrls) > 0):
             textUrl = getTextFromNode(textUrls[0])
             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