From 412ecbba6360b0f03939be98cf400a8c9d880a53 Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Wed, 21 Jan 2015 00:32:48 +0100
Subject: [PATCH] dbcampaign: skip existing pilots with wrong fspmethod

Loading existing pilots with a different fspmethod_id is a waste of
time.

Change-Id: I3519a14822029999fa2ed854daff9853c0cbeec1
---
 src/core/cpn/DatabaseCampaign.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/cpn/DatabaseCampaign.cc b/src/core/cpn/DatabaseCampaign.cc
index b808e824..1d445df1 100644
--- a/src/core/cpn/DatabaseCampaign.cc
+++ b/src/core/cpn/DatabaseCampaign.cc
@@ -271,6 +271,7 @@ void DatabaseCampaign::load_completed_pilots(std::vector<Database::Variant> &var
 	sql << "SELECT pilot_id, COUNT(*) FROM fsppilot p"
 	    << " JOIN " << db_connect.result_table() << " r ON r.pilot_id = p.id"
 	    << " WHERE variant_id in (" << variant_str.str() << ")"
+	    << "   AND fspmethod_id IN (SELECT id FROM fspmethod WHERE method LIKE '" << m_fspmethod << "')"
 	    << " GROUP BY pilot_id ";
 	MYSQL_RES *ids = db->query_stream(sql.str().c_str());
 	MYSQL_ROW row;