[Fmsystem-commits] [13764] adapt to eav-model

[Sigurd Nes]

Revision: 13764
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13764
Author:   sigurdne
Date:     2015-08-24 10:56:27 +0000 (Mon, 24 Aug 2015)
Log Message:
-----------
adapt to eav-model

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2015-08-24 09:09:03 UTC (rev 
13763)
+++ trunk/property/inc/class.soproject.inc.php  2015-08-24 10:56:27 UTC (rev 
13764)
@@ -907,11 +907,49 @@
                                return false;
                        }
 
-                       $this->db->query("SELECT maaler_nr as power_meter FROM 
$meter_table where location_code='$location_code' and category='1'", __LINE__, 
__FILE__);
+                       $meter_table_arr = explode('_', $meter_table);
 
-                       $this->db->next_record();
+                       foreach ($meter_table_arr as $key => $value)
+                       {
+                               if (ctype_digit($value))
+                               {
+                                       break;
+                               }
+                       }
 
-                       return $this->db->f('power_meter');
+                       $entity_id      = $meter_table_arr[$key];
+
+                       if(!$cat_id     = $meter_table_arr[($key +1)])
+                       {
+                               return false;
+                       }
+
+                       $admin_entity   = 
CreateObject('property.soadmin_entity');
+
+                       $category = 
$admin_entity->read_single_category($entity_id,$cat_id);
+
+                       if($category['is_eav'])
+                       {
+                               $sql = "SELECT * FROM fm_bim_item"
+                               . " WHERE location_code = '{$location_code}'"
+                               . " AND location_id = 
'{$category['location_id']}'"
+                               . " AND xmlexists('//category[text() = ''1'']' 
PASSING BY REF xml_representation)";
+
+                               $this->db->query($sql,__LINE__,__FILE__);
+
+                               $this->db->next_record();
+
+                               $xmldata = $this->db->f('xml_representation');
+                               $xml = new DOMDocument('1.0', 'utf-8');
+                               $xml->loadXML($xmldata);
+                               return 
$xml->getElementsByTagName('maaler_nr')->item(0)->nodeValue;
+                       }
+                       else
+                       {
+                               $this->db->query("SELECT maaler_nr as 
power_meter FROM $meter_table where location_code='$location_code' and 
category='1'", __LINE__, __FILE__);
+                               $this->db->next_record();
+                               return $this->db->f('power_meter');
+                       }
                }
 
                function project_workorder_data($data = array())
@@ -1206,6 +1244,9 @@
                                return;
                        }
 
+                       //Disabled for now
+                       return;
+
                        $location = explode('-', $location_code);
 
                        $i = 1;