Changeset 353

Timestamp:

10/21/08 08:42:44 (14 years ago)

Author:

beans

Message:

Parser fix from FriedRoadKill?

Files:

• dev/common/includes/class.parser.php (modified) (7 diffs)

dev/common/includes/class.parser.php

@@ -34 +34 @@
 
         // Parser fix, since some killmails don't have a final blow, they would break the KB.
-        //On mails without final kill info the first name on the list becomes thefinal blow holder
+        //On mails without final blow info, the first name on the list becomes the final blow holder
         if (strpos($this->killmail_, 'laid the final blow') < 1)
         {
@@ -52 +52 @@
         $upper_limit =  count($victim);
         
-        $victimname = "Unknown";
+        $victimname = "Unknown"; //lovely default values
         $factionname = "None";
         $alliancename = "None";
@@ -67 +67 @@
             if(preg_match("/Victim: (.*)/", $victim[$counter], $matches)) 
             {
-                $victimname = $matches[1];
+                if($matches[1])
+                    $victimname = $matches[1];
             } 
             elseif (preg_match("/Corp: (.*)/", $victim[$counter], $matches)) 
             {
-                $corpname = $matches[1];
+                 if($matches[1])
+                    $corpname = $matches[1];
             }
             elseif (preg_match("/Alliance: (.*)/", $victim[$counter], $matches)) 
             {
-                $alliancename = $matches[1];
+                if($matches[1])
+                    $alliancename = $matches[1];
             }
             elseif (preg_match("/Faction: (.*)/", $victim[$counter], $matches)) 
             {
-                $factionname = $matches[1];
+                if($matches[1])
+                    $factionname = $matches[1];
             }
             elseif (preg_match("/Destroyed: (.*)/", $victim[$counter], $matches)) 
             {
-                $shipname = $matches[1];
+                if($matches[1])
+                    $shipname = $matches[1];
             } 
             elseif (preg_match("/System: (.*)/", $victim[$counter], $matches)) 
             {
-                $systemname = $matches[1];
+                if($matches[1])
+                    $systemname = $matches[1];
             } 
             elseif (preg_match("/Security: (.*)/", $victim[$counter], $matches)) 
             {
-                $systemsec = $matches[1];
+                if($matches[1])
+                    $systemsec = $matches[1];
             } 
             elseif (preg_match("/Damage Taken: (.*)/", $victim[$counter], $matches)) 
             {
-                $dmgtaken = $matches[1];
-                $this->dmgtaken = $dmgtaken;
+                if($matches[1])
+                {
+                    $dmgtaken = $matches[1];
+                    $this->dmgtaken = $dmgtaken;
+                }
             } 
             elseif (preg_match("/Moon: (.*)/", $victim[$counter], $matches)) 
             {
-                $moon = $matches[1];
-                $victimname = $matches[1];
-                $pos = 1;
+                if($matches[1])
+                {
+                    $moon = $matches[1];
+                    $victimname = $matches[1];
+                    $pos = 1;
+                }
             }
         }
@@ -110 +123 @@
         //the rest aren't required but for completeness, you'd want them in :)
         if (strcmp($victimname, 'Unknown') == 0)
+        {
             $this->error('Victim has no name.');
+            unset($victimname); //we unset the variable so that it fails the next check
+        }
         
         if (strcmp($corpname, 'Unknown') == 0)
+        {
             $this->error('Victim has no corp.');
+            unset($corpname);
+        }
             
         if (strcmp($shipname, 'Unknown') == 0)
+        {
             $this->error('Victim has no ship type.');
+            unset($shipname);
+        }
         
         if (strcmp($systemname, 'Unknown') == 0)
+        {
             $this->error('Killmail lacks solar system information.');
+            unset($systemname);
+        }
         
         //modification here
