Changeset 55

Timestamp:

11/07/06 00:07:45 (16 years ago)

Author:

knifee

Message:

Changed the way that NPCs and POSs are handled.
class.pilot.php: added function get_item_id($name) to change an item name into an item_id. Added function get_item_name($item_id) to get an item_name from an item_id. Modified function getName() to check for # and return a Name based on the stored item_id.

class.parser.php: Chnaged "//NPC or POS"(line 128) to chnage an NPC or POS name into "#<corp_id>#<item_id>"
class.kill.php: Changed function setFBPilotName($fbpilotname) to check for # and return a Name based on the stored item_id.

Location:

dev/common

Files:

• class.kill.php (modified) (4 diffs)
• class.parser.php (modified) (3 diffs)
• class.pilot.php (modified) (2 diffs)

dev/common/class.kill.php

@@ -64 +64 @@
         $this->execQuery();
         return $this->victimalliancename_;
-    }
-    function getVictimAllianceID()
-    {
-        $this->execQuery();
-        return $this->victimallianceid_;
     }
 
@@ -285 +280 @@
             $this->qry_ = new DBQuery();
             $this->sql_ = "select kll.kll_id, kll.kll_timestamp, plt.plt_name,
-                              crp.crp_name, ali.all_name, ali.all_id, kll.kll_ship_id,
+                              crp.crp_name, ali.all_name, kll.kll_ship_id,
                               kll.kll_system_id, kll.kll_ship_id,
                               kll.kll_victim_id, plt.plt_externalid,
@@ -314 +309 @@
             $this->setVictimCorpID($row['kll_crp_id']);
             $this->setVictimCorpName($row['crp_name']);
-            $this->setVictimAllianceID($row['all_id']);
             $this->setVictimAllianceName($row['all_name']);
             $this->setVictimShip(new Ship($row['kll_ship_id']));
@@ -500 +494 @@
     function setFBPilotName($fbpilotname)
     {
-        $this->fbpilotname_ = $fbpilotname;
+        $npc = strpos($fbpilotname, "#");
+                if($npc === false) {
+                $this->fbpilotname_ = $fbpilotname;
+                }
+                else {
+                $name = explode("#",$fbpilotname);
+                $plt = new Pilot();
+                $name = $plt->get_item_name($name[2]);
+                $this->fbpilotname_ = $name;
+                }
     }
 

dev/common/class.parser.php

@@ -106 +106 @@
             preg_match("/Name: (.*)/", $involved[$i], $matches);
             $ipname = $matches[1];
+
             preg_match("/(.*) \(laid the final blow\)/", $ipname, $matches);
             if ($matches[1])
@@ -129 +130 @@
                     $secstatus = "0.0";
                 preg_match("/(.*) \/ (.*)/", $ipname, $pmatches);
-                $ipname = $pmatches[1];
+                $npc_pilot = new Pilot();
                 $icname = $pmatches[2];
                 $isname = "Unknown";
@@ -135 +136 @@
                 $tmpcorp = new Corporation();
                 $tmpcorp->lookup($icname);
+                                $ipname = "#".$tmpcorp->id_."#".$npc_pilot->get_item_id($pmatches[1]);
                 $tmpall = $tmpcorp->getAlliance();
                 if ($tmpcorp->getID())

dev/common/class.pilot.php

@@ -5 +5 @@
 class Pilot
 {
+        function get_item_id($name)
+    {
+        $qry = new DBQuery();
+        $qry->execute("select *
+                        from kb3_items
+                       where itm_name = '" . slashfix($name) . "'");
+
+        $row = $qry->getRow();
+        if ($row['itm_id']) return $row['itm_id'];
+    }
+        
+        function get_item_name($item_id)
+    {
+        $qry = new DBQuery();
+        $qry->execute("select *
+                        from kb3_items
+                       where itm_id = '" . $item_id . "'");
+
+        $row = $qry->getRow();
+        if ($row['itm_name']) return $row['itm_name'];
+    }
+
     function Pilot($id = 0)
     {
@@ -19 +41 @@
     {
         $this->execQuery();
-        return $this->row_['plt_name'];
+                $npc = strpos($this->row_['plt_name'], "#");
+                if($npc === false) {
+                return $this->row_['plt_name'];
+                }
+                else {
+                $name = explode("#",$this->row_['plt_name']);
+                $name = $this->get_item_name($name[2]);
+                return $name;
+                }
+        
     }