gnue geas/tools/parse_load_sql.py gnue-config/d...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/09/02 11:05:52

Modified files:
        geas/tools     : parse_load_sql.py 
        gnue-config    : drop_all_tables.sql 
        gnue-config/base/acct/defaults: insert-en-acct-trans.geas 
        gnue-config/base/units/defaults: insert-en-unit.geas 
        gnue-config/sales/sales-order/defaults: insert-en-line-type.geas 

Log message:
        Correct errors and account for both create users and mod users.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/tools/parse_load_sql.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/drop_all_tables.sql.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/base/units/defaults/insert-en-unit.geas.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/geas/tools/parse_load_sql.py
diff -u gnue/geas/tools/parse_load_sql.py:1.9 
gnue/geas/tools/parse_load_sql.py:1.10
--- gnue/geas/tools/parse_load_sql.py:1.9       Sun Sep  2 09:56:32 2001
+++ gnue/geas/tools/parse_load_sql.py   Sun Sep  2 11:05:52 2001
@@ -27,7 +27,7 @@
 #
 # This program originally written by Neil Tiffin (address@hidden).
 #
-# $Id: parse_load_sql.py,v 1.9 2001/09/02 16:56:32 ntiffin Exp $
+# $Id: parse_load_sql.py,v 1.10 2001/09/02 18:05:52 ntiffin Exp $
 #
 # to use this program you will need the program "geas-oidgen"
 # compliled and located in the same dir as this file, then
@@ -163,8 +163,7 @@
                file_out = open( out_file_name, "w")
                all_lines = file_in.readlines()
                prefix_line = ""
-               value_replace_string = "\'" + get_uuid() + "\', 
\'system_load\', CURRENT_TIMESTAMP" 
-               field_replace_string = "sys_id, sys_cre_user, sys_cre_time"
+               field_replace_string = "sys_id, sys_cre_user, sys_cre_time, 
sys_mod_user, sys_mod_time"
                for line in all_lines:
                        m = re.match(r'^INSERT INTO', line)
                        if m != None:
@@ -174,6 +173,7 @@
                                continue
                                
                        new_line = re.sub( r'^\s*\(', prefix_line, line)
+                       value_replace_string = "\'" + get_uuid() + "\', 
\'system_load\', CURRENT_TIMESTAMP, \'system_load\', CURRENT_TIMESTAMP" 
                        new_line = string.replace(new_line, "GEAS-SYS", 
value_replace_string )
                        
                        file_out.write(new_line)
Index: gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas
diff -u gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas:1.3 
gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas:1.4
--- gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas:1.3   Sun Sep 
 2 09:56:33 2001
+++ gnue/gnue-config/base/acct/defaults/insert-en-acct-trans.geas       Sun Sep 
 2 11:05:52 2001
@@ -3,15 +3,15 @@
 -- This is a special file format that is converted by the
 -- GEAS sql loader into valid sql
 --
--- $Id: insert-en-acct-trans.geas,v 1.3 2001/09/02 16:56:33 ntiffin Exp $
+-- $Id: insert-en-acct-trans.geas,v 1.4 2001/09/02 18:05:52 ntiffin Exp $
 --
 -- typically the account number will be added based on the implementation.
 --
 
-INSERT INTO "base_acct__transactions" (GEAS-SYS, code, account, debit_credit, 
name) VALUES
-  (GEAS-SYS, 01, '000000', 'D', 'Customer Invoice Transaction');
-  (GEAS-SYS, 02, '000000', 'D', 'Customer Invoice Adj Transaction');
-  (GEAS-SYS, 03, '000000', 'C', 'Customer Credit Transaction');
-  (GEAS-SYS, 04, '000000', 'C', 'Customer Payment Transaction');
-  (GEAS-SYS, 05, '000000', 'C', 'Customer Payment Adj Transaction');
+INSERT INTO "base_acct__trans_def" (GEAS-SYS, code, account, debit_credit, 
name, active, abbrv) VALUES
+  (GEAS-SYS, 01, '000000', 'D', 'Customer Invoice Transaction', 'T', 'CIT');
+  (GEAS-SYS, 02, '000000', 'D', 'Customer Invoice Adj Transaction', 'T', 
'CIA');
+  (GEAS-SYS, 03, '000000', 'C', 'Customer Credit Transaction', 'T', 'CCT');
+  (GEAS-SYS, 04, '000000', 'C', 'Customer Payment Transaction', 'T', 'CPT');
+  (GEAS-SYS, 05, '000000', 'C', 'Customer Payment Adj Transaction', 'T', 
'CPAT');
 
