Changeset 63

Timestamp:

11/08/06 04:45:54 (16 years ago)

Author:

exi

Message:

Attempt to fix the parser for items destroyed in a container.
Removed the authentication check for the csv killmail importer so new killboards with trimmed databases can be setup easier.

Location:

dev/common

Files:

• class.parser.php (modified) (5 diffs)
• kill_import_csv.php (modified) (1 diff)

dev/common/class.parser.php

@@ -211 +211 @@
             {
                 if ($destroyed[$i] == "")
+                {
                     $i++;
+                    continue;
+                }
 
                 if ($destroyed[$i] == "Empty.")
@@ -217 +220 @@
                     $container = false;
                     $i++;
+                    continue;
                 }
 
@@ -224 +228 @@
                 $quantity = "";
                 $location = "";
-                $container = false;
-
-                if (strpos($destroyed[$i], "Container") > 0 &&
-                        strpos($destroyed[$i + 1], "(") <= 0 &&
-                        strpos($destroyed[$i + 1], "Empty.") <= 0)
-                    $container = true;
 
                 $qtypos = strpos($destroyed[$i], ", Qty: ");
                 $locpos = strpos($destroyed[$i], "(");
 
+                if ($container && $qtypos == false)
+                {
+                    $container = false;
+                }
+                if (strpos($destroyed[$i], "Container"))
+                {
+                    $container = true;
+                }
                 if ($qtypos <= 0 && !$locpos)
                 {
@@ -239 +245 @@
                     if ($container) $location = "Cargo";
                 }
-
                 if ($qtypos > 0 && !$locpos)
                 {
@@ -267 +272 @@
                 if ($quantity == "")
                     $quantity = 1;
-                // echo $container." - ".$item." - ".$quantity." - ".$location."<br>";
+
                 $item = new Item();
                 $item->lookup(trim($itemname));

dev/common/kill_import_csv.php

@@ -1 @@
-<?
-/********************************************
+<?php
+/**
  * Import kills from a csv formatted text
  * Used together with export tool!
- *
- * *****************************************/
+ */
 
-require_once( "class.page.php" );
-require_once( "globals.php" );
-require_once( "class.parser.php" );
-require_once( "class.killlist.php" );
-require_once( "admin_menu.php" );
+require_once("class.page.php");
+require_once("globals.php");
+require_once("class.parser.php");
+require_once("class.killlist.php");
+require_once("admin_menu.php");
 
-$page = new Page( "Administration - Killmail import" );
+$page = new Page("Administration - Killmail import");
 $page->setAdmin();
 
-if ( !$_POST['killmail'] ) {
-        $html .= "<b>Killmails in same format as export (Comma Seperated - csv):</b><br>";
-        $html .= "<form id=postform name=postform class=f_killmail method=post action=\"?a=kill_import_csv\">";
-        $html .= "<textarea class=killmail id=killmail name=killmail cols=\"55\" rows=\"35\"></textarea><br><br>";
-        $html .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input id=submit name=submit type=submit value=\"Process !\"></input>";
-        $html .= "</form>";
-} else {
+if (!$_POST['killmail'])
+{
+    $html .= "<b>Killmails in same format as export (Comma Seperated - csv):</b><br>";
+    $html .= "<form id=postform name=postform class=f_killmail method=post action=\"?a=kill_import_csv\">";
+    $html .= "<textarea class=killmail id=killmail name=killmail cols=\"55\" rows=\"35\"></textarea><br><br>";
+    $html .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input id=submit name=submit type=submit value=\"Process !\"></input>";
+    $html .= "</form>";
+}
+else
+{
+    // Set delimiter
+    $splitter = ',\n\n';
+    $killmail = $_POST['killmail'];
 
+    // Replace double quotes with single
+    $killmail = str_replace('""', "'", $killmail);
 
-        // Set delimiter
-        $splitter=',\n\n';
-        $killmail = $_POST['killmail'];
-        // Replace double quotes with single
-        $killmail = str_replace('""', "'", $killmail);
-        // Replace \ with nothing
-        $killmail = str_replace('\\', "", $killmail);
-        // Explodes to array
-        $getstrings = explode('"', $splitter.$killmail.$splitter);
-        // Set lenght of delimiter
-        $delimlen = strlen($splitter);
-        // Default
-        $instring = 0;
+    // Replace \ with nothing
+    $killmail = str_replace('\\', "", $killmail);
 
-        // String magic :) 
-        while (list($arg, $val) = each($getstrings)) {
-                if ($instring==1) {
-                        $result[] = $val;
-                        $instring = 0;
-                } else {
-                        if ((strlen($val)-$delimlen-$delimlen) >= 1) {
-                                $temparray = split($splitter, substr($val, $delimlen, strlen($val)-$delimlen-$delimlen ) );
-                                while(list($iarg, $ival) = each($temparray)) {
-                                        $result[] = trim($ival);
-                                }
-                        }
-                        $instring = 1;
-                }
-        }
+    // Explodes to array
+    $getstrings = explode('"', $splitter . $killmail . $splitter);
 
-        // Parses killmails one by one.
-        foreach($result as $killmail) {
-                $parser = new Parser( $killmail );
-                $killid = $parser->parse( true );
-                // Make response
-                if ( $killid == 0 ) $html .= "Killmail is malformed.<br>";
-                if ( $killid == -1 ) $html .= "That killmail has already been posted <a href=\"?a=kill_detail&kll_id=".$parser->dupeid_."\">here</a>.<br>";
-                if ( $killid == -2 ) $html .= "You are not authorized to post this killmail.<br>";
-                if ( $killid >= 1 ) $html .= "Killmail imported succesfully <a href=\"?a=kill_detail&kll_id=".$parser->dupeid_."\">here</a>.<br>";
-                unset($killid);
-                unset($parser);
-        }
+    // Set lenght of delimiter
+    $delimlen = strlen($splitter);
+
+    // Default
+    $instring = 0;
+
+    // String magic :)
+    while (list($arg, $val) = each($getstrings))
+    {
+        if ($instring == 1)
+        {
+            $result[] = $val;
+            $instring = 0;
+        }
+        else
+        {
+            if ((strlen($val) - $delimlen - $delimlen) >= 1)
+            {
+                $temparray = split($splitter, substr($val, $delimlen, strlen($val) - $delimlen - $delimlen));
+                while (list($iarg, $ival) = each($temparray))
+                {
+                    $result[] = trim($ival);
+                }
+            }
+            $instring = 1;
+        }
+    }
+    // Parses killmails one by one.
+    foreach ($result as $killmail)
+    {
+        $parser = new Parser($killmail);
+        $killid = $parser->parse(false);
+        // Make response
+        if ($killid == 0)
+        {
+            $html .= "Killmail is malformed.<br>";
+        }
+        elseif ($killid == -1)
+        {
+            $html .= "That killmail has already been posted <a href=\"?a=kill_detail&kll_id=" . $parser->dupeid_ . "\">here</a>.<br>";
+        }
+        elseif ($killid == -2)
+        {
+            $html .= "You are not authorized to post this killmail.<br>";
+        }
+        elseif ($killid >= 1)
+        {
+            $html .= "Killmail imported succesfully <a href=\"?a=kill_detail&kll_id=" . $parser->dupeid_ . "\">here</a>.<br>";
+        }
+    }
 }
 
-
-
-$page->setContent( $html );
-$page->addContext( $menubox->generate() );
+$page->setContent($html);
+$page->addContext($menubox->generate());
 $page->generate();
 ?>