[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soXport.inc.php, 1.13 class.soproj
From: |
sigurdne |
Subject: |
[Phpgroupware-cvs] property/inc class.soXport.inc.php, 1.13 class.soproject.inc.php, 1.10 |
Date: |
Thu, 24 Feb 2005 15:08:11 -0000 |
Update of property/inc
Modified Files:
Branch: MAIN
class.soXport.inc.php lines: +4 -4
class.soproject.inc.php lines: +4 -4
Log Message:
no message
====================================================
Index: property/inc/class.soXport.inc.php
diff -u property/inc/class.soXport.inc.php:1.12
property/inc/class.soXport.inc.php:1.13
--- property/inc/class.soXport.inc.php:1.12 Sat Jan 29 13:23:25 2005
+++ property/inc/class.soXport.inc.php Sat Jan 29 18:40:26 2005
@@ -116,9 +116,9 @@
function anleggsnr_to_objekt($anleggsnr,$meter_table)
{
- $this->db->query("select
$meter_table.name,$meter_table.loc1,$meter_table.loc2,$meter_table.loc3,fm_part_of_town.district_id
"
+ $this->db->query("select
$meter_table.ext_meter_id,$meter_table.loc1,$meter_table.loc2,$meter_table.loc3,fm_part_of_town.district_id
"
. " from $meter_table $this->join fm_location1 ON
$meter_table.loc1 = fm_location1.loc1 $this->join "
- . " fm_part_of_town ON fm_location1.part_of_town_id =
fm_part_of_town.part_of_town_id where $meter_table.num='$anleggsnr'");
+ . " fm_part_of_town ON fm_location1.part_of_town_id =
fm_part_of_town.part_of_town_id where $meter_table.ext_system_id='$anleggsnr'");
$this->db->next_record();
@@ -131,7 +131,7 @@
$maalerinfo['loc1']=$loc1;
$maalerinfo['dima']=$dima;
- $maalerinfo['maalernr']=$this->db->f('name');
+ $maalerinfo['maalernr']=$this->db->f('ext_meter_id');
$maalerinfo['district']=$this->db->f('district_id');
return $maalerinfo;
====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.9
property/inc/class.soproject.inc.php:1.10
--- property/inc/class.soproject.inc.php:1.9 Sat Jan 29 13:23:25 2005
+++ property/inc/class.soproject.inc.php Sat Jan 29 18:40:26 2005
@@ -393,7 +393,7 @@
function get_power_meter($location_code = '',$meter_table)
{
- $this->db2->query("SELECT name as power_meter FROM
$meter_table where location_code='$location_code' and
category='1'",__LINE__,__FILE__);
+ $this->db2->query("SELECT ext_meter_id as power_meter
FROM $meter_table where location_code='$location_code' and
category='1'",__LINE__,__FILE__);
$this->db2->next_record();
@@ -598,12 +598,12 @@
if ( $this->db->f(0))
{
- $this->db->query("update $meter_table set
name='$power_meter',address='$address' where location_code='$location_code' and
category='1'",__LINE__,__FILE__);
+ $this->db->query("update $meter_table set
ext_meter_id='$power_meter',address='$address' where
location_code='$location_code' and category='1'",__LINE__,__FILE__);
}
else
{
$meter_id =
$this->generate_meter_id($meter_table);
- $this->db->query("insert into $meter_table
(num,name,category,location_code,entry_date,user_id,address $cols) "
+ $this->db->query("insert into $meter_table
(num,ext_meter_id,category,location_code,entry_date,user_id,address $cols) "
. "VALUES ('"
. $meter_id. "','"
. $power_meter. "',"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soXport.inc.php, 1.13 class.soproject.inc.php, 1.10,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/setup tables_current.inc.php, 1.20 default_records.inc.php, 1.9
- Next by Date:
[Phpgroupware-cvs] property/setup default_records.inc.php, 1.8 setup.inc.php, 1.10 tables_current.inc.php, 1.19
- Previous by thread:
[Phpgroupware-cvs] property/setup tables_current.inc.php, 1.20 default_records.inc.php, 1.9
- Next by thread:
[Phpgroupware-cvs] property/setup default_records.inc.php, 1.8 setup.inc.php, 1.10 tables_current.inc.php, 1.19
- Index(es):