[Phpgroupware-cvs] CVS: bookmarks/setup setup.inc.php,1.12,1.13 tables_current.inc.php,1.6,1.7 tables_update.inc.php,1.1,1.2

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/setup
In directory subversions:/tmp/cvs-serv8381/setup

Modified Files:
        setup.inc.php tables_current.inc.php tables_update.inc.php 
Log Message:
ported bookmarks to three-layered design
additional changes:
- unlimited category hierarchy can be used (formerly only two levels were 
possible)
- tree view is javascript based
- location_info works better


Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/setup/setup.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** setup.inc.php       23 Oct 2002 20:47:28 -0000      1.12
--- setup.inc.php       8 Apr 2003 05:00:59 -0000       1.13
***************
*** 16,20 ****
        /* Basic information about this app */
        $setup_info['bookmarks']['name']      = 'bookmarks';
!       $setup_info['bookmarks']['version']   = '0.8.2';
        $setup_info['bookmarks']['app_order'] = '20';
        $setup_info['bookmarks']['enable']    = 1;
--- 16,21 ----
        /* Basic information about this app */
        $setup_info['bookmarks']['name']      = 'bookmarks';
!       $setup_info['bookmarks']['title']     = 'Bookmarks';
!       $setup_info['bookmarks']['version']   = '0.9.1';
        $setup_info['bookmarks']['app_order'] = '20';
        $setup_info['bookmarks']['enable']    = 1;
***************
*** 24,29 ****
        $setup_info['bookmarks']['description'] =
                'Manage your bookmarks with phpGW.  Has Netscape plugin.';
!       $setup_info['bookmarks']['maintainer'] = 'Joseph Engo';
!       $setup_info['bookmarks']['maintainer_email'] = 'address@hidden';
  
        /* The tables this app creates */
--- 25,30 ----
        $setup_info['bookmarks']['description'] =
                'Manage your bookmarks with phpGW.  Has Netscape plugin.';
!       $setup_info['bookmarks']['maintainer'] = 'Michael Totschnig';
!       $setup_info['bookmarks']['maintainer_email'] = 'address@hidden';
  
        /* The tables this app creates */

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/setup/tables_current.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** tables_current.inc.php      31 Aug 2002 13:19:31 -0000      1.6
--- tables_current.inc.php      8 Apr 2003 05:00:59 -0000       1.7
***************
*** 27,31 ****
                                'bm_keywords' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
                                'bm_category' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
-                               'bm_subcategory' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
                                'bm_rating' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
                                'bm_info' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
--- 27,30 ----

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/setup/tables_update.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tables_update.inc.php       31 Aug 2002 13:19:31 -0000      1.1
--- tables_update.inc.php       8 Apr 2003 05:00:59 -0000       1.2
***************
*** 28,29 ****
--- 28,62 ----
                return $GLOBALS['setup_info']['bookmarks']['currentver'];
        }
+ 
+       $test[] = '0.8.2';
+       function bookmarks_upgrade0_8_2()
+       {
+               global $setup_info,$phpgw_setup;
+ 
+               $db2 = $phpgw_setup->db;
+               $db2->query("update phpgw_bookmarks SET bm_category = 
bm_subcategory WHERE bm_subcategory != 0");
+ 
+               $newtbldef = array(
+                       'fd' => array(
+                               'bm_id' => array('type' => 'auto','nullable' => 
False),
+                               'bm_owner' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'bm_access' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_url' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_name' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_desc' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_keywords' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_category' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'bm_rating' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'bm_info' => array('type' => 'varchar', 
'precision' => 255,'nullable' => True),
+                               'bm_visits' => array('type' => 'int', 
'precision' => 4,'nullable' => True)
+                       ),
+                       'pk' => array('bm_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               );
+               
$phpgw_setup->oProc->DropColumn('phpgw_bookmarks',$newtbldef,'bm_subcategory');
+ 
+               $setup_info['bookmarks']['currentver'] = '0.9.1';
+               return $setup_info['bookmarks']['currentver'];
+       }
\ No newline at end of file