[Fmsystem-commits] [8622]

[Torstein]

Revision: 8622
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8622
Author:   vator
Date:     2012-01-19 13:21:48 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_list.inc.php
    trunk/controller/inc/class.socontrol.inc.php

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2012-01-19 13:05:19 UTC 
(rev 8621)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-01-19 13:21:48 UTC 
(rev 8622)
@@ -73,7 +73,7 @@
                                
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true), 
'int'));
                                
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
                                
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int'));
-                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$check_list->set_component_id($this->unmarshal($this->db->f('component_id', 
true), 'int'));
                                
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases', 
true), 'int')); 
                        }
@@ -130,7 +130,7 @@
                                
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true), 
'int'));
                                
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
                                
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
-                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));   
+                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));        
                        }
                                                
                        if($this->db->f('ci_id', true) != ''){
@@ -195,7 +195,7 @@
                        
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                        
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
 true), 'int'));
                        
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true), 
'int'));
-                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                        
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                        
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                                
@@ -233,7 +233,7 @@
                                
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
                                
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
                                
$check_list->set_component_id($this->unmarshal($this->db->f('component_id', 
true), 'int'));
-                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases', 
true), 'int'));
                                
                                $check_items_array = array();
@@ -370,7 +370,7 @@
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date', true), 
'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
                                
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id', 
true), 'int'));
-                               
$control->set_location_code($this->unmarshal($this->db->f('c_location_code', 
true), 'int'));
+                               
$control->set_location_code($this->unmarshal($this->db->f('c_location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                                                                
@@ -384,7 +384,7 @@
                        
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
                        
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
                        
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id', 
true), 'int'));
-                       
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
 true), 'int'));
+                       
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
 true), 'string'));
                        
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases', 
true), 'int'));
                        
                        $check_lists_array[] = $check_list;
@@ -437,7 +437,7 @@
                        
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
                        
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
                        
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id', 
true), 'int'));
-                       
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
 true), 'int'));
+                       
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
 true), 'string'));
                        
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases', 
true), 'int'));
                        
                        $check_lists_array[] = $check_list;
@@ -540,7 +540,7 @@
                        
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                        
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
 true), 'int'));
                        
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true), 
'int'));
-                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                        
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                        
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                }
@@ -569,7 +569,7 @@
                        $this->marshal($check_list->get_deadline(), 'int'),
                        $this->marshal($check_list->get_planned_date(), 'int'),
                        $this->marshal($check_list->get_completed_date(), 
'int'),
-                       $this->marshal($check_list->get_location_code(), 'int'),
+                       $this->marshal($check_list->get_location_code(), 
'string'),
                        $this->marshal($check_list->get_component_id(), 'int'),
                        $this->marshal($check_list->get_num_open_cases(), 'int')
                );
@@ -590,7 +590,7 @@
                        'deadline = ' . 
$this->marshal($check_list->get_deadline(), 'int'),
                        'planned_date = ' . 
$this->marshal($check_list->get_planned_date(), 'int'),
                        'completed_date = ' . 
$this->marshal($check_list->get_completed_date(), 'int'),
-                       'location_code = ' . 
$this->marshal($check_list->get_location_code(), 'int'),
+                       'location_code = ' . 
$this->marshal($check_list->get_location_code(), 'string'),
                        'component_id = ' . 
$this->marshal($check_list->get_component_id(), 'int'),
                        'num_open_cases = ' . 
$this->marshal($check_list->get_num_open_cases(), 'int')
                );

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-01-19 13:05:19 UTC 
(rev 8621)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-01-19 13:21:48 UTC 
(rev 8622)
@@ -118,7 +118,7 @@
                        
                        $sql  = "SELECT distinct c.* FROM 
controller_control_location_list cll "; 
                        $sql .= "LEFT JOIN controller_control c on 
cll.control_id=c.id ";
-                       $sql .= "WHERE cll.location_code = $location_code ";
+                       $sql .= "WHERE cll.location_code = '$location_code' ";
                        
                        if( is_numeric($repeat_type) )
                                $sql .= "AND c.repeat_type = $repeat_type ";
@@ -141,7 +141,7 @@
                                
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id', 
true), 'int'));
                                
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
 true), 'int'));
                                
$control->set_component_id($this->unmarshal($this->db->f('component_id', true), 
'int'));
-                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                                
@@ -182,7 +182,7 @@
                                
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                                
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
 true), 'int'));
                                
$control->set_component_id($this->unmarshal($this->db->f('component_id', true), 
'int'));
-                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
 
@@ -212,7 +212,7 @@
                        while($this->db->next_record()) {
                                $control_id = 
$this->unmarshal($this->db->f('id', true), 'int');
                                $title = $this->unmarshal($this->db->f('title', 
true), 'string');
-                               $location_code = 
$this->unmarshal($this->db->f('location_code', true), 'int');
+                               $location_code = 
$this->unmarshal($this->db->f('location_code', true), 'strign');
 
                                $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
 
@@ -355,7 +355,7 @@
        //                      
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
                                
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
 true), 'int'));
                                
$control->set_component_id($this->unmarshal($this->db->f('component_id', true), 
'int'));
-                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                               
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                        }
@@ -397,7 +397,7 @@
                        
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                        
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
 true), 'int'));
                        
$control->set_component_id($this->unmarshal($this->db->f('component_id', true), 
'int'));
-                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'int'));
+                       
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                        
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                        
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));