[Fmsystem-commits] [9854] controller: correcting datatypes

[Sigurd Nes]

Revision: 9854
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9854
Author:   sigurdne
Date:     2012-08-15 07:20:53 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
controller: correcting datatypes

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-08-14 13:19:01 UTC 
(rev 9853)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-08-15 07:20:53 UTC 
(rev 9854)
@@ -69,6 +69,7 @@
                $this->db->query($sql);
                $this->db->next_record();
                        
+_debug_array($this->unmarshal($this->db->f('cl_status'), 'int'));
                $check_list = new 
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
                
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'), 
'int'));
                
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
@@ -770,7 +771,7 @@
                        $control = new controller_control((int) $control_id);
 
                        
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                       
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                       
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                        $control->set_start_date($start_date);
                        $control->set_end_date($end_date);
                        
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-08-14 13:19:01 UTC 
(rev 9853)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-08-15 07:20:53 UTC 
(rev 9854)
@@ -145,7 +145,7 @@
                        while($this->db->next_record()) {
                                $control = new 
controller_control($this->unmarshal($this->db->f('id'), 'int'));
                                
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                                
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
@@ -209,7 +209,7 @@
                        while($this->db->next_record()) {
                                $control = new 
controller_control($this->unmarshal($this->db->f('id'), 'int'));
                                
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                                
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
@@ -321,7 +321,7 @@
                                
                                $control = new 
controller_control($this->unmarshal($this->db->f('control_id'), 'int'));
                                
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                                
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
@@ -387,7 +387,7 @@
                        {
                                $control = new 
controller_control($this->unmarshal($this->db->f('id'), 'int'));
                                
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                                
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
@@ -783,7 +783,7 @@
                                $control = new controller_control((int) 
$control_id);
 
                                
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                               
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                                
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                                
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
@@ -825,7 +825,7 @@
                        
                        $control = new controller_control((int) $id);
                        
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-                       
$control->set_description($this->unmarshal($this->db->f('description', true), 
'boolean'));
+                       
$control->set_description($this->unmarshal($this->db->f('description', true), 
'string'));
                        
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                        
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                        
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));