Changeset 374

Timestamp:

06/14/09 14:06:02 (12 years ago)

Author:

kovell

Message:

kills posted with external id of null, not 0
kb3_pilots unique index on external id changed to index (default is 0, not null)
kb3_kills columns created in correct order

Location:

dev

Files:

• common/includes/class.kill.php (modified) (3 diffs)
• packages/database/kb3_kills/table.xml (modified) (2 diffs)
• packages/database/kb3_pilots/table.xml (modified) (1 diff)

dev/common/includes/class.kill.php

@@ -851 +851 @@
                 if ( $this->timestamp_ == "" || !$this->victimid_ || !$this->victimship_->getID() || !$this->solarsystem_->getID() ||
                 !$this->victimallianceid_ || !$this->victimcorpid_ || !$this->getFBAllianceID() || !$this->getFBCorpID() ||
-                !$this->getFBPilotID() )
-                return 0;
+                !$this->getFBPilotID() ) return 0;
                 if ($id == null)
                 {
@@ -868 +867 @@
                 $qry = new DBQuery();
                 $sql = "INSERT INTO kb3_kills
-            (kll_id , kll_timestamp , kll_victim_id , kll_all_id , kll_crp_id , kll_ship_id , kll_system_id , kll_fb_plt_id , kll_points , kll_dmgtaken, kll_isk_loss)
+            (kll_id , kll_timestamp , kll_victim_id , kll_all_id , kll_crp_id , kll_ship_id , kll_system_id , kll_fb_plt_id , kll_points , kll_dmgtaken, kll_external_id, kll_isk_loss)
             VALUES (".$qid.",
                     date_format('".$this->timestamp_."', '%Y.%m.%d %H:%i:%s'),
@@ -879 +878 @@
             ".$this->calculateKillPoints().",
             ".$this->dmgtaken.",
+                        NULL,
             ".$this->calculateISKLoss()." )";
                 $qry->autocommit(false);

dev/packages/database/kb3_kills/table.xml

@@ -11 +11 @@
   `kll_ship_id` int(3) NOT NULL default 0,
   `kll_system_id` int(4) NOT NULL default 0,
-  `kll_fb_all_id` int(3) default NULL,
+  `kll_fb_plt_id` int(3) default NULL,
   `kll_points` int(11) NOT NULL default 0,
+  `kll_dmgtaken` int(11) NOT NULL default 0,
   `kll_external_id` int(3) default NULL,
   `kll_isk_loss` float NOT NULL default 0,
-  `kll_dmgtaken` int(11) NOT NULL default 0,
   PRIMARY KEY  (`kll_timestamp`,`kll_id`),
   UNIQUE KEY `kll_id` (`kll_id`),
@@ -23 +23 @@
   KEY `kll_crp_id` (`kll_crp_id`),
   KEY `kll_system_id` (`kll_system_id`),
-  KEY `kll_fb_all_id` (`kll_fb_all_id`),
+  KEY `kll_fb_plt_id` (`kll_fb_plt_id`),
   UNIQUE KEY `kll_external_id` (`kll_external_id`)
 ) Type=InnoDB  DEFAULT CHARSET=utf8;</structure>

dev/packages/database/kb3_pilots/table.xml

@@ -11 +11 @@
   PRIMARY KEY  (`plt_id`),
   UNIQUE KEY `plt_name` (`plt_name`),
-  UNIQUE KEY `plt_externalid` (`plt_externalid`)
+  KEY `plt_externalid` (`plt_externalid`)
 ) Type=InnoDB  DEFAULT CHARSET=utf8;</structure>
 </kb3>