--- documentViewer/documentViewer.py	2010/10/26 14:37:10	1.145
+++ documentViewer/documentViewer.py	2010/10/28 15:44:20	1.147
@@ -181,6 +181,10 @@ class documentViewer(Folder):
     def getQuery(self, **args):
         """get query"""
         return self.template.fulltextclient.getQuery(**args)
+    
+    def getPDF(self, **args):
+        """get query"""
+        return self.template.fulltextclient.getPDF(**args)
 
     def getSearch(self, **args):
         """get search"""
@@ -662,7 +666,7 @@ class documentViewer(Folder):
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
-        #docinfo =self.getOrigPages(docinfo=docinfo)
+        
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 
              # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten
@@ -772,12 +776,12 @@ class documentViewer(Folder):
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
         #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',None)
-        pageinfo['query'] = self.REQUEST.get('query',None)
-        pageinfo['queryType'] = self.REQUEST.get('queryType',None)
+        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
+        pageinfo['query'] = self.REQUEST.get('query','')
+        pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
-        pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery',None)
+        pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
         pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')