[Fmsystem-commits] [15779] property: clone db inside loop

[sigurdne]

Revision: 15779
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15779
Author:   sigurdne
Date:     2016-10-02 16:19:15 +0000 (Sun, 02 Oct 2016)
Log Message:
-----------
property: clone db inside loop

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.db.inc.php
    trunk/property/inc/class.soadmin_entity.inc.php
    trunk/property/inc/class.soentity.inc.php

Modified: trunk/phpgwapi/inc/class.db.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db.inc.php 2016-10-02 13:27:33 UTC (rev 15778)
+++ trunk/phpgwapi/inc/class.db.inc.php 2016-10-02 16:19:15 UTC (rev 15779)
@@ -99,6 +99,7 @@
                protected $Transaction  = false;
 
                var $persistent = false;
+               var $delayPointer = false;
                /**
                * Constructor
                * @param string $query query to be executed (optional)

Modified: trunk/property/inc/class.soadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.soadmin_entity.inc.php     2016-10-02 13:27:33 UTC 
(rev 15778)
+++ trunk/property/inc/class.soadmin_entity.inc.php     2016-10-02 16:19:15 UTC 
(rev 15779)
@@ -3,7 +3,7 @@
         * phpGroupWare - property: a Facilities Management System.
         *
         * @author Sigurd Nes <address@hidden>
-        * @copyright Copyright (C) 2003-2010 Free Software Foundation, Inc. 
http://www.fsf.org/
+        * @copyright Copyright (C) 2003-2016 Free Software Foundation, Inc. 
http://www.fsf.org/
         * This file is part of phpGroupWare.
         *
         * phpGroupWare is free software; you can redistribute it and/or modify
@@ -1185,28 +1185,11 @@
                                                $type = 
$this->db->get_last_insert_id('fm_bim_type', 'id');
 
                                                $sql = "SELECT * FROM 
fm_{$this->type}_{$category['entity_id']}_{$category['id']}";
-                                               $this->db->query($sql, 
__LINE__, __FILE__);
-                                               while ($this->db->next_record())
+                                               $this->db2->query($sql, 
__LINE__, __FILE__);
+                                               while 
($this->db2->next_record())
                                                {
-                                                       $data = 
$this->db->Record;
-/*
-                                                       $xmldata = 
phpgwapi_xmlhelper::toXML($data, 
"_{$this->type}_{$category['entity_id']}_{$category['id']}");
-                                                       $doc = new 
DOMDocument('1.0', 'utf-8');
-                                                       $doc->loadXML($xmldata);
-                                                       $domElement = 
$doc->getElementsByTagName("_{$this->type}_{$category['entity_id']}_{$category['id']}")->item(0);
-                                                       $domAttribute = 
$doc->createAttribute('appname');
-                                                       $domAttribute->value = 
'property';
+                                                       $data = 
$this->db2->Record;
 
-                                                       // Don't forget to 
append it to the element
-                                                       
$domElement->appendChild($domAttribute);
-
-                                                       // Append it to the 
document itself
-                                                       
$doc->appendChild($domElement);
-
-                                                       
$doc->preserveWhiteSpace = true;
-                                                       $doc->formatOutput = 
true;
-                                                       $xml = $doc->saveXML();
-*/
                                                        $p_location_id = '';
                                                        if ($data['p_cat_id'])
                                                        {
@@ -1233,7 +1216,6 @@
                                                                'location_id' 
=> $location_id,
                                                                'type' => $type,
                                                                'guid' => $guid,
-//                                                             
'xml_representation' => $this->db->db_addslashes($xml),
                                                                
'json_representation' => json_encode($data),
                                                                'model' => 0,
                                                                'p_location_id' 
=> $p_location_id,

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2016-10-02 13:27:33 UTC (rev 
15778)
+++ trunk/property/inc/class.soentity.inc.php   2016-10-02 16:19:15 UTC (rev 
15779)
@@ -335,7 +335,7 @@
                        unset($sql_cnt);
 
                        $this->total_records = $this->db->f('cnt');
-                       _debug_array($sql . $ordermethod);
+//                     _debug_array($sql . $ordermethod);
                        $ordermethod = '';
                        if (!$allrows)
                        {