Changeset 378

Timestamp:

06/21/09 12:01:49 (12 years ago)

Author:

kovell

Message:

API feed caches date properly. Rank mod has missing TopLists?. Parser has better spelling.

Location:

dev

Files:

• common/includes/class.eveapi.php (modified) (2 diffs)
• common/includes/class.parser.php (modified) (3 diffs)
• mods/rank_mod/rank.php (modified) (1 diff)

dev/common/includes/class.eveapi.php

@@ -63 +63 @@
                 $this->API_CCPErrorCorrecting = config::get('API_CCPErrorCorrecting');
         $this->keyindex_ = $keyindex;
-                
-                
+
+
                 // Initialise for error correcting and missing itemID resolution
                 $this->myIDName = new API_IDtoName();
@@ -402 +402 @@
     function endElement($parser, $name) 
     {
-                if($this->killmailExists_) return;
+                if($this->killmailExists_ && $name != "RESULT") return;
+                else $this->killmailExists_ = false;
         switch ($name) 
         {

dev/common/includes/class.parser.php

@@ -323 +323 @@
                                 $slash = strpos($involved[$counter], '/');
                                 $name = trim(substr($involved[$counter], 5, $slash-5));
-                                $corperation = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1));
+                                $corporation = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1));
 
                                 //alliance lookup for warp disruptors - normal NPCs aren't to be bundled uin
                                 $crp = new Corporation();
-                                $crp->lookup($corperation);
+                                $crp->lookup($corporation);
                                 if($crp->getID() > 0 && stristr($name, ' warp '))
                                 {
@@ -335 +335 @@
 
                                 //now if the corp bit has final blow info, note it
-                                preg_match("/(.*) \\(laid the final blow\\)/", $corperation, $matched);
+                                preg_match("/(.*) \\(laid the final blow\\)/", $corporation, $matched);
                                 if($matched[1])
                                 {
                                     $finalblow = 1;
                                     $iwname = $name;
-                                    $end = strpos($corperation, '(') -1;
-                                    $corperation = substr($corperation, 0, $end);
+                                    $end = strpos($corporation, '(') -1;
+                                    $corporation = substr($corporation, 0, $end);
                                 }
                                 else 
@@ -349 +349 @@
                                 }
                                 $ipname = $name;
-                                $icname = $corperation;
+                                $icname = $corporation;
                             }
                             else

dev/mods/rank_mod/rank.php

@@ -3 +3 @@
 require_once('common/includes/class.pilot.php');
 require_once('common/includes/class.killlist.php');
+
+class TopWeaponListNoLimit extends TopList
+{
+    function TopWeaponList()
+    {
+        $this->TopWeaponListNoLimit();
+    }
+
+    function generate()
+    {
+        $sql = "select count(1) as cnt, ind.ind_wep_id as itm_id, itm.itm_group as itm_grp
+                from kb3_inv_detail ind
+                    inner join kb3_items itm on (itm_id = ind.ind_wep_id)";
+        if (DB_USE_CCP)
+        {
+            $sql = "select count(*) as cnt, ind.ind_wep_id as itm_id, itm.GroupID as itm_grp
+                      from kb3_inv_detail ind
+                      inner join kb3_invtypes itm on (typeID = ind.ind_wep_id)";
+        }
+
+        if ($this->invplt_)
+            $sqlbottom .= " and ind.ind_plt_id = ".$this->invplt_->getID();
+
+        if ($this->invcrp_)
+            $sqlbottom .= " and ind.ind_crp_id = ".$this->invcrp_->getID();
+
+        if ($this->invall_)
+            $sqlbottom .= " and ind.ind_all_id = ".$this->invall_->getID();
+
+        $this->setSQLTop($sql);
+        if (DB_USE_CCP)
+        {
+            // since ccps database doesnt have icons for ships this will also fix the ship as weapon bug
+            $this->setSQLBottom(" and itm.volume < '12000'
+                                  and itm.typeName != 'Unknown'
+                                  group by ind.ind_wep_id order by 1 desc");
+        }
+        else
+        $this->setSQLBottom(" //and itm.itm_icon not in ( '1', 'icon_null' )
+                             and itm.itm_name != 'Unknown'
+                             group by ind.ind_wep_id order by 1 desc");
+    }
+}
+
+class TopShipListNoLimit extends TopShipList
+{
+    function TopShipListNoLimit()
+    {
+        $this->TopShipList();
+    }
+
+    function generate()
+    {
+        $sql = "select count(1) as cnt, ind.ind_shp_id as shp_id, shp.shp_class as cls_id
+              from kb3_inv_detail ind
+              inner join kb3_ships shp on ( shp_id = ind.ind_shp_id )";
+
+        if ($this->invplt_)
+            $sqlbottom .= " and ind.ind_plt_id = ".$this->invplt_->getID();
+
+        if ($this->invcrp_)
+            $sqlbottom .= " and ind.ind_crp_id = ".$this->invcrp_->getID();
+
+        if ($this->invall_)
+            $sqlbottom .= " and ind.ind_all_id = ".$this->invall_->getID();
+
+        $this->setSQLTop($sql);
+        $this->setSQLBottom(" and ind.ind_shp_id != 31
+                             and shp.shp_class != 17
+                             group by ind.ind_shp_id order by 1 desc");
+    }
+}
 
 function TimeID2Str($time_id)