[Phpgroupware-cvs] CVS: wcm/setup setup.inc.php,1.3,1.4 tables_current.inc.php,1.2,1.3 tables_update.inc.php,1.1,1.2

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/setup
In directory subversions:/tmp/cvs-serv25565

Modified Files:
        setup.inc.php tables_current.inc.php tables_update.inc.php 
Log Message:
Adding some fields for sites; fix broken update



Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/setup/setup.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** setup.inc.php       9 Feb 2002 03:13:49 -0000       1.3
--- setup.inc.php       16 Feb 2002 22:54:06 -0000      1.4
***************
*** 15,19 ****
        $setup_info['wcm']['name']      = 'wcm';
        $setup_info['wcm']['title']     = 'Web Content Manager';
!       $setup_info['wcm']['version']   = '0.1.1';
        $setup_info['wcm']['app_order'] = 4;
        $setup_info['wcm']['enable']    = 1;
--- 15,19 ----
        $setup_info['wcm']['name']      = 'wcm';
        $setup_info['wcm']['title']     = 'Web Content Manager';
!       $setup_info['wcm']['version']   = '0.1.2';
        $setup_info['wcm']['app_order'] = 4;
        $setup_info['wcm']['enable']    = 1;

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/setup/tables_current.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** tables_current.inc.php      9 Feb 2002 03:13:49 -0000       1.2
--- tables_current.inc.php      16 Feb 2002 22:54:06 -0000      1.3
***************
*** 29,33 ****
                                'site_footer'   => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
                                'site_langs'    => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
!                               'site_version'  => array('type' => 'varchar', 
'precision' => 64,  'nullable' => True)
                        ),
                        'pk' => array('site_id'),
--- 29,36 ----
                                'site_footer'   => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
                                'site_langs'    => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
!                               'site_version'  => array('type' => 'varchar', 
'precision' => 64,  'nullable' => True),
!                               'site_left'     => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
!                               'site_mid'      => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
!                               'site_right'    => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
                        ),
                        'pk' => array('site_id'),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/setup/tables_update.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tables_update.inc.php       9 Feb 2002 03:14:31 -0000       1.1
--- tables_update.inc.php       16 Feb 2002 22:54:06 -0000      1.2
***************
*** 17,21 ****
                $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_wcm_elements', 
'element_hf', array('type' => 'varchar', 'precision' => 16,  'nullable' => 
True));
  
!               $GLOBALS['setup_info']['inv']['currentver'] = '0.1.1';
                return $GLOBALS['setup_info']['inv']['currentver'];
        }
--- 17,32 ----
                $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_wcm_elements', 
'element_hf', array('type' => 'varchar', 'precision' => 16,  'nullable' => 
True));
  
!               $GLOBALS['setup_info']['wcm']['currentver'] = '0.1.1';
!               return $GLOBALS['setup_info']['inv']['currentver'];
!       }
! 
!       $test[] = '0.1.1';
!       function wcm_upgrade0_1_1()
!       {
!               $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_wcm_sites', 
'site_left', array('type' => 'int', 'precision' => 4, 'nullable' => True));
!               $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_wcm_sites', 
'site_mid', array('type' => 'int', 'precision' => 4, 'nullable' => True));
!               $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_wcm_sites', 
'site_right', array('type' => 'int', 'precision' => 4, 'nullable' => True));
! 
!               $GLOBALS['setup_info']['wcm']['currentver'] = '0.1.2';
                return $GLOBALS['setup_info']['inv']['currentver'];
        }