[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7184] Merge 7182:7183 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7184] Merge 7182:7183 from trunk |
|
Date: |
Tue, 05 Apr 2011 19:14:30 +0000 |
Revision: 7184
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7184
Author: sigurdne
Date: 2011-04-05 19:14:30 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
Merge 7182:7183 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record_nlsh.php
branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183
Modified:
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record_nlsh.php
===================================================================
---
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record_nlsh.php
2011-04-05 19:08:04 UTC (rev 7183)
+++
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record_nlsh.php
2011-04-05 19:14:30 UTC (rev 7184)
@@ -1,7 +1,7 @@
<?php
if(!isset($this->db) || !is_object($this->db))
{
- $this->db = & $GLOBALS['phpgw']->db;
+ $this->db = clone($GLOBALS['phpgw']->db);
$this->like = & $this->db->like;
}
@@ -22,52 +22,83 @@
foreach ($ids as $_id)
{
+ $value_set = array();
$this->db->query("SELECT * FROM $target_table WHERE id
= {$_id}",__LINE__,__FILE__);
$this->db->next_record();
- $loc_fields = array
- (
- 'eiendomid',
- 'byggid',
- 'etasjeid',
- 'bruksenhetid',
- 'romid'
- );
+ if($location_id = $this->db->f('location_id') &&
$target_id = (int)$this->db->f('target_id')
+ {
+ $origin =
$GLOBALS['phpgw']->locations->get_name($location_id);
+ $origin_table =
$GLOBALS['phpgw']->locations->get_attrib_table($origin['appname'],
$origin['location']);
+ $origin_arr = explode('_', $origin_table);
+ $p_entity_id = $origin_arr[2];
+ $p_cat_id = $origin_arr[3];
- $location = array();
- $value_set = array();
- $j = 1;
- foreach ($loc_fields as $loc)
+ if($origin_table)
+ {
+ $this->db2->query("SELECT location_code
FROM {$origin_table} WHERE id = $target_id",__LINE__,__FILE__);
+ $this->db2->next_record();
+ $origin_location_code =
$this->db2->f('location_code');
+ $value_set['location_code'] =
$origin_location_code;
+ $value_set['p_num'] =
$target_id;
+ $value_set['p_entity_id'] =
$p_entity_id;
+ $value_set['p_cat_id'] =
$p_cat_id;
+ $origin_location_code_arr =
explode('-',$origin_location_code);
+ if(isset($origin_location_code_arr[4]))
+ {
+ $value_set['loc5']
= $origin_location_code_arr[4];
+ }
+ }
+
+ }
+ else
{
- if($this->db->f($loc))
+ $loc_fields = array
+ (
+ 'eiendomid',
+ 'byggid',
+ 'etasjeid',
+ 'bruksenhetid',
+ 'romid'
+ );
+
+ $location = array();
+ $j = 1;
+ foreach ($loc_fields as $loc)
{
- if($loc == 'romid')
+ if($this->db->f($loc))
{
- $this->db2->query("SELECT loc5
FROM fm_location5 WHERE rom_nr_id = '" . $this->db->f($loc) . "' AND
location_code {$this->like} '" . implode('-', $location) .
"%'",__LINE__,__FILE__);
-
- $this->db2->next_record();
- if($this->db2->f('loc5'))
+ if($loc == 'romid')
{
- $location[] =
$this->db2->f('loc5');
- $value_set["loc{$j}"] =
$this->db2->f('loc5');
+
$this->db2->query("SELECT loc5 FROM fm_location5 WHERE rom_nr_id = '" .
$this->db->f($loc) . "' AND location_code {$this->like} '" . implode('-',
$location) . "%'",__LINE__,__FILE__);
+
+
$this->db2->next_record();
+
if($this->db2->f('loc5'))
+ {
+ $location[] =
$this->db2->f('loc5');
+
$value_set["loc{$j}"] = $this->db2->f('loc5');
+ }
}
+ else
+ {
+ $location[] =
$this->db->f($loc);
+ $value_set["loc{$j}"] =
$this->db->f($loc);
+ }
}
else
{
- $location[] =
$this->db->f($loc);
- $value_set["loc{$j}"] =
$this->db->f($loc);
+ break;
}
+ $j++;
}
- else
+ if($location)
{
- break;
+ $value_set['location_code'] =
implode('-', $location);
}
- $j++;
}
-
- if($location)
+
+ if($value_set)
{
- $value_set['location_code'] = implode('-',
$location);
$value_set =
$this->db->validate_update($value_set);
$this->db->query("UPDATE $target_table SET
$value_set WHERE id= {$_id}",__LINE__,__FILE__);
}
Modified: branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-04-05 19:08:04 UTC (rev 7183)
+++ branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-04-05 19:14:30 UTC (rev 7184)
@@ -38,7 +38,7 @@
public function __construct()
{
- $this->db = & $GLOBALS['phpgw']->db;
+ $this->db = clone($GLOBALS['phpgw']->db);
$this->join = & $this->db->join;
$this->like = & $this->db->like;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7184] Merge 7182:7183 from trunk,
Sigurd Nes <=