diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 1eb2342e..24b67836 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
org.pamguard
Pamguard
Pamguard Java12+
- 2.02.10
+ 2.02.10a
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
diff --git a/pom.xml b/pom.xml
index 18731009..791baced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.pamguard
Pamguard
- 2.02.10
+ 2.02.10a
Pamguard Java12+
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
index c6753329..cb03138a 100644
--- a/src/PamController/PamguardVersionInfo.java
+++ b/src/PamController/PamguardVersionInfo.java
@@ -31,7 +31,7 @@ public class PamguardVersionInfo {
* Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f'
*/
- static public final String version = "2.02.10";
+ static public final String version = "2.02.10a";
/**
* Release date
diff --git a/src/detectiongrouplocaliser/DetectionGroupProcess.java b/src/detectiongrouplocaliser/DetectionGroupProcess.java
index 3c5158fb..587b3719 100644
--- a/src/detectiongrouplocaliser/DetectionGroupProcess.java
+++ b/src/detectiongrouplocaliser/DetectionGroupProcess.java
@@ -458,6 +458,7 @@ public class DetectionGroupProcess extends PamProcess {
detectionGroupDataBlock.saveViewerData();
int nUpdates = 0;
int nOK = 0;
+ int consecutiveOK = 0;
System.out.printf("Checking %d data units in %s ", detectionGroupDataBlock.getUnitsCount(), detectionGroupDataBlock.getDataName());
synchronized (detectionGroupDataBlock.getSynchLock()) {
ListIterator it = detectionGroupDataBlock.getListIterator(0);
@@ -466,11 +467,16 @@ public class DetectionGroupProcess extends PamProcess {
boolean ok = checkDataIntegrity(du, false);
if (ok) {
nUpdates++;
+ consecutiveOK = 0;
}
else {
nOK++;
+ consecutiveOK++;
}
System.out.printf(".");
+ if (consecutiveOK % 80 == 0) {
+ System.out.printf("\n");
+ }
}
}
System.out.printf("\n%s: %d out of %d data units required corrections\n", detectionGroupDataBlock.getDataName(), nUpdates, nUpdates+nOK);
@@ -486,7 +492,7 @@ public class DetectionGroupProcess extends PamProcess {
subTabLogging = detectionGroupLogging.getSubLogging();
PamConnection con = DBControlUnit.findConnection();
String desc = String.format("Detection group UID %d at %s", du.getUID(), PamCalendar.formatDBDateTime(du.getTimeMilliseconds()));
- String idList = "( " + du.getUID() + " )";
+ String idList = "( " + du.getDatabaseIndex() + " )";
ArrayList stData = subTabLogging.loadSubtableData(con, detectionGroupLogging, idList, null);
if (stData == null) {
System.out.println("Error loading sub table data for event uid " + du.getUID());
diff --git a/src/generalDatabase/SQLLogging.java b/src/generalDatabase/SQLLogging.java
index 8f8b9f84..905ee28f 100644
--- a/src/generalDatabase/SQLLogging.java
+++ b/src/generalDatabase/SQLLogging.java
@@ -2002,7 +2002,7 @@ public abstract class SQLLogging {
*
* @param con database connection
* @param parentLogging super detection logging instance.
- * @param uidList list of UID's in the parent data that have been loaded.
+ * @param idList list of ID's in the parent data that have been loaded. Note Id, NOT UID
* @return list of all PamSubtableData items
*/
public ArrayList loadSubtableData(PamConnection con, SQLLogging parentLogging, String idList, ViewLoadObserver loadObserver) {
@@ -2034,6 +2034,13 @@ public abstract class SQLLogging {
return loadSubtableData(con, subtableResults, loadObserver);
}
+ /**
+ * Get a sub table result set. Note that this is based on ID, not UID
+ * @param con connection
+ * @param parentLogging parent logging system
+ * @param parentIdList ParentID list. Note that this is ID, not UID,
i.e. the query is WHERE ParentID IN ...
+ * @return child table result set
+ */
private ResultSet createSubTableResultSet(PamConnection con, SQLLogging parentLogging,
String parentIdList) {
String clause = String.format(" WHERE ParentID IN %s ORDER BY UTC, UTCMilliseconds", parentIdList);