Changeset 162 for dev/common

Timestamp:

12/23/06 02:31:43 (16 years ago)

Author:

exi

Message:

Added externalids to autoupgrade code.
Added custom headers to the http_class.
Added an option to set the socket timeout when using the http_class.
Pushed version to 1.2.2 in globals.php.
Fixed a bug in the battle parser which prevented it from parsing kills of the last day.
Added code to the synchronization module so it can handle item value updates as well.
Changed killists so they don't list kills as a kill anymore where an corp/alliance member has been killed, right, those are now pure losses. This should also resolve an issue with the battle parser going mad.

Location:

dev/common

Files:

• admin.php (modified) (1 diff)
• admin_sync.php (modified) (8 diffs)
• autoupgrade.php (modified) (1 diff)
• class.http.php (modified) (5 diffs)
• class.killlist.php (modified) (2 diffs)
• globals.php (modified) (1 diff)
• kill_related.php (modified) (1 diff)
• sync_server.php (modified) (5 diffs)

dev/common/admin.php

@@ -23 +23 @@
 check_tblstrct5();
 chk_kb3_items();
+chk_kb3_items2();
 check_tblstrct6();
 

dev/common/admin_sync.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
 require_once("class.page.php");
 require_once("class.contract.php");
@@ -10 +9 @@
 $page->setTitle("Administration - Synchronization");
 
-if ($_REQUEST['do'] == "sync")
+if ($_REQUEST['do'] == 'sync')
 {
-    $do_sync = true;
-}
+    $http = new http_request(KB_SYNCURL);
+    $fp = $http->connect();
+    if (!$fp)
+    {
+        $html .= "Could not connect to Server:<br/>\n";
+        $html .= $http-getError();
 
-if ($do_sync)
-{
+        $page->addContext($menubox->generate());
+        $page->setContent($html);
+        $page->generate();
+        return;
+    }
+
+    $content_file = 'DATA_START';
     $qry = new DBQuery();
     $qry->execute("select plt_name, plt_externalid from kb3_pilots where plt_externalid != 0");
@@ -24 +32 @@
     }
 
-    $http = new http_request(KB_SYNCURL);
-    $fp = $http->connect();
-    if (!$fp)
+    $content_file .= 'ITEMS_START';
+    $qry->execute("select itm_name, itm_externalid, itm_value from kb3_items where itm_value != 0");
+    while ($data = $qry->getRow())
     {
-        $html .= "Could not connect to Server<br>\n";
+        $content_file .= '§'.$data['itm_name'].'|'.$data['itm_externalid'].'|'.$data['itm_value'].'-';
     }
-}
-if ($do_sync && $fp)
-{
+
     $content_file = gzdeflate($content_file);
 
     $http->set_postdata('data', $content_file);
     $http->set_useragent("EVE-KB SYNC (VER ".KB_VERSION.")");
+    $http->set_header('X-KBHost: '.base64_encode(KB_HOST));
+    $http->setSockettimeout(30);
     $file = $http->get_content();
     $header = $http->get_header();
@@ -58 +66 @@
         // get all names we'll find
         preg_match_all("^!(.*?)\|(.*?)-^", $data, $matches);
-        unset($data);
         $results = count($matches[1]);
         $update = new DBQuery();
@@ -65 +72 @@
             $update->execute("update kb3_pilots set plt_externalid='".addslashes($matches[2][$i])."' where plt_name='".addslashes($matches[1][$i])."' limit 1");
         }
-        $html .= "Synchronization complete, got $results new ids from server running version ".$version[0].'.'.$version[1].'.'.$version[2].'.<br>';
+        $html .= "Synchronization complete, got $results new ids from server running version ".$version[0].'.'.$version[1].'.'.$version[2].'.<br/>';
+
+        if (isset($_REQUEST['itm_update']))
+        {
+            preg_match_all('^§(.*?)\|(.*?)\|(.*?)-^', $data, $matches);
+            unset($data);
+            $results = count($matches[1]);
+            for ($i = 0; $i<$results; $i++)
+            {
+                $update->execute("update kb3_items set itm_externalid='".addslashes($matches[2][$i])."', itm_value='".addslashes($matches[3][$i])."' where itm_name='".addslashes($matches[1][$i])."' limit 1");
+            }
+            if ($results == 0)
+            {
+                $html .= 'No items fetched, itm_sync_module may be offline.<br/>';
+            }
+            else
+            {
+                $html .= $results.' item prices have been fetched.<br/>';
+            }
+        }
+
         $html .= "Sent ".round($sended/1024, 2)." kB and received ".round($recv/1024, 2)." kB of data.<br>\n";
         $html .= '<a href="?a=admin_sync">Back</a>';
