diff SrvTxtUtils.py @ 12:7f0e2b656e5c

more work for non-bib metadata
author casties
date Fri, 29 Jul 2011 18:28:06 +0200
parents e4bae49e657b
children db5af17f4933
line wrap: on
line diff
--- a/SrvTxtUtils.py	Fri Jul 29 14:45:13 2011 +0200
+++ b/SrvTxtUtils.py	Fri Jul 29 18:28:06 2011 +0200
@@ -6,7 +6,7 @@
 import logging
 
 
-srvTxtUtilsVersion = "1.1"
+srvTxtUtilsVersion = "1.2"
 
 def getInt(number, default=0):
     """returns always an int (0 in case of problems)"""
@@ -22,14 +22,18 @@
     except:
         return default
 
-def getText(node):
+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