[Fmsystem-commits] [8029] Removed field control_area_id

[Torstein]

Revision: 8029
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8029
Author:   vator
Date:     2011-11-07 08:20:32 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Removed field control_area_id 

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_item.inc.php

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2011-11-07 07:50:38 UTC 
(rev 8028)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2011-11-07 08:20:32 UTC 
(rev 8029)
@@ -33,8 +33,7 @@
                                'required',
                                'what_to_do',
                                'how_to_do',
-                               'control_group_id',
-                               'control_area_id'
+                               'control_group_id'
                );
                
                $values = array(
@@ -42,8 +41,7 @@
                        $this->marshal(($control_item->get_required() ? 'true' 
: 'false'), 'bool'),
                        $this->marshal($control_item->get_what_to_do(), 
'string'),
                        $this->marshal($control_item->get_how_to_do(), 
'string'),
-                       $this->marshal($control_item->get_control_group_id(), 
'int'),
-                       $this->marshal($control_item->get_control_area_id(), 
'int')
+                       $this->marshal($control_item->get_control_group_id(), 
'int')
                );
                
                $result = $this->db->query('INSERT INTO controller_control_item 
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')', 
__LINE__,__FILE__);
@@ -77,8 +75,7 @@
                        'required = ' . 
$this->marshal(($control_item->get_required() ? 'true' : 'false'), 'bool'),
                        'what_to_do = ' . 
$this->marshal($control_item->get_what_to_do(), 'string'),
                        'how_to_do = ' . 
$this->marshal($control_item->get_how_to_do(), 'string'),
-                       'control_group_id = ' . 
$this->marshal($control_item->get_control_group_id(), 'int'),
-                       'control_area_id = ' . 
$this->marshal($control_item->get_control_area_id(), 'int')
+                       'control_group_id = ' . 
$this->marshal($control_item->get_control_group_id(), 'int')
                );
                
                //var_dump('UPDATE controller_control_item SET ' . join(',', 
$values) . " WHERE id=$id");
@@ -97,8 +94,7 @@
        {
                $id = (int)$id;
                $joins = " {$this->left_join} controller_control_group ON 
(p.control_group_id = controller_control_group.id)";
-               $joins .= " {$this->left_join} controller_control_area ON 
(p.control_area_id = controller_control_area.id)";
-               $sql = "SELECT p.*, controller_control_group.group_name AS 
control_group_name, controller_control_area.title AS control_area_name FROM 
controller_control_item p {$joins} WHERE p.id = " . $id;
+               $sql = "SELECT p.*, controller_control_group.group_name AS 
control_group_name FROM controller_control_item p {$joins} WHERE p.id = " . $id;
                $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
                $this->db->next_record();
                
@@ -109,8 +105,6 @@
                
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
                
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
 true), 'string'));
-               
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
-               
$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                
                return $control_item;
        }
@@ -144,7 +138,6 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
                        
                        $results[] = $control_item;
                }
@@ -210,11 +203,7 @@
                {
                        $filter_clauses[] = 
"controller_control_item.control_group_id = 
{$this->marshal($filters['control_groups'],'int')}";
                }
-               if(isset($filters['control_areas']))
-               {
-                       $filter_clauses[] = 
"controller_control_item.control_area_id = 
{$this->marshal($filters['control_areas'],'int')}";
-               }
-               
+                       
                if(count($filter_clauses))
                {
                        $clauses[] = join(' AND ', $filter_clauses);
@@ -225,7 +214,6 @@
 
                $tables = "controller_control_item";
                $joins = " {$this->left_join} controller_control_group ON 
(controller_control_item.control_group_id = controller_control_group.id)";
-               $joins .= " {$this->left_join} controller_control_area ON 
(controller_control_item.control_area_id = controller_control_area.id)";
                
                if($return_count)
                {
@@ -233,7 +221,7 @@
                }
                else
                {
-                       $cols = 'controller_control_item.id, 
controller_control_item.title, required, what_to_do, how_to_do, 
controller_control_item.control_group_id, 
controller_control_item.control_area_id, controller_control_group.group_name AS 
control_group_name, controller_control_area.title AS control_area_name';
+                       $cols = 'controller_control_item.id, 
controller_control_item.title, required, what_to_do, how_to_do, 
controller_control_item.control_group_id, 
controller_control_item.control_area_id, controller_control_group.group_name AS 
control_group_name';
                }
                
                $dir = $ascending ? 'ASC' : 'DESC';
@@ -263,7 +251,6 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
                        
                        $results[] = $control_item;
                }
@@ -285,7 +272,6 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
                        
                        $results[] = $control_item->toArray();
                }
@@ -308,7 +294,6 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
                        
                        $results[] = $control_item;
                }
@@ -332,8 +317,6 @@
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
                        
//$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
 true), 'string'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
-                       
//$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                        
                        $results[] = $control_item->toArray();
                }
@@ -352,8 +335,6 @@
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
                        
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
 true), 'string'));
-                       
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
-                       
$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                }
                
                return $control_item;