@@ -74 +101 @@
         if ($version[1] > $ownversion[1] && $version[1] % 2 == 1)
         {
-            // test vor new minor updates below the dev-version
+            // test for new minor updates below the dev-version
             if ($version[1]-1 > $ownversion[1])
             {
@@ -87 +114 @@
         if ($version[0] > $ownversion[0] || $upgrade)
         {
-            $html .= "Looks like your Killboard version is pretty old, perhaps you want to upgrade it ?<br>\n";
+            $html .= "Looks like your Killboard version is pretty old, perhaps you want to upgrade it ?<br/>\n";
             $html .= "Check the <a href='http://www.eve-dev.net/forums/viewforum.php?f=2'>EVE-Dev Forums</a> for new releases and additional information<br>\n";
         }
@@ -98 +125 @@
     $html .= 'One synchronization every one or two weeks should be enough.<br>';
     $html .= 'Please don\'t abuse this free service!<br>';
-    $html .= '<a href="?a=admin_sync&do=sync">Synchronize now</a>';
+    $html .= '<form id="options" name="options" method="post" action="?a=admin_sync">';
+    $html .= "<table class=kb-subtable>";
+    $html .= "<tr><td width=120><b>Update item values</b></td><td><input type=checkbox name=itm_update id=itm_update";
+    $html .= " checked=\"checked\"></td></tr>";
+    $html .= '<input type="hidden" name="do" value="sync">';
+    $html .= '<tr><td width=120></td><td><input type=submit name=submit value="Synchronize now"></td></tr></table></form>';
 }
 $page->addContext($menubox->generate());

dev/common/autoupgrade.php

@@ -269 +269 @@
     }
 }
