[Phpgroupware-cvs] phpgwapi/setup default_records.inc.php, 1.4.2.6.2.5, 1.4.2.6.2.6 setup.inc.php, 1.37.2.6.2.12, 1.37.2.6.2.13 tables_current.inc.php, 1.32.2.6.2.10, 1.32.2.6.2.11 tables_update.inc.php, 1.53.2.9.2.19, 1.53.2.9.2.20

[Chris Weiss <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv4760/phpgwapi/setup

Modified Files:
      Tag: Version-0_9_16-branch
        default_records.inc.php setup.inc.php tables_current.inc.php 
        tables_update.inc.php 
Log Message:
improved logging classes, patch #2100


Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/default_records.inc.php,v
retrieving revision 1.4.2.6.2.5
retrieving revision 1.4.2.6.2.6
diff -C2 -d -r1.4.2.6.2.5 -r1.4.2.6.2.6
*** default_records.inc.php     16 Oct 2003 00:37:04 -0000      1.4.2.6.2.5
--- default_records.inc.php     19 Oct 2003 01:34:03 -0000      1.4.2.6.2.6
***************
*** 154,157 ****
--- 154,159 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES 
('phpgwapi','sessions_checkip','True')");
  
+       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES ('phpgwapi','log_levels', '" . 
serialize(array( 'global_level' => 'E', 'module' => array(), 'user' => 
array())) ."')");
+ 
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_interserv(server_name,server_host,server_url,trust_level,trust_rel,server_mode)
 VALUES ('phpGW 
cvsdemo',NULL,'http://www.phpgroupware.org/cvsdemo/xmlrpc.php',99,0,'xmlrpc')");
  

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_current.inc.php,v
retrieving revision 1.32.2.6.2.10
retrieving revision 1.32.2.6.2.11
diff -C2 -d -r1.32.2.6.2.10 -r1.32.2.6.2.11
*** tables_current.inc.php      8 Sep 2003 13:26:38 -0000       1.32.2.6.2.10
--- tables_current.inc.php      19 Oct 2003 01:34:03 -0000      1.32.2.6.2.11
***************
*** 268,295 ****
                                'log_id' => array('type' => 'auto','precision' 
=> '4','nullable' => False),
                                'log_date' => array('type' => 
'timestamp','nullable' => False),
!                               'log_user' => array('type' => 'int','precision' 
=> '4','nullable' => False),
!                               'log_app' => array('type' => 
'varchar','precision' => '50','nullable' => False),
!                               'log_severity' => array('type' => 
'char','precision' => '1','nullable' => False)
                        ),
                        'pk' => array('log_id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
-               'phpgw_log_msg' => array(
-                       'fd' => array(
-                               'log_msg_log_id' => array('type' => 
'int','precision' => '4','nullable' => False),
-                               'log_msg_seq_no' => array('type' => 
'int','precision' => '4','nullable' => False),
-                               'log_msg_date' => array('type' => 
'timestamp','nullable' => False),
-                               'log_msg_tx_fid' => array('type' => 
'varchar','precision' => '4','nullable' => True),
-                               'log_msg_tx_id' => array('type' => 
'varchar','precision' => '4','nullable' => True),
-                               'log_msg_severity' => array('type' => 
'char','precision' => '1','nullable' => False),
-                               'log_msg_code' => array('type' => 
'varchar','precision' => '30','nullable' => False),
-                               'log_msg_msg' => array('type' => 
'text','nullable' => False),
-                               'log_msg_parms' => array('type' => 
'text','nullable' => False),
-                               'log_msg_file' => array('type' => 
'varchar','precision' => '255','nullable' => False),
-                               'log_msg_line' => array('type' => 
'int','precision' => '4','nullable' => False)
-                       ),
-                       'pk' => array('log_msg_log_id','log_msg_seq_no'),
                        'fk' => array(),
                        'ix' => array(),
--- 268,280 ----
                                'log_id' => array('type' => 'auto','precision' 
=> '4','nullable' => False),
                                'log_date' => array('type' => 
'timestamp','nullable' => False),
!                               'log_account_id' => array('type' => 
'int','precision' => '4','nullable' => False),
!                               'log_account_lid' => array('type' => 
'varchar','precision' => '25','nullable' => False),
!                               'log_app' => array('type' => 
'varchar','precision' => '25','nullable' => False),
!                               'log_severity' => array('type' => 
'char','precision' => '1','nullable' => False),
!                               'log_file' => array('type' => 
'varchar','precision' => '255','nullable' => False, 'default' => ''),
!                               'log_line' => array('type' => 'int','precision' 
=> '4','nullable' => False, 'default' => '0'),
!                               'log_msg' => array('type' => 'text','nullable' 
=> False)
                        ),
                        'pk' => array('log_id'),
                        'fk' => array(),
                        'ix' => array(),

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/setup.inc.php,v
retrieving revision 1.37.2.6.2.12
retrieving revision 1.37.2.6.2.13
diff -C2 -d -r1.37.2.6.2.12 -r1.37.2.6.2.13
*** setup.inc.php       8 Oct 2003 06:27:32 -0000       1.37.2.6.2.12
--- setup.inc.php       19 Oct 2003 01:34:03 -0000      1.37.2.6.2.13
***************
*** 38,42 ****
        $setup_info['phpgwapi']['tables'][]  = 'phpgw_addressbook_extra';
        $setup_info['phpgwapi']['tables'][]  = 'phpgw_log';
-       $setup_info['phpgwapi']['tables'][]  = 'phpgw_log_msg';
        $setup_info['phpgwapi']['tables'][]  = 'phpgw_interserv';
        $setup_info['phpgwapi']['tables'][]  = 'phpgw_vfs';
--- 38,41 ----

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.19
retrieving revision 1.53.2.9.2.20
diff -C2 -d -r1.53.2.9.2.19 -r1.53.2.9.2.20
*** tables_update.inc.php       8 Oct 2003 06:27:32 -0000       1.53.2.9.2.19
--- tables_update.inc.php       19 Oct 2003 01:34:03 -0000      1.53.2.9.2.20
***************
*** 1748,1751 ****
--- 1748,1752 ----
                        'uc' => array()
                        ),'ab_id');
