Changeset 490:6f116b86a226 in documentViewer for SrvTxtUtils.py

Timestamp:

Aug 29, 2011, 2:39:50 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more new template stuff. moved ImageFile? index method to SrvTxtUtils?

File:

• SrvTxtUtils.py (modified) (4 diffs)

SrvTxtUtils.py

@@ -1 +1 @@
 """Utility methods for handling XML, reading HTTP, etc"""
 
+from App.ImageFile import ImageFile
+from App.Common import rfc1123_date
+
 import sys
+import os
+import stat
 import urllib
 import urllib2
@@ -7 +12 @@
 
 
-srvTxtUtilsVersion = "1.0"
+srvTxtUtilsVersion = "1.3"
 
 def getInt(number, default=0):
@@ -16 +21 @@
         return int(default)
 
-def getText(node):
+def getAt(array, idx, default=None):
+    """returns element idx from array or default (in case of problems)"""
+    try:
+        return array[idx]
+    except:
+        return default
+
+def getText(node, recursive=0):
     """returns all text content of a node and its subnodes"""
     if node is None:
-        return ""
+        return ''
+    
     # ElementTree:
-    text = node.text or ""
+    text = node.text or ''
     for e in node:
-        text += getText(e)
+        if recursive:
+            text += getText(e)
+        else:
+            text += e.text or ''
         if e.tail:
             text += e.tail
@@ -82 +98 @@
     #return None
 
+
+def refreshingImageFileIndexHtml(self, REQUEST, RESPONSE):
+    """index_html method for App.ImageFile that updates the file info for each request."""
+    stat_info = os.stat(self.path)
+    self.size = stat_info[stat.ST_SIZE]
+    self.lmt = float(stat_info[stat.ST_MTIME]) or time.time()
+    self.lmh = rfc1123_date(self.lmt)
+    # call original method
+    return ImageFile.index_html(self, REQUEST, RESPONSE)
+