+function chk_kb3_items2()
+{
+    $qry = new DBQuery();
+    $query = 'select itm_externalid from kb3_items where itm_name = \'Repair Drone\'';
+    $result = mysql_query($query);
+    $result = mysql_fetch_array($result);
+    if ($result['itm_externalid'] == '9871')
+    {
+        return;
+    }
+    $queries = "
+            update kb3_items set itm_externalid='10246' where itm_name='Mining Drone I';
+            update kb3_items set itm_externalid='10248' where itm_name='Mining Drone - Improved UNUSED';
+            update kb3_items set itm_externalid='10250' where itm_name='Mining Drone II';
+            update kb3_items set itm_externalid='1187' where itm_name='Mining Drone - Elite';
+            update kb3_items set itm_externalid='1201' where itm_name='Proximity Drone';
+            update kb3_items set itm_externalid='1202' where itm_name='Wasp I';
+            update kb3_items set itm_externalid='15508' where itm_name='Civilian Mining Drone';
+            update kb3_items set itm_externalid='15510' where itm_name='Vespa I';
+            update kb3_items set itm_externalid='16206' where itm_name='Valkyrie I';
+            update kb3_items set itm_externalid='17565' where itm_name='Hellhound I';
+            update kb3_items set itm_externalid='21050' where itm_name='Unanchoring Drone';
+            update kb3_items set itm_externalid='21638' where itm_name='Survey Drone';
+            update kb3_items set itm_externalid='21640' where itm_name='Vespa II';
+            update kb3_items set itm_externalid='2173' where itm_name='Valkyrie II';
+            update kb3_items set itm_externalid='2175' where itm_name='Infiltrator I';
+            update kb3_items set itm_externalid='2183' where itm_name='Infiltrator II';
+            update kb3_items set itm_externalid='2185' where itm_name='Hammerhead I';
+            update kb3_items set itm_externalid='2193' where itm_name='Hammerhead II';
+            update kb3_items set itm_externalid='2195' where itm_name='Praetor I';
+            update kb3_items set itm_externalid='2203' where itm_name='Praetor II';
+            update kb3_items set itm_externalid='2205' where itm_name='Acolyte I';
+            update kb3_items set itm_externalid='2205' where itm_name='Acolyte II';
+            update kb3_items set itm_externalid='22572' where itm_name='Praetor EV-900';
+            update kb3_items set itm_externalid='22574' where itm_name='Warp Scrambling Drone';
+            update kb3_items set itm_externalid='22713' where itm_name='10mn webscramblifying Drone';
+            update kb3_items set itm_externalid='22765' where itm_name='Heavy Shield Maintenance Bot I';
+            update kb3_items set itm_externalid='22780' where itm_name='Fighter Uno';
+            update kb3_items set itm_externalid='23055' where itm_name='Templar';
+            update kb3_items set itm_externalid='23057' where itm_name='Dragonfly';
+            update kb3_items set itm_externalid='23059' where itm_name='Firbolg';
+            update kb3_items set itm_externalid='23061' where itm_name='Einherji';
+            update kb3_items set itm_externalid='23473' where itm_name='Wasp EC-900';
+            update kb3_items set itm_externalid='23506' where itm_name='Ogre SD-900';
+            update kb3_items set itm_externalid='23510' where itm_name='Praetor TD-900';
+            update kb3_items set itm_externalid='23512' where itm_name='Berserker TP-900';
+            update kb3_items set itm_externalid='23523' where itm_name='Heavy Armor Maintenance Bot I';
+            update kb3_items set itm_externalid='23525' where itm_name='Curator I';
+            update kb3_items set itm_externalid='23559' where itm_name='Berserker SW-900';
+            update kb3_items set itm_externalid='23559' where itm_name='Warden I';
+            update kb3_items set itm_externalid='23561' where itm_name='Garde I';
+            update kb3_items set itm_externalid='23563' where itm_name='Bouncer I';
+            update kb3_items set itm_externalid='23659' where itm_name='Acolyte EV-300';
+            update kb3_items set itm_externalid='23702' where itm_name='Infiltrator EV-600';
+            update kb3_items set itm_externalid='23705' where itm_name='Vespa EC-600';
+            update kb3_items set itm_externalid='23707' where itm_name='Hornet EC-300';
+            update kb3_items set itm_externalid='23709' where itm_name='Medium Armor Maintenance Bot I';
+            update kb3_items set itm_externalid='23711' where itm_name='Light Armor Maintenance Bot I';
+            update kb3_items set itm_externalid='23713' where itm_name='Hammerhead SD-600';
+            update kb3_items set itm_externalid='23715' where itm_name='Hobgoblin SD-300';
+            update kb3_items set itm_externalid='23717' where itm_name='Medium Shield Maintenance Bot I';
+            update kb3_items set itm_externalid='23719' where itm_name='Light Shield Maintenance Bot I';
+            update kb3_items set itm_externalid='23721' where itm_name='Valkyrie TP-600';
+            update kb3_items set itm_externalid='23723' where itm_name='Warrior TP-300';
+            update kb3_items set itm_externalid='23725' where itm_name='Infiltrator TD-600';
+            update kb3_items set itm_externalid='23727' where itm_name='Acolyte TD-300';
+            update kb3_items set itm_externalid='23729' where itm_name='Valkyrie SW-600';
+            update kb3_items set itm_externalid='23731' where itm_name='Warrior SW-300';
+            update kb3_items set itm_externalid='23759' where itm_name='FA-14 Templar';
+            update kb3_items set itm_externalid='2436' where itm_name='Wasp II';
+            update kb3_items set itm_externalid='2444' where itm_name='Ogre I';
+            update kb3_items set itm_externalid='2446' where itm_name='Ogre II';
+            update kb3_items set itm_externalid='2454' where itm_name='Hobgoblin I';
+            update kb3_items set itm_externalid='2456' where itm_name='Hobgoblin II';
+            update kb3_items set itm_externalid='24618' where itm_name='horrible tracking drone';
+            update kb3_items set itm_externalid='2464' where itm_name='Hornet I';
+            update kb3_items set itm_externalid='2466' where itm_name='Hornet II';
+            update kb3_items set itm_externalid='2476' where itm_name='Berserker I';
+            update kb3_items set itm_externalid='2478' where itm_name='Berserker II';
+            update kb3_items set itm_externalid='2486' where itm_name='Warrior I';
+            update kb3_items set itm_externalid='2488' where itm_name='Warrior II';
+            update kb3_items set itm_externalid='3218' where itm_name='Harvester Mining Drone';
+            update kb3_items set itm_externalid='3549' where itm_name='Tutorial Attack Drone';
+            update kb3_items set itm_externalid='9871' where itm_name='Repair Drone';
+        ";
+    $query = explode("\n", $queries);
+    foreach ($query as $querystring)
+    {
+        if ($string = trim(str_replace(');', ')', $querystring)))
+        {
+            $qry->execute($string);
+        }
+    }
+}
 function check_tblstrct6()
 {

dev/common/class.http.php

@@ -20 +20 @@
         $this->postform = array();
         $this->postdata = array();
+        $this->headers = array();
+        $this->socket_timeout = 5;
+    }
+
+    // socket timeout is the amount of time in second which is waited
+    // for incoming data, set higher if you request stuff from heavy-loaded
+    // scripts or compressed data streams
+    function setSockettimeout($int)
+    {
+        $this->socket_timeout = $int;
     }
 