+               
                // Paste this below!!!
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.509';
***************
*** 1776,1779 ****
--- 1777,1803 ----
                $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_languages(lang_id, lang_name, available) VALUES('iu', 'Inuktitut', 
'No')");
                $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_languages(lang_id, lang_name, available) VALUES('ug', 'Uigur', 'No')");
+ 
+               // Set up the new logging tables        
+               $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log_msg');
+               // just drop and re-create.  We don't need to save it and the 
structure has changed alot
+               $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_log');
+               $GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_log',array(
+                       'fd' => array(
+                               'log_id' => array('type' => 'auto','precision' 
=> '4','nullable' => False),
+                               'log_date' => array('type' => 
'timestamp','nullable' => False),
+                               'log_account_id' => array('type' => 
'int','precision' => '4','nullable' => False),
+                               'log_account_lid' => array('type' => 
'varchar','precision' => '25','nullable' => False),
+                               'log_app' => array('type' => 
'varchar','precision' => '25','nullable' => False),
+                               'log_severity' => array('type' => 
'char','precision' => '1','nullable' => False),
+                               'log_file' => array('type' => 
'varchar','precision' => '255','nullable' => False, 'default' => ''),
+                               'log_line' => array('type' => 'int','precision' 
=> '4','nullable' => False, 'default' => '0'),
+                               'log_msg' => array('type' => 'text','nullable' 
=> False)
+                       ),
+                       'pk' => array('log_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+               $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES ('phpgwapi','log_levels', '" . 
serialize(array( 'global_level' => 'E', 'module' => array(), 'user' => 
array())) ."')");
                
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.14.510';