[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6858] Changed table name
From: |
Petur Thorsteinsson |
Subject: |
[Fmsystem-commits] [6858] Changed table name |
Date: |
Thu, 27 Jan 2011 08:29:57 +0000 |
Revision: 6858
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6858
Author: peturbjorn
Date: 2011-01-27 08:29:56 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Changed table name
Modified Paths:
--------------
branches/dev-bim2/property/inc/class.sobim.inc.php
branches/dev-bim2/property/inc/class.sobimitem.inc.php
branches/dev-bim2/property/inc/class.sobimmodel.inc.php
Modified: branches/dev-bim2/property/inc/class.sobim.inc.php
===================================================================
--- branches/dev-bim2/property/inc/class.sobim.inc.php 2011-01-27 08:28:59 UTC
(rev 6857)
+++ branches/dev-bim2/property/inc/class.sobim.inc.php 2011-01-27 08:29:56 UTC
(rev 6858)
@@ -7,7 +7,7 @@
*/
interface sobim {
- const bimItemTable = 'fm_bim_data';
+ const bimItemTable = 'fm_bim_item';
const bimTypeTable = 'fm_bim_type';
const bimModelTable = 'fm_bim_model';
}
Modified: branches/dev-bim2/property/inc/class.sobimitem.inc.php
===================================================================
--- branches/dev-bim2/property/inc/class.sobimitem.inc.php 2011-01-27
08:28:59 UTC (rev 6857)
+++ branches/dev-bim2/property/inc/class.sobimitem.inc.php 2011-01-27
08:29:56 UTC (rev 6858)
@@ -13,7 +13,6 @@
* @return BIMItem
*/
public function getBimItem($bimObjectId);
-
public function addBimItem($bimItem);
public function deleteBimItem($guid);
public function checkIfBimItemExists($guid);
@@ -28,14 +27,18 @@
public function __construct(& $db) {
// $this->db = & $GLOBALS['phpgw']->db;
$this->db = $db;
+ $db->Halt_On_Error = 'no';
+ $db->Exception_On_Error = true;
}
/*
* @return Array an array of BimItem objects
*/
public function getAll() {
- $sql = 'SELECT fm_bim_data.id, fm_bim_type.name AS type,
fm_bim_data.guid, fm_bim_data.xml_representation '.
- 'FROM public.fm_bim_data,
public.fm_bim_type '.
- 'WHERE fm_bim_data.type =
fm_bim_type.id';
+ $itemTable = self::bimItemTable;
+ $typeTable = self::bimTypeTable;
+ $sql = "SELECT $itemTable.id, fm_bim_type.name AS type,
$itemTable.guid, $itemTable.xml_representation ".
+ "FROM public. $itemTable,
public.$typeTable ".
+ "WHERE $itemTable.type =
$typeTable.id";
$bimItemArray = array();
$this->db->query($sql);
while($this->db->next_record())
@@ -49,10 +52,12 @@
public function getBimItem($bimObjectGuid){
- $sql = 'SELECT fm_bim_data.id, fm_bim_type.name AS type,
fm_bim_data.guid, fm_bim_data.xml_representation, fm_bim_data.model '.
- 'FROM public.fm_bim_data,
public.fm_bim_type '.
- 'WHERE fm_bim_data.type =
fm_bim_type.id ' .
- 'AND fm_bim_data.guid =\''.$bimObjectGuid.'\'';
+ $itemTable = self::bimItemTable;
+ $typeTable = self::bimTypeTable;
+ $sql = "SELECT $itemTable.id, fm_bim_type.name AS type,
$itemTable.guid, $itemTable.xml_representation, $itemTable.model ".
+ "FROM public.$itemTable,
public.$typeTable ".
+ "WHERE $itemTable.type = $typeTable.id
" .
+ "AND $itemTable.guid ='$bimObjectGuid'";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->num_rows() == 0) {
throw new Exception('Item not found!');
@@ -68,12 +73,16 @@
$sql = "INSERT INTO ".self::bimItemTable." (type, guid,
xml_representation, model) values (";
$sql = $sql."(select id from ".self::bimTypeTable." where name
= '".$bimItem->getType()."'),";
$sql = $sql."'".$bimItem->getGuid()."',
'".$bimItem->getXml()."', ".$bimItem->getModelId().")";
-
- if(is_null($this->db->query($sql,__LINE__,__FILE__))) {
- throw new Exception('Query to add item was
unsuccessful');
- } else {
- return $this->db->num_rows();
+ try {
+ if(is_null($this->db->query($sql,__LINE__,__FILE__))) {
+ throw new Exception('Query to add item was
unsuccessful');
+ } else {
+ return $this->db->num_rows();
+ }
+ }catch (PDOException $e) {
+ throw new BimDataException("Could not add item",$e);
}
+
}
/*
* Checks if the bim item exists
@@ -129,8 +138,9 @@
*/
public function getBimItemAttributeValue($bimItemGuid, $attribute) {
$columnAlias = "attribute_values";
+ $itemTable = self::bimItemTable;
//$sql = "select
xpath('descendant-or-self::*[$attribute]/$attribute/text()', (select
xml_representation from fm_bim_data where guid='$bimItemGuid'))";
- $sql = "select
array_to_string(xpath('descendant-or-self::*[$attribute]/$attribute/text()',
(select xml_representation from fm_bim_data where guid='$bimItemGuid')), ',')
as $columnAlias";
+ $sql = "select
array_to_string(xpath('descendant-or-self::*[$attribute]/$attribute/text()',
(select xml_representation from $itemTable where guid='$bimItemGuid')), ',') as
$columnAlias";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->num_rows() == 0) {
throw new Exception('Error!');
@@ -150,53 +160,7 @@
- /**
- * Retreive any number of items.
- * @param array $data
- * @return array Array of zero or more items
- */
- public function read(array $data)
- {
-
- $select_cols = array(
- 'i.id',
- 'i.group_id',
- 'i.location_id',
- 'i.vendor_id',
- 'i.installed'
- );
- $from_tables = array('fm_item i');
- $joins = array(
- //$this->db->left_join.' fm_item_group g ON i.group_id = g.id',
- $this->db->left_join.' fm_vendor v ON i.vendor_id = v.id'
- );
- $where_clauses = array(' WHERE 1=1');
-
- if($specific_item_id) {
- // FIXME Sanitize input!!
- $where_clauses[] = "i.id = $specific_item_id";
- }
-
- $sql = 'SELECT ' . implode($select_cols, ', ') .
- ' FROM ' . implode($from_tables, ', ') .
- implode($joins, ' ') .
- implode($where_clauses, ' AND ');
-
- $this->db->query($sql);
- $i = 0;
- while($this->db->next_record())
- {
- $items[$i]['id'] = $this->db->f('id');
- $items[$i]['group'] = $this->db->f('group_id');
- $items[$i]['location'] = $this->db->f('location_id');
- $items[$i]['vendor'] = $this->db->f('vendor_id');
- $items[$i]['installed']= $this->db->f('installed');
-
- $i++;
- }
-
- return $items;
- }
+
}
class BimItem {
private $databaseId;
Modified: branches/dev-bim2/property/inc/class.sobimmodel.inc.php
===================================================================
--- branches/dev-bim2/property/inc/class.sobimmodel.inc.php 2011-01-27
08:28:59 UTC (rev 6857)
+++ branches/dev-bim2/property/inc/class.sobimmodel.inc.php 2011-01-27
08:29:56 UTC (rev 6858)
@@ -46,11 +46,15 @@
public function __construct(& $db, $modelName = null, $vfs_id = null) {
// $this->db = & $GLOBALS['phpgw']->db;
$this->db = $db;
+ $db->Halt_On_Error = 'no';
+ $db->Exception_On_Error = true;
}
public function retrieveBimModelList() {
$bimModelArray = array();
- $sql = "select model.id,model.name,vfs.created,vfs.size as
filesize,vfs.name as filename,vfs.file_id as vfs_file_id,(select count(*) from
fm_bim_data where model=model.id) as used_item_count from fm_bim_model as
model left join phpgw_vfs as vfs on model.vfs_file_id = vfs.file_id";
+ $itemTable = self::bimItemTable;
+ $modelTable = self::bimModelTable;
+ $sql = "select model.id,model.name,vfs.created,vfs.size as
filesize,vfs.name as filename,vfs.file_id as vfs_file_id,(select count(*) from
$itemTable where model=model.id) as used_item_count from $modelTable as model
left join phpgw_vfs as vfs on model.vfs_file_id = vfs.file_id";
if(is_null($this->db->query($sql,__LINE__,__FILE__))) {
throw new Exception('Query to find bim models failed');
} else {
@@ -79,19 +83,22 @@
}
/*
* Needs modelId set
+ * @throws ModelDoesNotExistException
* @return null|BimModel
*/
public function retrieveBimModelInformationById() {
$this->checkArgModelId();
- $sql = "Select * from ".self::bimModelTable." where
id=".$this->modelId;
+ $itemTable = self::bimItemTable;
+ $modelTable = self::bimModelTable;
+ $sql = "Select * from $modelTable where id=".$this->modelId;
$sql = "select model.id,model.name,vfs.created,vfs.size as
filesize,vfs.name as filename,vfs.file_id as vfs_file_id,".
- "(select count(*) from fm_bim_data where
model=model.id) as used_item_count from fm_bim_model as model ".
+ "(select count(*) from $itemTable where
model=model.id) as used_item_count from $modelTable as model ".
"left join phpgw_vfs as vfs on
model.vfs_file_id = vfs.file_id where id=".$this->modelId;
if(is_null($this->db->query($sql,__LINE__,__FILE__))) {
throw new Exception('Query to find bim model failed');
} else {
if($this->db->num_rows() == 0) {
- return null;
+ throw new ModelDoesNotExistException();
} else {
$this->db->next_record();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6858] Changed table name,
Petur Thorsteinsson <=