@@ -54 +64 @@
         if (!$this->fp)
         {
-            //echo "Error occured with fsockopen: $errstr ($errno)<br>\n";
+            $this->_errno = $errno;
+            $this->_errstr = $errstr;
             return false;
         }
         return true;
+    }
+
+    function getError()
+    {
+        return 'Error occured with fsockopen: '.$this->_errstr.' ('.$this->_errno.')<br/>'."\n";
     }
 
@@ -82 +98 @@
                           .'Host: '.$this->url['host'].$lf
                           .'Connection: close'.$lf;
+        if (count($this->headers))
+        {
+            $request_string .= join($lf, $this->headers).$lf;
+        }
         if ($this->method == 'POST')
         {
@@ -115 +135 @@
 
         $header = 1;
-        socket_set_timeout($fp, 5);
+        socket_set_timeout($fp, $this->socket_timeout);
         while ($line = fgets($fp, 4096))
         {
@@ -161 +181 @@
         $this->useragent = $string;
     }
+
+    function set_header($headerstring)
+    {
+        if (!strpos($headerstring, ':'))
+        {
+            return;
+        }
+        $this->headers[$headerstring] = $headerstring;
+    }
 }
 ?>

dev/common/class.killlist.php

@@ -59 +59 @@
             if ($config->getConfig('ship_values'))
             {
-                $this->sql_ .= ' left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
+                $this->sql_ .= ' left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id) ';
             }
 
@@ -83 +83 @@
                 if ($this->inv_crp_)
                     $this->sql_ .= " inner join kb3_inv_crp inc
-                              on ( inc.inc_crp_id in ( ".substr($this->inv_crp_, 0, strlen($this->inv_crp_) - 2)." ) and kll.kll_id = inc.inc_kll_id ) ";
+                              on ( inc.inc_crp_id in ( ".substr($this->inv_crp_, 0, strlen($this->inv_crp_) - 2)." ) and kll.kll_id = inc.inc_kll_id
+                               and inc.inc_crp_id != kll.kll_crp_id ) ";
                 if ($this->inv_all_)
                     $this->sql_ .= " inner join kb3_inv_all ina
-                              on ( ina.ina_all_id in ( ".substr($this->inv_all_, 0, strlen($this->inv_all_) - 2)." ) and kll.kll_id = ina.ina_kll_id ) ";
+                              on ( ina.ina_all_id in ( ".substr($this->inv_all_, 0, strlen($this->inv_all_) - 2)." ) and kll.kll_id = ina.ina_kll_id
+                               and ina.ina_all_id != kll.kll_all_id ) ";
             }
             else

dev/common/globals.php

@@ -6 +6 @@
 // current version: major.minor.sub
 // unpair numbers for minor = development version
-define('KB_VERSION', '1.2.1');
+define('KB_VERSION', '1.2.2');
 
 // set the running-server for id-syncs here

dev/common/kill_related.php

