r6386 - in trunk/gnue-reports/src: adapters/filters/MailMerge/_merge base

[jcater]

Author: jcater
Date: 2004-09-23 23:24:45 -0500 (Thu, 23 Sep 2004)
New Revision: 6386

Modified:
   trunk/gnue-reports/src/adapters/filters/MailMerge/_merge/MergeBase.py
   trunk/gnue-reports/src/base/GRSources.py
Log:
seems that someone broke datasources in reports as well by making GDataSource 
case sensitive :(

Modified: trunk/gnue-reports/src/adapters/filters/MailMerge/_merge/MergeBase.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/MailMerge/_merge/MergeBase.py       
2004-09-24 04:22:59 UTC (rev 6385)
+++ trunk/gnue-reports/src/adapters/filters/MailMerge/_merge/MergeBase.py       
2004-09-24 04:24:45 UTC (rev 6386)
@@ -53,7 +53,7 @@
 
   def __init__(self, *args, **params):
     Base.__init__(self, *args, **params)
-    self.fieldre = re.compile("%s(\\w+)%s" % \
+    self.fieldre = re.compile("%s(\\(\\w|[\\[,\\]]\\)+)%s" % \
           (self.FIELD_ENCLOSURE, self.FIELD_ENCLOSURE))
     self.recordCount = 1
     self.newPage = 0
@@ -129,7 +129,7 @@
     self.printComment (output, "\n"
                   "================================\n"
                   "This file was generated from the\n"
-                  "GNUe Reports / MailMerge Sample.\n"
+                  "GNUe Reports / MailMerge Filter.\n"
                   "(http://www.gnue.org/)\n"
                   "================================\n")
 
@@ -196,9 +196,30 @@
 
   def getFieldValue(self, matchObject):
     name = string.lower(matchObject.group(1))
+    if name[-1] == ']' and '[' in name:
+      name, extras = name[:-1].split('[',1)
+      extras = extras.split(',')
+      format = extras[0]
+      extras = extras[1:]
+    else:
+      format="text"
+      extras = []
+
     try:
+      return getattr(self,"as_%s" % format)(name, extras)
+    except:
+      print "WARNING: this MailMerge driver doesn't support '%s'" % format
+      return ""
+
+  def as_text(self, name, extras):
+    try:
       return self.escape(self.values[name])
     except KeyError:
       return ""
 
+  def as_barcode(self, name, extras):
+    if not hasattr(self,'as_image'):
+      print "WARNING: This MailMerge driver doesn't support barcodes"
+      return ""
 
+

Modified: trunk/gnue-reports/src/base/GRSources.py
===================================================================
--- trunk/gnue-reports/src/base/GRSources.py    2004-09-24 04:22:59 UTC (rev 
6385)
+++ trunk/gnue-reports/src/base/GRSources.py    2004-09-24 04:24:45 UTC (rev 
6386)
@@ -63,7 +63,7 @@
 
 
   def getDataSource(self, source):
-    return self._parent._datasourceDictionary[string.lower(source)]
+    return self._parent._datasourceDictionary[source]
 
 
 class GRDataSource (GDataSource.GDataSource):