[Fmsystem-commits] [10203] bim: add location_id to bim_item

[Sigurd Nes]

Revision: 10203
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10203
Author:   sigurdne
Date:     2012-10-10 14:16:52 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
bim: add location_id to bim_item

Modified Paths:
--------------
    trunk/property/inc/class.soadmin_entity.inc.php
    trunk/property/inc/class.soentity.inc.php

Modified: trunk/property/inc/class.soadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.soadmin_entity.inc.php     2012-10-10 14:16:11 UTC 
(rev 10202)
+++ trunk/property/inc/class.soadmin_entity.inc.php     2012-10-10 14:16:52 UTC 
(rev 10203)
@@ -1136,6 +1136,7 @@
                                                        $values_insert = array
                                                        (
                                                                'id'            
                        => $data['id'],
+                                                               'location_id'   
                => $location_id,
                                                                'type'          
                        => $type,
                                                                'guid'          
                        => $guid,
                                                                
'xml_representation'    => $this->db->db_addslashes($xml),

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2012-10-10 14:16:11 UTC (rev 
10202)
+++ trunk/property/inc/class.soentity.inc.php   2012-10-10 14:16:52 UTC (rev 
10203)
@@ -1579,7 +1579,8 @@
                        
                        if(!$sql)
                        {
-                               $sql = "SELECT fm_bim_item.* FROM fm_bim_item 
{$this->join} fm_bim_type ON fm_bim_type.id = fm_bim_item.type WHERE 
fm_bim_item.id = {$id} AND location_id = $location_id";                      
+//                             $sql = "SELECT fm_bim_item.* FROM fm_bim_item 
{$this->join} fm_bim_type ON fm_bim_type.id = fm_bim_item.type WHERE 
fm_bim_item.id = {$id} AND location_id = $location_id";                      
+                               $sql = "SELECT * FROM fm_bim_item WHERE 
fm_bim_item.id = {$id} AND location_id = $location_id";                 
                        }
 
                        $this->db->query($sql,__LINE__,__FILE__);
@@ -1882,6 +1883,7 @@
                        $values_insert = array
                        (
                                'id'                                    => $id,
+                               'location_id'                   => $location_id,
                                'type'                                  => 
$type,
                                'guid'                                  => 
$guid,
                                'xml_representation'    => 
$this->db->db_addslashes($xml),