[Fmsystem-commits] [6944] Removed modelid from bo item

[Petur Thorsteinsson]

Revision: 6944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6944
Author:   peturbjorn
Date:     2011-02-06 21:00:31 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
Removed modelid from bo item

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

Modified: branches/dev-bim2/property/inc/class.bobimitem.inc.php
===================================================================
--- branches/dev-bim2/property/inc/class.bobimitem.inc.php      2011-02-06 
20:59:46 UTC (rev 6943)
+++ branches/dev-bim2/property/inc/class.bobimitem.inc.php      2011-02-06 
21:00:31 UTC (rev 6944)
@@ -7,7 +7,6 @@
                public function setSobimitem(sobimitem $sobimitem);
                public function setSobimtype(sobimtype $sobimtype);
                public function setSobimmodelinformation(sobimmodelinformation  
$sobimmodelinformation);
-               public function setModelId(int $id);
                public function loadIfcItemsIntoDatabase();
                public function fetchItemsByModelId();
        }
@@ -18,7 +17,6 @@
                private $sobimitem;
                private $sobimtype;
                private $sobimmodelinformation;
-               private $modelId;
                
                public function __construct() {
                        
@@ -86,10 +84,12 @@
                }
                /*
                 * Needs the following variables set
+                * sobimitem (with modelId set)
                 * 
                 */
                public function fetchItemsByModelId() {
-                       
+                       $this->checkFetchArguments();
+                       return $this->sobimitem->retrieveItemsByModelId();
                }
                /*
                 * @throws IncompleteItemException if the ifc object is missing 
anything
@@ -104,14 +104,18 @@
                                                                "XML:".$xml;
                                throw new IncompleteItemException($currentItem);
                        }
-                       return new BimItem(null, $guid, $type, $xml, 
$this->modelId);
+                       return new BimItem(null, $guid, $type, $xml, 
$this->sobimitem->getModelId());
                }
                
+               private function checkFetchArguments() {
+                       if(!$this->sobimitem) {
+                               throw new InvalidArgumentException("Missing 
sobimitem");
+                       }
+               }
                private function checkArguments() {
-                       if(empty($this->ifcXml) || empty($this->sobimitem) || 
empty($this->modelId) || empty($this->sobimtype) || 
empty($this->sobimmodelinformation)) {
+                       if(empty($this->ifcXml) || empty($this->sobimitem) || 
empty($this->sobimtype) || empty($this->sobimmodelinformation)) {
                                $args = "IfcXml 
type:".gettype($this->ifcXml)."\n".
                                                "Sobimitem 
type:".gettype($this->sobimitem)."\n".
-                                               "Model id:".$this->modelId."\n".
                                                "Sobimtype 
type:".gettype($this->sobimtype)."\n".
                                                "Sobimmodelinformation 
type:".gettype($this->sobimmodelinformation)."\n";
                                throw new 
InvalidArgumentException("BObimitem:Incorrect arguments\b".$args);
@@ -120,9 +124,6 @@
                public function setSobimmodelinformation(sobimmodelinformation  
$sobimmodelinformation) {
                        $this->sobimmodelinformation = $sobimmodelinformation;
                }
-               public function setModelId(int $id) {
-                       $this->modelId = $id;
-               }
                public function setIfcXml(SimpleXMLElement  $xml) {
                        $this->ifcXml = $xml;
                }