Changeset 51:c5d3aabbf61b in documentViewer

Timestamp:

Jan 11, 2007, 8:27:17 PM (18 years ago)

Author:

dwinter

Branch:

default

Message:

textviewer now integrated, new modus auto introduced as standard for viewing

File:

• documentViewer.py (modified) (3 diffs)

documentViewer.py

@@ -101 +101 @@
 
     security.declareProtected('View','index_html')
-    def index_html(self,mode,url,viewMode="images",start=None,pn=1):
+    def index_html(self,mode,url,viewMode="auto",start=None,pn=1):
         '''
         view it
-        @param mode: defines which type of document is behind url
+        @param mode: defines which type of document is behind url (text,images or auto)
         @param url: url which contains display information
         @param viewMode: if images display images, if text display text, default is images
@@ -122 +122 @@
         pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
         pt = getattr(self.template, 'viewer_main')
+        
+        if viewMode=="auto": # automodus gewaehlt
+            if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert
+                viewMode="text"
+            else:
+                viewMode="images"
+                
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
   
@@ -419 +426 @@
         zLOG.LOG("documentViewer (getdocinfo)", zLOG.INFO,"mode: %s, url: %s"%(mode,url))
         # look for cached docinfo in session
-        # XXXX Sesion abgeschaltet
-        if self.REQUEST.SESSION.has_key('docinfo_XX'):
+        if self.REQUEST.SESSION.has_key('docinfo'):
             docinfo = self.REQUEST.SESSION['docinfo']
             # check if its still current