[Phpgroupware-cvs] property/setup tables_update.inc.php, 1.18 setup.inc.php, 1.24

[sigurdne]

Update of property/setup

Modified Files:
     Branch: MAIN
            tables_update.inc.php lines: +25 -9
            setup.inc.php lines: +2 -2

Log Message:
no message

====================================================
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.17 
property/setup/tables_update.inc.php:1.18
--- property/setup/tables_update.inc.php:1.17   Mon Oct 24 10:44:27 2005
+++ property/setup/tables_update.inc.php        Mon Oct 31 18:58:12 2005
@@ -642,7 +642,7 @@
                                . $value['c_safety']. ","
                                . $value['user_id']. ","
                                . $value['entry_date']. ")",__LINE__,__FILE__);
-
+
                        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
fm_request_condition 
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
                                . "VALUES ('"
                                . $value['request_id']. "','"
@@ -652,7 +652,7 @@
                                . $value['c_aesthetics']. ","
                                . $value['user_id']. ","
                                . $value['entry_date']. ")",__LINE__,__FILE__);
-
+
                        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
fm_request_condition 
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
                                . "VALUES ('"
                                . $value['request_id']. "','"
@@ -662,7 +662,7 @@
                                . $value['c_indoor_climate']. ","
                                . $value['user_id']. ","
                                . $value['entry_date']. ")",__LINE__,__FILE__);
-
+
                        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
fm_request_condition 
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
                                . "VALUES ('"
                                . $value['request_id']. "','"
@@ -672,7 +672,7 @@
                                . $value['c_consequential_damage']. ","
                                . $value['user_id']. ","
                                . $value['entry_date']. ")",__LINE__,__FILE__);
-
+
                        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
fm_request_condition 
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
                                . "VALUES ('"
                                . $value['request_id']. "','"
@@ -682,7 +682,7 @@
                                . $value['c_user_gratification']. ","
                                . $value['user_id']. ","
                                . $value['entry_date']. ")",__LINE__,__FILE__);
-
+
                        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
fm_request_condition 
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
                                . "VALUES ('"
                                . $value['request_id']. "','"
@@ -694,12 +694,12 @@
                                . $value['entry_date']. ")",__LINE__,__FILE__);

                        $id = $value['request_id'];
-
+


                        $sql = "SELECT sum(priority_key * ( degree * 
probability * ( consequence +1 ))) AS score FROM fm_request_condition"
                         . " JOIN fm_request_condition_type ON 
(fm_request_condition.condition_type = fm_request_condition_type.id) WHERE 
request_id = $id";
-
+
                        
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);

                        $GLOBALS['phpgw_setup']->oProc->next_record();
@@ -740,5 +740,21 @@
                $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.509';
                return $GLOBALS['setup_info']['property']['currentver'];
        }
-
+
+       /**
+       * Update property version from 0.9.17.509 to 0.9.17.510
+       */
+
+       $test[] = '0.9.17.509';
+       function property_upgrade0_9_17_509()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilag','item_type',array('type'
 => 'int','precision' => 4,'nullable' => True));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilag','item_id',array('type' 
=> 'int','precision' => 4,'nullable' => True));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','item_type',array('type'
 => 'int','precision' => 4,'nullable' => True));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','item_id',array('type'
 => 'int','precision' => 4,'nullable' => True));
+
+               $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.510';
+               return $GLOBALS['setup_info']['property']['currentver'];
+       }
+
 ?>

====================================================
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.23 property/setup/setup.inc.php:1.24
--- property/setup/setup.inc.php:1.23   Mon Oct 24 10:44:27 2005
+++ property/setup/setup.inc.php        Mon Oct 31 18:58:12 2005
@@ -13,7 +13,7 @@

        $setup_info['property']['name']      = 'property';
        $setup_info['property']['title']         = 'Property';
-       $setup_info['property']['version']   = '0.9.17.509';
+       $setup_info['property']['version']   = '0.9.17.510';
        $setup_info['property']['app_order'] = 8;
        $setup_info['property']['enable']    = 1;