Index: gnue/gnue-config/base/units/defaults/insert-en-unit.geas
diff -u gnue/gnue-config/base/units/defaults/insert-en-unit.geas:1.3 
gnue/gnue-config/base/units/defaults/insert-en-unit.geas:1.4
--- gnue/gnue-config/base/units/defaults/insert-en-unit.geas:1.3        Sun Sep 
 2 09:56:33 2001
+++ gnue/gnue-config/base/units/defaults/insert-en-unit.geas    Sun Sep  2 
11:05:52 2001
@@ -3,10 +3,10 @@
 -- This is a special file format that is converted by the
 -- GEAS sql loader into valid sql
 --
--- $Id: insert-en-unit.geas,v 1.3 2001/09/02 16:56:33 ntiffin Exp $
+-- $Id: insert-en-unit.geas,v 1.4 2001/09/02 18:05:52 ntiffin Exp $
 --
 
-INSERT INTO "unit__unit" (GEAS-SYS, code, desc, decimals) VALUES
+INSERT INTO "unit__unit" (GEAS-SYS, code, "desc", decimals) VALUES
   (GEAS-SYS,'lbs',  'pounds', 3);
   (GEAS-SYS,'kg',   'kilogram', 3);
   (GEAS-SYS,'each', 'each', 0);
Index: gnue/gnue-config/drop_all_tables.sql
diff -u gnue/gnue-config/drop_all_tables.sql:1.5 
gnue/gnue-config/drop_all_tables.sql:1.6
--- gnue/gnue-config/drop_all_tables.sql:1.5    Thu Aug 23 16:04:08 2001
+++ gnue/gnue-config/drop_all_tables.sql        Sun Sep  2 11:05:52 2001
@@ -87,4 +87,10 @@
 DROP TABLE gl__period;
 DROP TABLE gl__trans;
 DROP TABLE gl__year;
-DROP TABLE pur__use_vendor;
\ No newline at end of file
+DROP TABLE pur__use_vendor;
+DROP TABLE  ar__detail;
+DROP TABLE  ar__header;
+DROP TABLE  ar__sales_tx;
+DROP TABLE  base_acct__trans_def;
+DROP TABLE  org__line_status;
+DROP TABLE  org__line_type;
Index: gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas
diff -u 
gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas:1.3 
gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas:1.4
--- gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas:1.3    
Sun Sep  2 09:56:33 2001
+++ gnue/gnue-config/sales/sales-order/defaults/insert-en-line-type.geas        
Sun Sep  2 11:05:52 2001
@@ -5,10 +5,10 @@
 -- This is a special file format that is converted by the
 -- GEAS sql loader into valid sql
 --
--- $Id: insert-en-line-type.geas,v 1.3 2001/09/02 16:56:33 ntiffin Exp $
+-- $Id: insert-en-line-type.geas,v 1.4 2001/09/02 18:05:52 ntiffin Exp $
 --
 
-INSERT INTO so__line_type (GEAS-SYS, code, desc) VALUES
+INSERT INTO so__line_type (GEAS-SYS, code, "desc") VALUES
   (GEAS-SYS, 'Svc', 'Service');
   (GEAS-SYS, 'Tax', 'Tax');
   (GEAS-SYS, 'Frt', 'Freight');