Changeset 176

Timestamp:

01/12/07 17:06:34 (16 years ago)

Author:

exi

Message:

Changes to sync_server.php to reduce the memory load during script execution.

Location:

dev/common

Files:

• admin_sync.php (modified) (3 diffs)
• sync_server.php (modified) (2 diffs)

dev/common/admin_sync.php

@@ -16 +16 @@
     {
         $html .= "Could not connect to Server:<br/>\n";
-        $html .= $http-getError();
+        $html .= $http->getError();
 
         $page->addContext($menubox->generate());
@@ -79 +79 @@
             unset($data);
             $results = count($matches[1]);
+            if (isset($_REQUEST['itm_overwrite']))
+            {
+                $add_qrystr = '';
+            }
+            else
+            {
+                $add_qrystr = ' AND itm_value=0';
+            }
+
             for ($i = 0; $i<$results; $i++)
             {
-                $update->execute("update kb3_items set itm_externalid='".addslashes($matches[2][$i])."', itm_value='".addslashes($matches[3][$i])."' where itm_name='".addslashes($matches[1][$i])."' limit 1");
+                $update->execute("update kb3_items set itm_externalid='".addslashes($matches[2][$i])."', itm_value='".addslashes($matches[3][$i])."' where itm_name='".addslashes($matches[1][$i])."'".$add_qrystr." limit 1");
             }
             if ($results == 0)
@@ -129 +138 @@
     $html .= "<tr><td width=120><b>Update item values</b></td><td><input type=checkbox name=itm_update id=itm_update";
     $html .= " checked=\"checked\"></td></tr>";
+    $html .= "<tr><td width=120><b>Overwrite local values</b></td><td><input type=checkbox name=itm_overwrite id=itm_overwrite";
+    $html .= " checked=\"checked\">(If disabled only values with 0 will be overwritten)</td></tr>";
     $html .= '<input type="hidden" name="do" value="sync">';
     $html .= '<tr><td width=120></td><td><input type=submit name=submit value="Synchronize now"></td></tr></table></form>';

dev/common/sync_server.php

@@ -93 +93 @@
         $qry->execute("replace into kb3_item_stats (itm_name,kb_host,itm_externalid,itm_value) VALUES ('".addslashes($matches[1][$i])."','".$hostid."','".addslashes($matches[2][$i])."','".addslashes($matches[3][$i])."')");
     }
+    unset($matches);
 }
 unset($data);
@@ -129 +130 @@
 
 $data_array = $data_values = array();
+$lastname = '';
 $qry->execute('select itm_name, itm_externalid, itm_value from kb3_item_stats order by itm_name asc, itm_value asc');
 while ($data = $qry->getRow())
 {
+    // looks like we hit the memory limit so median extraction has to happen here
+    if ($lastname != $data['itm_name'])
+    {
+        // check for lastname due to initialisation
+        if ($lastname)
+        {
+            // get the median value for the item
+            $val_cnt = count($data_values[$lastname]);
+            $val_cnt = min(ceil($val_cnt/2), $val_cnt)-1;
+            $value = $data_values[$lastname][$val_cnt];
+
+            $data_array[$lastname]['itm_value'] = $data;
+            unset($data_values[$lastname]);
+        }
+        $lastname = $data['itm_name'];
+    }
     $data_array[$data['itm_name']] = $data;
     $data_values[$data['itm_name']][] = $data['itm_value'];
 }
+unset($data_values);
 
 $content_file .= 'ITEMS_START';
 foreach ($data_array as $data)
 {
-    // get the median value for every item
-    $val_cnt = count($data_values[$data['itm_name']]);
-    $val_cnt = min(ceil($val_cnt/2), $val_cnt)-1;
-    $value = $data_values[$data['itm_name']][$val_cnt];
-
-    $content_file .= '§'.$data['itm_name'].'|'.$data['itm_externalid'].'|'.$value.'-';
+    $content_file .= '§'.$data['itm_name'].'|'.$data['itm_externalid'].'|'.$data['itm_value'].'-';
 }
+unset($data_array);
 
 // return the compressed data back to the client