Changeset 241 for trunk/system/routerboard.php

Timestamp:

Aug 2, 2009, 4:56:48 PM (15 years ago)

Author:

george

Message:

• Upraveno: Výrazné zrychlení načítání seznamů pomocí print terse.
• Upraveno: Pro použití nové třídy Routerboard přizpůsoben i skript pro generování řízení toku.

File:

• trunk/system/routerboard.php (modified) (4 diffs)

trunk/system/routerboard.php

@@ -109 +109 @@
   }
 
+  function ListGetPrint($Path, $Properties, $Conditions = array())
+  {
+    $ConditionList = '';
+    foreach($Conditions as $Index => $Item)
+    {
+      $ConditionList .= $Index.'="'.$Item.'" ';
+    }
+    $ConditionList = substr($ConditionList, 0, -1);
+    if(trim($ConditionList) != '')
+      $ConditionList = ' where '.$ConditionList;    
+
+    $Result = $this->Execute(implode(' ', $Path).' print terse'.$ConditionList);
+    $List = array();
+    foreach($Result as $ResultLine)
+    {
+      $ResultLineParts = explode(' ', $ResultLine);
+      $ListItem = array();
+      foreach($ResultLineParts as $ResultLinePart)
+      {
+        $Value = explode('=', $ResultLinePart);
+        if(in_array($Value[0], $Properties))
+        {
+          if(count($Value) > 1) 
+          {
+            if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);            
+            //if(strlen($Value[1]) > 0)
+            $ListItem[$Value[0]] = $Value[1];
+          } else $ListItem[$Value[0]] = '';
+        }
+      }
+      if(count($ListItem) > 0) $List[] = $ListItem;
+    }
+    return($List);
+  }
+
   function ListEraseAll($Path)
   {
@@ -114 +149 @@
   }
   
-  function ListUpdate($Path, $Properties, $Values, $Condition = array())
-  {
-    $List = $this->ListGet($Path, $Properties, $Condition);
+  function ListUpdate($Path, $Properties, $Values, $Condition = array(), $UsePrint = false)
+  {
+    if($UsePrint == 0) $List = $this->ListGet($Path, $Properties, $Condition);
+      else $List = $this->ListGetPrint($Path, $Properties, $Condition);
     $Commands = array();
     
@@ -129 +165 @@
       $Values[$Index] = $Item;      
     }
-    
+    foreach($List as $Index => $Item)
+    {
+      foreach($Properties as $Property)
+      {
+        if(!array_key_exists($Property, $Item))
+           $Item[$Property] = '';
+      }
+      $List[$Index] = $Item;      
+    }
+    
+    // Sort properties
+    foreach($Values as $Index => $Item)
+    {
+      ksort($Values[$Index]);
+    }
+    foreach($List as $Index => $Item)
+    {
+      ksort($List[$Index]);
+    }
     print_r($List);
     print_r($Values);
@@ -144 +198 @@
         }
         $Prop = substr($Prop, 0, -1);
-        $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
+        if(trim($Prop) != '')
+          $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
       }
     }