gnue designer/src/TemplateChooser.py gnue-commo...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/09/17 22:43:31

Modified files:
        designer/src   : TemplateChooser.py 
        gnue-common/src: GConnections.py 
        gnue-common/src/dbdrivers/geas: DBdriver.py 
        gnuef/samples/zipcode: states.gfd zipcode.gfd 
        gnuef/src/GFObjects: GFDatabase.py 
Added files:
        gnue-common/src/dbdrivers/popy: DBdriver.py __init__.py 
        gnue-common/src/dbdrivers/psycopg: DBdriver.py __init__.py 

Log message:
        Misc little typos
        Added popy and psycopg drivers

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TemplateChooser.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GConnections.py.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/geas/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/popy/DBdriver.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/popy/__init__.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/psycopg/__init__.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/states.gfd.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/zipcode.gfd.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFDatabase.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/designer/src/TemplateChooser.py
diff -u gnue/designer/src/TemplateChooser.py:1.4 
gnue/designer/src/TemplateChooser.py:1.5
--- gnue/designer/src/TemplateChooser.py:1.4    Mon Sep 17 22:26:41 2001
+++ gnue/designer/src/TemplateChooser.py        Mon Sep 17 22:43:30 2001
@@ -27,8 +27,8 @@
 # NOTES:
 
 from wxPython.wx import *
+from gnue.common import GDebug
 from gnue.designer import TemplateBase
-
 from gnue.designer.templates import GetAvailablePackages
 
 class TemplateChooser:
@@ -94,6 +94,7 @@
 #          self.panel.GetBackgroundColour().Green() + 32,
 #          self.panel.GetBackgroundColour().Blue() + 32) )
 
+    GDebug.printMesg(2,"Packages=%s" % self.packages)
     for package in self.packages:
       page = wxPanel(self.notebook, -1, wxPoint(0,0), \
                      self.notebook.GetClientSize())
Index: gnue/gnue-common/src/GConnections.py
diff -u gnue/gnue-common/src/GConnections.py:1.16 
gnue/gnue-common/src/GConnections.py:1.17
--- gnue/gnue-common/src/GConnections.py:1.16   Fri Sep 14 19:10:14 2001
+++ gnue/gnue-common/src/GConnections.py        Mon Sep 17 22:43:30 2001
@@ -55,7 +55,6 @@
     self._loginHandler = loginHandler
     self._parser = GConfigParser()
 
-
     GDebug.printMesg(1,'Conn File: "%s"' % location)
 
     fileHandle = openResource(location)
Index: gnue/gnue-common/src/dbdrivers/geas/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.10 
gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.11
--- gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.10        Thu Aug 30 
18:28:27 2001
+++ gnue/gnue-common/src/dbdrivers/geas/DBdriver.py     Mon Sep 17 22:43:30 2001
@@ -326,9 +326,6 @@
     print "Please see http://projects.sault.org/orbit-python/ for the required 
python CORBA bindings"
     sys.exit(0)
 
-<<<<<<< DBdriver.py
-
-=======
 class DBdriver:
     def __init__ (self):
         GDebug.printMesg(1,"GNU Enterprise Application Server driver 
initializing")
@@ -554,8 +551,3 @@
   # Run the SQL statement 'statement'
 #  def sql(self, statement): 
 #    pass
-
-
-
-
->>>>>>> 1.5.2.3
Index: gnue/gnuef/samples/zipcode/states.gfd
diff -u gnue/gnuef/samples/zipcode/states.gfd:1.15 
gnue/gnuef/samples/zipcode/states.gfd:1.16
--- gnue/gnuef/samples/zipcode/states.gfd:1.15  Sun Aug 12 15:55:27 2001
+++ gnue/gnuef/samples/zipcode/states.gfd       Mon Sep 17 22:43:31 2001
@@ -8,8 +8,9 @@
     <width>39</width>
   </options>
 
-  <datasource name="dsstate" database="devel" table="state" cache="5" 
order_by="state"/>
-  <datasource name="dscities" database="devel" table="zipcode" cache="5" 
order_by="city" 
+  <database   name="newdevel" provider="psycopg" dbname="gnue" host="gnue"/>   
 
+  <datasource name="dsstate" database="newdevel" table="state" cache="5" 
order_by="state"/>
+  <datasource name="dscities" database="newdevel" table="zipcode" cache="5" 
order_by="city" 
               master="dsstate" detaillink="state_code" masterlink="state"/> 
 
   <page>
@@ -22,17 +23,18 @@
 
 
     <!-- Block of cities -->
+    <box x="1" y="8" width="37" height="8" label="State Cities"/>
     <block name="cities" datasource="dscities" rows="5">
-      <label text="City" x="2" y="9"/>
+      <label text="City" x="2" y="9" rows="1"/>
       <entry name="city" field="city" x="2" y="10" width="20" />
 
-      <label text="ST" x="23" y="9"/>
+      <label text="ST" x="23" y="9" rows="1"/>
       <entry name="state" field="state_code" x="23" y="10" width="3" />
 
-      <label text="Zip" x="27" y="9"/>
+      <label text="Zip" x="27" y="9" rows="1"/>
       <entry name="zip" field="zip" x="27" y="10" width="10" />
+      <entry name="zop" x="27" y="1" width="1" hidden=""/>
 
-      <box x="1" y="8" width="37" height="8" label="State Cities"/>
 
     </block>
 
Index: gnue/gnuef/samples/zipcode/zipcode.gfd
diff -u gnue/gnuef/samples/zipcode/zipcode.gfd:1.12 
gnue/gnuef/samples/zipcode/zipcode.gfd:1.13
--- gnue/gnuef/samples/zipcode/zipcode.gfd:1.12 Wed Aug 29 20:20:36 2001
+++ gnue/gnuef/samples/zipcode/zipcode.gfd      Mon Sep 17 22:43:31 2001
@@ -8,8 +8,9 @@
     <width>42</width>
   </options>
 
-  <datasource name="zips" database="devel" table="zipcode" cache="5" 
order_by="state_code,city" prequery=""/> 
-  <datasource name="validator" database="devel" table="state" prequery="" 
order_by="description"/>
+  <database   name="newdevel" provider="psycopg" dbname="gnue" host="gnue"/>
+  <datasource name="zips" database="newdevel" table="zipcode" cache="5" 
order_by="state_code,city" prequery=""/> 
+  <datasource name="validator" database="newdevel" table="state" prequery="" 
order_by="description"/>
 
   <page>
     <block name="zip" datasource="zips" rows="15">
Index: gnue/gnuef/src/GFObjects/GFDatabase.py
diff -u gnue/gnuef/src/GFObjects/GFDatabase.py:1.5 
gnue/gnuef/src/GFObjects/GFDatabase.py:1.6
--- gnue/gnuef/src/GFObjects/GFDatabase.py:1.5  Thu Sep 13 18:39:22 2001
+++ gnue/gnuef/src/GFObjects/GFDatabase.py      Mon Sep 17 22:43:31 2001
@@ -42,7 +42,8 @@
     GFObj.__init__(self, parent, "GFDatabase")
     self.comment = ""
     self.name = ""
-
+    self._inits =[self.initialize]
+    
   def _buildObject(self):
     self.name = string.lower(self.name)