[Fmsystem-commits] [10458]

[Torstein]

Revision: 10458
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10458
Author:   vator
Date:     2012-11-04 21:13:41 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.sorequirement_resource_allocation.inc.php

Modified: trunk/logistic/inc/class.sorequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.sorequirement_resource_allocation.inc.php  
2012-11-04 20:00:56 UTC (rev 10457)
+++ trunk/logistic/inc/class.sorequirement_resource_allocation.inc.php  
2012-11-04 21:13:41 UTC (rev 10458)
@@ -153,7 +153,7 @@
                        {
                                $cols .= "allocation.*, ";
                                $cols .= "phpgw_locations.descr AS 
resource_type_descr, ";
-                               $cols .= "fm_bim_item.location_code AS 
location_code, xpath('//address/text()', fm_bim_item.xml_representation) AS 
fm_bim_item_address, xpath('//navn/text()', fm_bim_item.xml_representation) AS 
fm_bim_item_name ";
+                               $cols .= "fm_bim_item.location_code AS 
location_code, (xpath('//address/node()', 
fm_bim_item.xml_representation))[1]::text AS fm_bim_item_address, 
(xpath('//navn[1]/text()', fm_bim_item.xml_representation))[1]::text AS 
fm_bim_item_name ";
                        }
                                                
                        $dir = $ascending ? 'ASC' : 'DESC';
@@ -174,7 +174,10 @@
                                
$allocation->set_resource_type_descr($this->unmarshal($this->db->f('resource_type_descr'),
 'string'));
                                
$allocation->set_location_code($this->unmarshal($this->db->f('location_code'), 
'string'));
                                
$allocation->set_fm_bim_item_address($this->unmarshal($this->db->f('fm_bim_item_address'),
 'string'));
-                               
$allocation->set_fm_bim_item_name($this->unmarshal($this->db->f('fm_bim_item_name'),
 'string'));
+                               
+                               $fm_bim_name = $this->unmarshal( 
$this->db->f('fm_bim_item_name'), 'string');
+                               
+                               $allocation->set_fm_bim_item_name($fm_bim_name);
                        }
 
                        return $allocation;