gnue common/src/dbdrivers/_dbsig/DBdriver.py co...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/07/18 14:18:33

Modified files:
        common/src/dbdrivers/_dbsig: DBdriver.py 
        common/src/dbdrivers/_pgsql: DBdriver.py 
        designer/src   : Designer.py MenuBar.py 
        designer/templates: __init__.py 

Log message:
        Atmospheric crack levels in KS have returned to normal.  Adjusting 
previous
        changes to compensate.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/MenuBar.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/__init__.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.52 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.53
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.52   Mon Jul 15 10:51:57 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Thu Jul 18 14:18:32 2002
***************
*** 238,244 ****
        if value == None:
          return "NULL"
        elif type(value) == types.FloatType:
!         return str(value)
        else:
          return "'%s'" % string.replace(str(value),"'",
                      "%s'" % self._escapeSingleQuote)
--- 238,247 ----
        if value == None:
          return "NULL"
        elif type(value) == types.FloatType:
!         if value==int(value):
!           return "%d" % value
!         else:
!           return str(value)
        else:
          return "'%s'" % string.replace(str(value),"'",
                      "%s'" % self._escapeSingleQuote)
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.19 
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.20
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.19   Mon Jul 15 10:53:59 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py        Thu Jul 18 14:18:32 2002
***************
*** 229,238 ****
               'type':'field', 'nativetype': rs[2],
               'required': rs[3] and not rs[4]}
  
!       if rs[2] in ('numeric','float4','float8','money','bool'):
          attrs['datatype']='number'
-       elif rs[2] in ('int8','int2','int4'):
-         attrs['datatype']='integer'
        elif rs[2] in ('date','time','timestamp','abstime','reltime'):
          attrs['datatype']='date'
        else:
--- 229,236 ----
               'type':'field', 'nativetype': rs[2],
               'required': rs[3] and not rs[4]}
  
!       if rs[2] in 
('numeric','float4','float8','money','bool','int8','int2','int4'):
          attrs['datatype']='number'
        elif rs[2] in ('date','time','timestamp','abstime','reltime'):
          attrs['datatype']='date'
        else:
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.44 gnue/designer/src/Designer.py:1.45
*** gnue/designer/src/Designer.py:1.44  Tue Jul 16 18:03:25 2002
--- gnue/designer/src/Designer.py       Thu Jul 18 14:18:32 2002
***************
*** 295,301 ****
    # Create a new instance
    #
    def newInstance(self, module, *args, **parms):
!     c = dyn_import("gnue.designer.%s.%s" % (module, 'Instance')).Instance
      return c(self, *args, **parms)
  
  
--- 295,301 ----
    # Create a new instance
    #
    def newInstance(self, module, *args, **parms):
!     c = dyn_import("%s.%s" % (module, 'Instance')).Instance
      return c(self, *args, **parms)
  
  
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.24 gnue/designer/src/MenuBar.py:1.25
*** gnue/designer/src/MenuBar.py:1.24   Thu Jul 11 01:39:02 2002
--- gnue/designer/src/MenuBar.py        Thu Jul 18 14:18:32 2002
***************
*** 47,53 ****
       self._frame = frame
  
    def addWizardLocation(self, location, template):
!     print "Adding %s" % location
      self._menuMappings[location] = template
  
    # Called after all the addWizardLocation's have been run
--- 47,53 ----
       self._frame = frame
  
    def addWizardLocation(self, location, template):
!     #print "Adding %s" % location
      self._menuMappings[location] = template
  
    # Called after all the addWizardLocation's have been run
Index: gnue/designer/templates/__init__.py
diff -c gnue/designer/templates/__init__.py:1.6 
gnue/designer/templates/__init__.py:1.7
*** gnue/designer/templates/__init__.py:1.6     Tue Jul 16 18:03:25 2002
--- gnue/designer/templates/__init__.py Thu Jul 18 14:18:32 2002
***************
*** 67,81 ****
  
    for dir in dircache.listdir(basedir):
      base = string.split(dir,'.')[0]
-     print "****", dir, base
      if not dir[0] in ('.','_') and not base in processed:
        print "FOO: ",dir
        processed.append(base)
        try:
-         print '%s.%s' % (package.__name__,base)
          templates.append(dyn_import(
             '%s.%s' % (package.__name__,base)).TemplateInformation)
        except ImportError:
-         print "error"
          pass
    return templates
--- 67,78 ----