Changeset 197

Timestamp:

03/31/07 04:19:48 (16 years ago)

Author:

exi

Message:

Some improvements for the battle summary, it went down from over 1500 db queries to 270 for a battle of ~55 kills.
I also improved handling of pods when people made it on a killmail with them.
The config class now writes directly into its cache during initialization, this should bring a few milliseconds.

Location:

dev/common

Files:

• includes/class.config.php (modified) (1 diff)
• kill_related.php (modified) (7 diffs)

dev/common/includes/class.config.php

@@ -95 +95 @@
         $db = new DBQuery();
         $db->execute('select * from kb3_config where cfg_site=\''.KB_SITE."'");
+        $config = &config::_getCache();
         while ($row = $db->getRow())
         {
-            config::put($row['cfg_key'], $row['cfg_value']);
+            $config[$row['cfg_key']] = $row['cfg_value'];
         }
         $config_init = true;

dev/common/kill_related.php

@@ -128 +128 @@
 {
     global $pilots;
+
+    // we need to get all involved pilots, killlists dont supply them
     $qry = new DBQuery();
-    $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status,
-            ind_shp_id, ind_wep_id
+    $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status, ind_shp_id, ind_wep_id,
+            itm_name, plt_name, crp_name, all_name, shp_name, scl_points, scl_id, shp_externalid
             from kb3_inv_detail
+            left join kb3_items on ind_wep_id=itm_id
+            left join kb3_pilots on ind_plt_id=plt_id
+            left join kb3_corps on ind_crp_id=crp_id
+            left join kb3_alliances on ind_all_id=all_id
+            left join kb3_ships on ind_shp_id=shp_id
+            left join kb3_ship_classes on shp_class=scl_id
             where ind_kll_id = ".$kill->getID()."
             order by ind_order";
@@ -138 +146 @@
     while ($row = $qry->getRow())
     {
-        $ship = new Ship($row['ind_shp_id']);
-        $shipc = $ship->getClass();
+        //$ship = new Ship($row['ind_shp_id']);
+        //$shipc = $ship->getClass();
+
+        // check for npc names (copied from pilot class)
+        $pos = strpos($row['plt_name'], "#");
+        if ($pos !== false)
+        {
+            $name = explode("#", $row['plt_name']);
+            $item = new Item($name[2]);
+            $row['plt_name'] = $item->getName();
+        }
 
         // dont set pods as ships for pilots we already have
         if (isset($pilots[$side][$row['ind_plt_id']]))
         {
-            if ($shipc->getID() == 18 || $shipc->getID() == 2)
+            if ($row['scl_id'] == 18 || $row['scl_id'] == 2)
             {
                 continue;
             }
         }
-        $weapon = new Item($row['ind_wep_id']);
-        $pilot = new Pilot($row['ind_plt_id']);
-        $corp = new Corporation($row['ind_crp_id']);
-        $alliance = new Alliance($row['ind_all_id']);
 
         // search for ships with the same id
@@ -159 +172 @@
             foreach ($pilots[$side][$row['ind_plt_id']] as $id => $_ship)
             {
-                if ($ship->getID() == $_ship['sid'])
+                if ($row['ind_shp_id'] == $_ship['sid'])
                 {
                     // we already got that pilot in this ship, continue
@@ -166 +179 @@
             }
         }
-        $pilots[$side][$row['ind_plt_id']][] = array('name' => $pilot->getName(), 'sid' => $ship->getID(),
-               'spic' => $ship->getImage(32), 'aid' => $row['ind_all_id'], 'ts' => strtotime($kill->getTimeStamp()),
-               'corp' => $corp->getName(), 'alliance' => $alliance->getName(), 'scl' => $shipc->getPoints(),
-               'ship' => $ship->getName(), 'weapon' => $weapon->getName(), 'cid' => $row['ind_crp_id']);
+
+        $shipimage = IMG_URL.'/ships/32_32/'.$row['shp_externalid'].'.png';
+        $pilots[$side][$row['ind_plt_id']][] = array('name' => $row['plt_name'], 'sid' => $row['ind_shp_id'],
+               'spic' => $shipimage, 'aid' => $row['ind_all_id'], 'ts' => strtotime($kill->getTimeStamp()),
+               'corp' =>$row['crp_name'], 'alliance' => $row['all_name'], 'scl' => $row['scl_points'],
+               'ship' => $row['shp_name'], 'weapon' => $row['itm_name'], 'cid' => $row['ind_crp_id']);
     }
 }
@@ -188 +203 @@
     if ($shipc->getID() == 18 || $shipc->getID() == 2)
     {
-        // increase the timestamp of a podkill by 1 so its for sure after the shipkill
+        // increase the timestamp of a podkill by 1 so its after the shipkill
         $ts++;
         global $pods;
@@ -333 +348 @@
     foreach ($pilot as $id => $kll)
     {
-        uasort($pilots[$side][$id], 'cmp_ts_func');
+        usort($pilots[$side][$id], 'cmp_ts_func');
     }
 }
@@ -351 +366 @@
             if ($kll[$i]['ship'] == 'Capsule')
             {
-                if (isset($kll[$i-1]['sid']))
+                if (isset($kll[$i-1]['sid']) && isset($kll[$i]['destroyed']))
                 {
                     $pilots[$side][$id][$i-1]['podded'] = true;
                     $pilots[$side][$id][$i-1]['podid'] = $kll[$i]['kll_id'];
                     unset($pilots[$side][$id][$i]);
+                }
+                else
+                {
+                    // now sort out all pods from pilots who previously flown a real ship
+                    $valid_ship = false;
+                    foreach ($kll as $ship)
+                    {
+                        if ($ship['ship'] != 'Capsule')
+                        {
+                            $valid_ship = true;
+                            break;
+                        }
+                    }
+                    if ($valid_ship)
+                    {
+                        unset($pilots[$side][$id][$i]);
+                    }
                 }
             }