[Fmsystem-commits] [6984] property BIM: fix converter url

[Sigurd Nes]

Revision: 6984
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6984
Author:   sigurdne
Date:     2011-02-14 20:14:34 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
property BIM: fix converter url

Modified Paths:
--------------
    branches/dev-bim2/property/inc/class.uibim.inc.php

Modified: branches/dev-bim2/property/inc/class.uibim.inc.php
===================================================================
--- branches/dev-bim2/property/inc/class.uibim.inc.php  2011-02-14 20:09:49 UTC 
(rev 6983)
+++ branches/dev-bim2/property/inc/class.uibim.inc.php  2011-02-14 20:14:34 UTC 
(rev 6984)
@@ -22,7 +22,7 @@
        private $db;
        /* @var $bocommon property_bocommon */
        private $bocommon;
-       private $bimconverterUrl = "http://localhost:8080/bm/rest/";;
+       private $bimconverterUrl = "http://localhost:8080/bimconverter/rest/";;
 
        public function __construct() {
                $this->bocommon = CreateObject('property.bocommon');
@@ -51,12 +51,15 @@
                
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/bim.css');
        }
        public function getModelsJson() {
+               $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+               $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
                header("Content-type: application/json");
                $bobimmodel = new bobimmodel_impl();
                $sobimmodel = new sobimmodel_impl($this->db);
                $bobimmodel->setSobimmodel($sobimmodel);
                $output = $bobimmodel->createBimModelList();
+//             return $output;
                echo json_encode($output);
        }
        /*
@@ -100,6 +103,8 @@
        }
 
        public function getFacilityManagementXmlByModelId($modelId = null) {
+               $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+               $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
                header("Content-type: application/xml");
                $restUrl = $this->bimconverterUrl;
@@ -126,6 +131,7 @@
                        $bobimitem = new bobimitem_impl();
                        
$bobimitem->setSobimmodelinformation($sobimmodelinformation);
                        $bobimitem->setIfcXml($xmlResult);
+
                        $bobimitem->setSobimitem(new sobimitem_impl($this->db));
                        $bobimitem->setSobimtype(new sobimtype_impl($this->db));
 
@@ -343,4 +349,4 @@
        }
 
 
-}
\ No newline at end of file
+}