Fixed for merge

This commit is contained in:
Liam Beckett
2016-09-24 17:40:06 +12:00
parent 1dd8258217
commit 5d6d35276b
@@ -377,7 +377,7 @@ public class Dataset {
ArrayList<Airline> airlinesToImport = parser.getResult(); ArrayList<Airline> airlinesToImport = parser.getResult();
//check for dup //check for dup
int numOfDuplicates = 0; int numOfDuplicates = 0;
int nextID = -1; int nextID = 1;
//query database. //query database.
Connection c = null; Connection c = null;
Statement stmt = null; Statement stmt = null;
@@ -450,7 +450,7 @@ public class Dataset {
ArrayList<Country> countriesToImport = parser.getCountryResult(); ArrayList<Country> countriesToImport = parser.getCountryResult();
//check for dup //check for dup
int numOfDuplicates = 0; int numOfDuplicates = 0;
int nextID = -1; int nextID = 1;
//query database. //query database.
Connection c = null; Connection c = null;
Statement stmt = null; Statement stmt = null;
@@ -582,7 +582,7 @@ public class Dataset {
ArrayList<Route> routesToImport = parser.getResult(); ArrayList<Route> routesToImport = parser.getResult();
//check for dup //check for dup
int numOfDuplicates = 0; int numOfDuplicates = 0;
int nextID = -1; int nextID = 1;
//query database. //query database.
Connection c = null; Connection c = null;
Statement stmt = null; Statement stmt = null;
@@ -724,7 +724,6 @@ public class Dataset {
numOfFlights++; numOfFlights++;
//} //}
} }
System.out.println(insertFlightPointQuery);
if (numOfFlights > 0){ if (numOfFlights > 0){
stmt.execute(insertFlightPointQuery); stmt.execute(insertFlightPointQuery);
} }