Changeset 209

Timestamp:

05/01/07 15:48:10 (16 years ago)

Author:

exi

Message:

Added the CombinedKillList?-Object which can be used to combine several killlists into one for the killlisttable-object.
Added counting code for the query cache.
Fixed a sql bug in toplist.

Location:

dev

Files:

• common/includes/class.config.php (modified) (1 diff)
• common/includes/class.db.php (modified) (2 diffs)
• common/includes/class.db_cache.php (modified) (2 diffs)
• common/includes/class.killlist.php (modified) (1 diff)
• common/includes/class.page.php (modified) (1 diff)
• common/includes/class.ship.php (modified) (2 diffs)
• common/includes/class.toplist.php (modified) (6 diffs)
• templates/index.tpl (modified) (1 diff)

dev/common/includes/class.config.php

@@ -150 +150 @@
         if (isset($cache[$key]))
         {
-            if ($cache[$key] == $value)
+            if ($cache[$key] === $value)
             {
                 return;

dev/common/includes/class.db.php

@@ -38 +38 @@
     }
 
+    function queryCount($increase = false)
+    {
+        static $count;
+
+        if ($increase)
+        {
+            $count++;
+        }
+
+        return $count;
+    }
+
     function execute($sql)
     {
@@ -65 +77 @@
             file_put_contents('/tmp/profile.lst', $sql . "\nExecution time: " . $this->exectime_ . "\n", FILE_APPEND);
         }
+
+        $this->queryCount(true);
 
         return true;

dev/common/includes/class.db_cache.php

@@ -227 +227 @@
         {
             $this->loadCache();
+            $this->queryCachedCount(true);
             return true;
         }
@@ -265 +266 @@
         }
 
+        $this->queryCount(true);
         return true;
+    }
+
+    function queryCount($increase = false)
+    {
+        static $count;
+
+        if ($increase)
+        {
+            $count++;
+        }
+
+        return $count;
+    }
+
+    function queryCachedCount($increase = false)
+    {
+        static $count;
+
+        if ($increase)
+        {
+            $count++;
+        }
+
+        return $count;
     }
 

dev/common/includes/class.killlist.php

@@ -484 +484 @@
     }
 }
+
+class CombinedKillList extends KillList
+{
+    function CombinedKillList()
+    {
+        // please only load killlists here
+        $this->lists = func_get_args();
+        if (!is_array($this->lists))
+        {
+            trigger_error('No killlists given to CombinedKillList', E_USER_ERROR);
+        }
+        $this->kills = false;
+    }
+
+    function buildKillArray()
+    {
+        $this->kills = array();
+        foreach ($this->lists as $killlist)
+        {
+            // reset the list
+            $killlist->rewind();
+
+            // load all kills and store them in an array
+            while ($kill = $killlist->getKill())
+            {
+                // take sure that if there are multiple kills all are stored
+                if (isset($this->kills[$kill->timestamp_]))
+                {
+                    $this->kills[$kill->timestamp_.rand()] = $kill;
+                }
+                else
+                {
+                    $this->kills[$kill->timestamp_] = $kill;
+                }
+            }
+        }
+
+        // sort the kills by time
+        krsort($this->kills);
+    }
+
+    function getKill()
+    {
+        // on the first request we load up our kills
+        if ($this->kills == false)
+        {
+            $this->buildKillArray();
+        }
+
+        // once all kills are out this will return null so we're fine
+        return array_shift($this->kills);
+    }
+
+    function rewind()
+    {
+        // intentionally left empty to overload the standard handle
+    }
+}
 ?>

dev/common/includes/class.page.php

@@ -124 +124 @@
         $this->processingtime_ = $this->timeend_ - $this->timestart_;
 
+        $qry = new DBQuery();
+        if (method_exists($qry, 'queryCachedCount'))
+        {
+            $smarty->assign('profile_sql_cached', $qry->queryCachedCount());
+        }
+        $smarty->assign('profile_sql', $qry->queryCount());
         $smarty->assign('profile_time', $this->processingtime_);
         $smarty->assign('profile', KB_PROFILE);

dev/common/includes/class.ship.php

@@ -74 +74 @@
             $this->sql_ = "select * from kb3_ships shp
                            inner join kb3_ship_classes scl on shp.shp_class = scl.scl_id";
-            if ($config->getConfig('ship_values'))
+            if (config::get('ship_values'))
             {
                 $this->sql_ .= ' left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id) ';
@@ -86 +86 @@
             $this->shiptechlevel_ = $row['shp_techlevel'];
             $this->externalid_ = $row['shp_externalid'];
-            if ($config->getConfig('ship_values'))
+
+            if (config::get('ship_values'))
             {
                 if (!$this->value_ = $row['shp_value'])

dev/common/includes/class.toplist.php

@@ -213 +213 @@
             $op = "or";
         }
-        else $op = "and";
+        else
+        {
+            $this->sql_ .= ' where 1=1 ';
+            $op = "and";
+        }
 
         if ($this->vic_plt_)
@@ -277 +281 @@
         $this->setSQLBottom("group by ind.ind_plt_id order by 1 desc
                             limit 30");
-                if (count($this->vic_scl_id)){
-                        $this->setPodsNoobShips(false);
-                }else{
-                        $this->setPodsNoobShips(true);
-                }
+        if (count($this->vic_scl_id))
+        {
+            $this->setPodsNoobShips(false);
+        }
+        else
+        {
+            $this->setPodsNoobShips(true);
+        }
     }
 }
@@ -309 +316 @@
         $this->setSQLBottom("group by ind.ind_crp_id order by 1 desc
                             limit 30");
-         if (count($this->vic_scl_id)){
-                $this->setPodsNoobShips(false);
-         }else{
-                $this->setPodsNoobShips(true);
-         }
-
+        if (count($this->vic_scl_id))
+        {
+            $this->setPodsNoobShips(false);
+        }
+        else
+        {
+            $this->setPodsNoobShips(true);
+        }
     }
 }
@@ -366 +375 @@
         $this->setSQLBottom("group by kll.kll_victim_id order by 1 desc
                             limit 30");
-         if (!count($this->vic_scl_id_)){
-                 $this->setPodsNoobShips(false);
-         }
+        if (!count($this->vic_scl_id_))
+        {
+            $this->setPodsNoobShips(false);
+        }
     }
 }
@@ -385 +395 @@
         $this->setSQLBottom("group by kll.kll_crp_id order by 1 desc
                             limit 30");
-        if (count($this->vic_scl_id)){
-                $this->setPodsNoobShips(false);
-         }else{
-                $this->setPodsNoobShips(true);
-         }
+        if (count($this->vic_scl_id))
+        {
+            $this->setPodsNoobShips(false);
+        }
+        else
+        {
+            $this->setPodsNoobShips(true);
+        }
     }
 }
@@ -920 +933 @@
         while ($row = $this->toplist_->getRow())
         {
-                        $item = new Item($row['itm_id']);
+            $item = new Item($row['itm_id']);
             if ($odd)
             {

dev/templates/index.tpl

@@ -46 +46 @@
 {if $profile}
 <table class="kb-subtable" width="99%" border="0">
-<tr><td height="100%" align="right" valign="bottom">{$profile_time}s</td></tr>
+<tr><td height="100%" align="right" valign="bottom">{$profile_sql} querys{if $profile_sql_cached} (+{$profile_sql_cached} cached) {/if} {$profile_time}s</td></tr>
 </table>
 {else}