[Fmsystem-commits] [11615] API: Start new vfs integration

[Sigurd Nes]

Revision: 11615
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11615
Author:   sigurdne
Date:     2014-01-20 13:46:36 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
API: Start new vfs integration

Modified Paths:
--------------
    trunk/phpgwapi/setup/setup.inc.php
    trunk/phpgwapi/setup/tables_current.inc.php
    trunk/phpgwapi/setup/tables_update.inc.php

Modified: trunk/phpgwapi/setup/setup.inc.php
===================================================================
--- trunk/phpgwapi/setup/setup.inc.php  2014-01-20 12:30:50 UTC (rev 11614)
+++ trunk/phpgwapi/setup/setup.inc.php  2014-01-20 13:46:36 UTC (rev 11615)
@@ -12,7 +12,7 @@
        // Basic information about this app
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
        $setup_info['phpgwapi']['title']     = 'phpgwapi';
-       $setup_info['phpgwapi']['version']   = '0.9.17.542';
+       $setup_info['phpgwapi']['version']   = '0.9.17.543';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.31';
        $setup_info['phpgwapi']['versions']['system'] = '1.0';
        $setup_info['phpgwapi']['enable']    = 3;

Modified: trunk/phpgwapi/setup/tables_current.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_current.inc.php 2014-01-20 12:30:50 UTC (rev 
11614)
+++ trunk/phpgwapi/setup/tables_current.inc.php 2014-01-20 13:46:36 UTC (rev 
11615)
@@ -289,7 +289,8 @@
                                'link_directory' => array('type' => 
'text','nullable' => True),
                                'link_name' => array('type' => 
'text','nullable' => True),
                                'version' => array('type' => 
'varchar','precision' => 30,'nullable' => False,'default' => '0.0.0.0'),
-                               'content' => array('type' => 'text','nullable' 
=> True)
+                               'content' => array('type' => 'text','nullable' 
=> True),
+                               'external_id' => array('type' => 
'int','precision' => 8,'nullable' => True),
                        ),
                        'pk' => array('file_id'),
                        'fk' => array(),

Modified: trunk/phpgwapi/setup/tables_update.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_update.inc.php  2014-01-20 12:30:50 UTC (rev 
11614)
+++ trunk/phpgwapi/setup/tables_update.inc.php  2014-01-20 13:46:36 UTC (rev 
11615)
@@ -3155,36 +3155,26 @@
                }
        }
 
-/*
+
        $test[] = '0.9.17.542';
+       /**
+       * Enable external integration with vfs
+       *
+       * @return string the new version number
+       */
        function phpgwapi_upgrade0_9_17_542()
        {
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
-               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cust_attribute','location_id',array(
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_vfs','external_id', array(
                        'type' => 'int',
-                       'precision' => 4,
-                       'nullable' => false,
+                       'precision' => 8,
+                       'nullable' => true
                ));
-               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cust_attribute','id',array(
-                       'type' => 'int',
-                       'precision' => 4,
-                       'nullable' => false,
-               ));
 
-               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cust_attribute','group_id',array(
-                       'type' => 'int',
-                       'precision' => 4,
-                       'nullable' => true,
-                       'default' => 0
-               ));
-
                if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
                {
                        $GLOBALS['setup_info']['phpgwapi']['currentver'] = 
'0.9.17.543';
                        return $GLOBALS['setup_info']['phpgwapi']['currentver'];
                }
        }
-
-*/
-