@@ -56 +56 @@
 {
     $h = ($baseh-$i) % 24;
+    if ($h < 0)
+    {
+        $h += 24;
+    }
     if (!isset($ts[$h]))
     {

dev/common/sync_server.php

@@ -18 +18 @@
 if ($version[0] <= 1 && $version[1] < 1)
 {
-    echo "Your Killboard is too old, please upgrade to 1.2.0 or newer<br>\n";
+    echo "Your Killboard is too old, please upgrade to 1.2.2 or newer<br>\n";
     return;
+}
+
+if (!function_exists('apache_request_headers'))
+{
+    function apache_request_headers()
+    {
+        return getallheaders();
+    }
+}
+$header = apache_request_headers();
+foreach ($header as $key => $value)
+{
+    if ($key == 'X-KBHost')
+    {
+        $host = base64_decode($value);
+    }
 }
 
@@ -36 +52 @@
 // get all names we'll find
 preg_match_all("^!(.*?)\|(.*?)-^", &$data, $matches);
-unset($data);
+$data = strstr($data, 'ITEMS_START');
 $results = count($matches[1]);
 if ($results == 0)
@@ -46 +62 @@
 }
 
+$s_data = array();
 // construct an array with name as key and id as value
 for ($i = 0; $i<$results; $i++)
@@ -51 +68 @@
     $s_data[$matches[1][$i]] = $matches[2][$i];
 }
+unset($matches);
+
+if ($host)
+{
+    $qry = new DBQuery();
+    $qry->execute("show tables like '%item_%'");
+    while ($row = $qry->getRow())
+    {
+        $tables .= array_pop($row);
+    }
+    if (!strstr($tables, 'kb3_item_stats'))
+    {
+        $qry->execute("CREATE TABLE `kb3_item_stats` (\n `itm_name` varchar(128) NOT NULL,\n `kb_host` int(11) NOT NULL,\n `itm_externalid` int(11) NOT NULL,\n `itm_value` bigint(4) NOT NULL,\n PRIMARY KEY (`itm_name`,`kb_host`)\n) TYPE=MyISAM");
+        $qry->execute("CREATE TABLE `kb3_item_hosts` (\n `kb_host` int(11) NOT NULL,\n `kb_name` varchar(255) NOT NULL,\n `itm_update` timestamp NOT NULL default '0000-00-00 00:00:00',\n RPIMARY KEY (`kb_host`)\n) TYPE=MyISAM");
+    }
+    preg_match_all('^§(.*?)\|(.*?)\|(.*?)-^', &$data, $matches);
+
+    $hostid = abs(crc32($host));
+    $qry->execute('replace into kb3_item_hosts (kb_host, kb_name, itm_update) VALUES (\''.$hostid.'\',\''.addslashes($host).'\',\''.date('Y-m-d H:i:s').'\')');
+
+    $results = count($matches[1]);
+    for ($i = 0; $i<$results; $i++)
+    {
+        $qry->execute("replace into kb3_item_stats (itm_name,kb_host,itm_externalid,itm_value) VALUES ('".addslashes($matches[1][$i])."','".$hostid."','".addslashes($matches[2][$i])."','".addslashes($matches[3][$i])."')");
+    }
+}
+unset($data);
 
 // now get our list from the database
@@ -84 +128 @@
 }
 
+$data_array = $data_values = array();
+$qry->execute('select itm_name, itm_externalid, itm_value from kb3_item_stats order by itm_name asc, itm_value asc');
+while ($data = $qry->getRow())
+{
+    $data_array[$data['itm_name']] = $data;
+    $data_values[$data['itm_name']][] = $data['itm_value'];
+}
+
+$content_file .= 'ITEMS_START';
+foreach ($data_array as $data)
+{
+    // get the median value for every item
+    $val_cnt = count($data_values[$data['itm_name']]);
+    $val_cnt = min(ceil($val_cnt/2), $val_cnt)-1;
+    $value = $data_values[$data['itm_name']][$val_cnt];
+
+    $content_file .= '§'.$data['itm_name'].'|'.$data['itm_externalid'].'|'.$value.'-';
+}
+
 // return the compressed data back to the client
 echo gzdeflate($content_file);