gnue common/src/GConditions.py common/src/GObje...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/20 22:11:52

Modified files:
        common/src     : GConditions.py GObjects.py 
        common/src/dbdrivers/_dbsig: DBdriver.py 
        reports/src    : GRLayout.py 

Log message:
        Added in papo's null and not null conditionals, formatting cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConditions.py.diff?only_with_tag=common-0-4-1-branch&tr1=1.20&tr2=1.20.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GObjects.py.diff?only_with_tag=common-0-4-1-branch&tr1=1.41&tr2=1.41.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?only_with_tag=common-0-4-1-branch&tr1=1.62&tr2=1.62.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRLayout.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text

Patches:
Index: gnue/common/src/GConditions.py
diff -c gnue/common/src/GConditions.py:1.19 gnue/common/src/GConditions.py:1.20
*** gnue/common/src/GConditions.py:1.19 Sun Oct 27 21:10:26 2002
--- gnue/common/src/GConditions.py      Tue Nov 12 18:00:18 2002
***************
*** 158,163 ****
--- 158,169 ----
  ##         'BaseClass': GConditions,
  ##         'SingleInstance': 1,
  ##         'ParentTags':  None },
+ 
+       'conditions':       {
+          'BaseClass': GCondition,
+          'ParentTags':  ('conditions','and','or','not','negate'),
+          'Deprecated': 'Use the <condition> tag instead.',
+       },
        'condition':       {
           'BaseClass': GCondition,
           'ParentTags':  ('conditions','and','or','not','negate') },
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.41 gnue/common/src/GObjects.py:1.42
*** gnue/common/src/GObjects.py:1.41    Mon Nov  4 01:01:59 2002
--- gnue/common/src/GObjects.py Tue Nov 19 20:01:36 2002
***************
*** 199,204 ****
--- 199,210 ----
      pos = indent
      attrs = self.__dict__.keys()
      attrs.sort()
+     
+     # Make 'name' first
+     if 'name' in attrs:
+       attrs.pop(attrs.index('name'))
+       attrs.insert(0,'name')
+ 
      for attribute in attrs:
        # skip keys beginning with _
        if attribute[0] == "_":
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.61 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.62
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.61   Thu Nov  7 22:21:01 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Mon Nov 11 15:51:16 2002
***************
*** 544,550 ****
              whereClause)
      else:
        self._primaryIdSelect = None
!       q = "SELECT %s* FROM %s%s" % (self.distinct, self.table,
                          whereClause)
  
      if hasattr(self,'order_by') and not forDetail:
--- 544,550 ----
              whereClause)
      else:
        self._primaryIdSelect = None
!       q = "SELECT %s* FROM %s%s" % (distinct, self.table,
                          whereClause)
  
      if hasattr(self,'order_by') and not forDetail:
***************
*** 568,574 ****
          whereClause = ' WHERE %s' % (additionalSQL)
  
  
!     q = "SELECT count(*) FROM %s%s" % (self.table, whereClause)
  
      GDebug.printMesg(5,q)
  
--- 568,574 ----
          whereClause = ' WHERE %s' % (additionalSQL)
  
  
!     q = "SELECT count(%s*) FROM %s%s" % (distinct, self.table, whereClause)
  
      GDebug.printMesg(5,q)
  
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.45 gnue/reports/src/GRLayout.py:1.46
*** gnue/reports/src/GRLayout.py:1.45   Tue Nov 12 22:00:13 2002
--- gnue/reports/src/GRLayout.py        Wed Nov 20 22:11:52 2002
***************
*** 257,263 ****
          
        for child in self._children:
          if child._type == "_content_":
!            dest.write(child.getContent())
          else:
            # Handle GRSections specially as
            # they require extra logic
--- 257,263 ----
          
        for child in self._children:
          if child._type == "_content_":
!           dest.write(child.getContent())
          else:
            # Handle GRSections specially as
            # they require extra logic
***************
*** 271,282 ****
  
              # ..otherwise call the GRSection's process method.
              else:
!                 nextSection = child.process(dest, mapper,
!                  isfirst=1,
!                  islast=(nextSection == None) or \
!                     (nextSection._name not in (child._childSections)),
!                  firstSection=firstSection,
!                  nextSection=nextSection)
            # Don't allow the processing to enter trigger objects
            elif isinstance(child, GTrigger):
              pass
--- 271,280 ----
  
              # ..otherwise call the GRSection's process method.
              else:
!               nextSection = child.process(dest, mapper,isfirst=1,
!                                           islast=(nextSection == None) or \
!                                           (nextSection._name not in 
(child._childSections)),
!                                           firstSection=firstSection, 
nextSection=nextSection)
            # Don't allow the processing to enter trigger objects
            elif isinstance(child, GTrigger):
              pass