gnue/reports/src GRFilters.py GRRun.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/20 11:04:33

Modified files:
        reports/src    : GRFilters.py GRRun.py 

Log message:
        added empty namespace checks

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRRun.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.18 gnue/reports/src/GRFilters.py:1.19
*** gnue/reports/src/GRFilters.py:1.18  Fri Dec 13 04:24:04 2002
--- gnue/reports/src/GRFilters.py       Fri Dec 20 11:04:33 2002
***************
*** 47,62 ****
  
    def loadFilter(self, namespace, filter, destination, filter_options):
  
!     lastNamespace = namespace.split(':')[-1]
  
      try:
        parameters = self._config.filters[namespace + ":" + filter]
      except KeyError:
        if filter == 'raw':
          parameters = {'engine': 'raw'}
        else:
          raise FilterError, \
!           "Unable to find a filter definition for %s" % (namespace+":"+filter)
  
      try:
        module = dyn_import ('gnue.reports.adapters.filters.%s.%s' % 
(lastNamespace,parameters['engine']))
--- 47,66 ----
  
    def loadFilter(self, namespace, filter, destination, filter_options):
  
!     lastNamespace = namespace and namespace.split(':')[-1] or 'Raw'
  
      try:
+ 
+       if not namespace:
+         raise KeyError
+ 
        parameters = self._config.filters[namespace + ":" + filter]
      except KeyError:
        if filter == 'raw':
          parameters = {'engine': 'raw'}
        else:
          raise FilterError, \
!           "Unable to find a filter definition for %s:%s" % (namespace,filter)
  
      try:
        module = dyn_import ('gnue.reports.adapters.filters.%s.%s' % 
(lastNamespace,parameters['engine']))
Index: gnue/reports/src/GRRun.py
diff -c gnue/reports/src/GRRun.py:1.21 gnue/reports/src/GRRun.py:1.22
*** gnue/reports/src/GRRun.py:1.21      Mon Dec  2 14:30:57 2002
--- gnue/reports/src/GRRun.py   Fri Dec 20 11:04:33 2002
***************
*** 274,282 ****
  
      reportInfo = self.getReportInformation(location)
      namespace = reportInfo.getNamespace()
  
-     filters = reportInfo.getFilters()
-     filters.sort()
      filters.insert(0,('raw',{'description':'Do not process the XML with a 
filter. Emit raw XML.',
                         'engine': 'raw' }))
  
--- 274,286 ----
  
      reportInfo = self.getReportInformation(location)
      namespace = reportInfo.getNamespace()
+     
+     if namespace:
+       filters = reportInfo.getFilters()
+       filters.sort()
+     else: 
+       filters = []
  
      filters.insert(0,('raw',{'description':'Do not process the XML with a 
filter. Emit raw XML.',
                         'engine': 'raw' }))
  
***************
*** 296,302 ****
  
  
  
!     print 'Available filters for "%s" reports:' % namespace.split(':')[-1]
      print
      for filter, descr in processed:
        print "  %s  %s" % (filter.ljust(maxlen+2), descr)
--- 300,306 ----
  
  
  
!     print 'Available filters for "%s" reports:' % namespace and 
namespace.split(':')[-1] or 'Raw'
      print
      for filter, descr in processed:
        print "  %s  %s" % (filter.ljust(maxlen+2), descr)