@@ -231 +256 @@
                     if(preg_match("/Name: (.*)/", $involved[$counter], $matches)) 
                     {
-                        if(stristr($involved[$counter], '/'))
+                        if($matches[1]) //new check - involved party has name
                         {
-                            $slash = strpos($involved[$counter], '/');
-                            $name = trim(substr($involved[$counter], 5, $slash-5));
-                            $corperation = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1));
-                            
-                            //now if the corp bit has final blow info, note it
-                            preg_match("/(.*) \\(laid the final blow\\)/", $corperation, $matched);
-                            if($matched[1])
+                            if(stristr($involved[$counter], '/'))
                             {
-                                $finalblow = 1;
-                                $iwname = $name;
-                                $end = strpos($corperation, '(') -1;
-                                $corperation = substr($corperation, 0, $end);
+                                $slash = strpos($involved[$counter], '/');
+                                $name = trim(substr($involved[$counter], 5, $slash-5));
+                                $corperation = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1));
+
+                                //now if the corp bit has final blow info, note it
+                                preg_match("/(.*) \\(laid the final blow\\)/", $corperation, $matched);
+                                if($matched[1])
+                                {
+                                    $finalblow = 1;
+                                    $iwname = $name;
+                                    $end = strpos($corperation, '(') -1;
+                                    $corperation = substr($corperation, 0, $end);
+                                }
+                                else 
+                                {
+                                    $finalblow = 0;
+                                    $iwname = $name;
+                                }
+                                $ipname = $name;
+                                $icname = $corperation;
                             }
-                            else 
-                            {
-                                $finalblow = 0;
-                                $iwname = $name;
-                            }
-                            $ipname = $name;
-                            $icname = $corperation;
-                        }
-                        else
-                        {
-                            $ipname = $matches[1];
-                            preg_match("/(.*) \\(laid the final blow\\)/", $ipname, $matches);
-                            if ($matches[1])
+                            else
                             {
                                 $ipname = $matches[1];
-                                $finalblow = 1;
+                                preg_match("/(.*) \\(laid the final blow\\)/", $ipname, $matches);
+                                if ($matches[1])
+                                {
+                                    $ipname = $matches[1];
+                                    $finalblow = 1;
+                                }
+                                else $finalblow = 0;
                             }
-                            else $finalblow = 0;
                         }
                     }
                     else if(preg_match("/Alliance: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $ianame = $matches[1];
+                        if($matches[1])
+                            $ianame = $matches[1];
                     }
                     else if(preg_match("/Faction: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $ifname = $matches[1];
+                        if($matches[1])
+                            $ifname = $matches[1];
                     }
                     else if(preg_match("/Corp: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $icname = $matches[1];
+                        if($matches[1])
+                            $icname = $matches[1];
                     }
                     else if(preg_match("/Ship: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $isname = $matches[1];
+                        if($matches[1])
+                            $isname = $matches[1];
                     }
                     else if(preg_match("/Weapon: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $iwname = $matches[1];
+                        if($matches[1])
+                            $iwname = $matches[1];
                     }
                     else if(preg_match("/Security: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $secstatus = $matches[1];
+                        if($matches[1])
+                            $secstatus = $matches[1];
                     }
                     else if(preg_match("/Damage Done: (.*)/", $involved[$counter], $matches)) 
                     {
-                        $idmgdone = $matches[1];
+                        if($matches[1])
+                            $idmgdone = $matches[1];
                     }
                     else {
@@ -309 +344 @@
                 $ialliance = new Alliance();
                 $ialliance->add($ianame);
+                
                 $icorp = new Corporation();
-                $icorp->add($icname, $ialliance, $kill->getTimeStamp());
-
+                if (strcmp($icname, 'None') == 0)
+                {
+                    $this->error('Involved party has no corp.');
+                }
+                else
+                {   //don't add corp, because pilots have to be in corps.
+                    $icorp->add($icname, $ialliance, $kill->getTimeStamp());
+                }
+
+                $ipilot = new Pilot(); 
+                
                 if (strcmp($ipname, 'Unknown') == 0)
                 {
-                    $this->error('Involved pilot has no name.');
-                }
-
-                $ipilot = new Pilot();
-                $ipilot->add($ipname, $icorp, $timestamp);
+                    $this->error('Involved party has no name.');
+                }
+                else
+                {
+                    //don't add pilot if the pilot's unknown or dud
+                    $ipilot->add($ipname, $icorp, $timestamp); 
+                }
 
                 $iship = new Ship();
@@ -604 +651 @@
                             'Dropped items:', 'Qty:', 'Unknown', 'Drone Bay', 'Drone Bay');
 
-            //if (strpos($this->killmail, chr(246)) === false)
-            //{
-            //    $this->killmail_ = utf8_decode($this->killmail_);
-            //}
             $this->killmail_ = str_replace($search, $replace, $this->killmail_);
             return;