From: Michael Andreen <harv@ruin.nu>
Date: Tue, 22 Jan 2008 08:25:47 +0000 (+0100)
Subject: Update scan parsing for new db
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;ds=sidebyside;h=ce53b2c4f6aaa57596f9fe28260219456ada4bc2;p=NDIRC.git

Update scan parsing for new db
---

diff --git a/Scans.pm b/Scans.pm
index 5ad4b71..ccdc1f3 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -30,10 +30,10 @@ our @EXPORT = qw/addScan addScanGroup sendScan/;
 sub addScan {
 	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 168",undef,$id)){
+		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = ? AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,"type") VALUES (?,tick(),COALESCE(?,'-1'))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,tick(),COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
 					$ND::DBH->do('UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? ',undef,$user[0]);
@@ -51,10 +51,10 @@ sub addScan {
 sub addScanGroup {
 	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE type = 'group' AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
+		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE groupscan AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,"type",scan) VALUES (?,tick(),'group',COALESCE(?,'-1'))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (?,tick(),true,COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
 					$ND::server->command("msg $ND::target Added scan group, at tick $user[3]. Points will be added after parsing");