diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 24b67836..73fb08dd 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
org.pamguard
Pamguard
Pamguard Java12+
- 2.02.10a
+ 2.02.10b
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
diff --git a/pom.xml b/pom.xml
index 791baced..1cc20d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.pamguard
Pamguard
- 2.02.10a
+ 2.02.10b
Pamguard Java12+
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
@@ -748,7 +748,7 @@
net.sf.ucanaccess
ucanaccess
- 4.0.4
+ 5.0.1
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
index cb03138a..31805815 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.10a";
+ static public final String version = "2.02.10b";
/**
* Release date
diff --git a/src/PamguardMVC/dataSelector/CompoundParams.java b/src/PamguardMVC/dataSelector/CompoundParams.java
index d63f1957..6f80972e 100644
--- a/src/PamguardMVC/dataSelector/CompoundParams.java
+++ b/src/PamguardMVC/dataSelector/CompoundParams.java
@@ -19,4 +19,10 @@ public class CompoundParams extends DataSelectParams {
public DataSelectParams getSelectorParams(DataSelector dataSelector) {
return selectorParams.get(dataSelector.getLongSelectorName());
}
+
+ @Override
+ public int getCombinationFlag() {
+ return DATA_SELECT_AND;
+ }
+
}
diff --git a/src/PamguardMVC/dataSelector/DataSelectorCreator.java b/src/PamguardMVC/dataSelector/DataSelectorCreator.java
index 77e199b5..56ebbf4b 100644
--- a/src/PamguardMVC/dataSelector/DataSelectorCreator.java
+++ b/src/PamguardMVC/dataSelector/DataSelectorCreator.java
@@ -200,7 +200,13 @@ public abstract class DataSelectorCreator implements PamSettings {
return allSelectors.get(0);
}
else {
- return new CompoundDataSelector(pamDataBlock, allSelectors, selectorName, allowScores, selectorType);
+ CompoundDataSelector selector = new CompoundDataSelector(pamDataBlock, allSelectors, selectorName, allowScores, selectorType);
+ DataSelectParams params = dataSelectorSettings.getParams(selectorName);
+ if (params instanceof CompoundParams) {
+ selector.setParams(params);
+ }
+
+ return selector;
}
}
diff --git a/src/generalDatabase/lookupTables/LookUpTables.java b/src/generalDatabase/lookupTables/LookUpTables.java
index daea762f..bd095eba 100644
--- a/src/generalDatabase/lookupTables/LookUpTables.java
+++ b/src/generalDatabase/lookupTables/LookUpTables.java
@@ -3,10 +3,13 @@ package generalDatabase.lookupTables;
import java.awt.Color;
import java.awt.Window;
import java.sql.Connection;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayList;
import java.util.ListIterator;
+import java.util.Vector;
import PamController.PamController;
import PamView.dialog.warn.WarnOnce;
@@ -101,9 +104,101 @@ public class LookUpTables {
checkedTableConnection = null;
if (dbControlUnit.getDbProcess().checkTable(lutTableDef)) {
checkedTableConnection = con;
- return true;
}
- return false;
+
+ checkTableRepeats(con, lutTableDef);
+
+ return checkedTableConnection != null;
+ }
+
+ /**
+ * for some reason some repeats have got into the LUT and need to be removed
+ * or it really messes stuff up. So check it automatically.
+ * @param con
+ * @param lutTableDef2
+ */
+ private boolean checkTableRepeats(PamConnection con, EmptyTableDefinition lutTableDef) {
+ /*
+ * first get a list of unique topics, then check them one at a time.
+ */
+ ArrayList topics = getTopicList(con, lutTableDef);
+ if (topics == null) {
+ return false;
+ }
+
+ for (String topic : topics) {
+ checkTopicRepeats(con, lutTableDef, topic);
+ }
+ return true;
+ }
+
+ private void checkTopicRepeats(PamConnection con, EmptyTableDefinition lutTableDef2, String topic) {
+ LookupList lutList = getLookupList(topic);
+ Vector list = lutList.getList();
+ int n = list.size();
+ boolean[] isRepeat = new boolean[n];
+ int nRepeat = 0;
+ // search for repeats.
+ for (int i = 0; i < n-1; i++) {
+ String code = list.get(i).getCode().trim();
+ for (int j = i+1; j < n; j++) {
+ String code2 = list.get(j).getCode().trim();
+ if (code.equals(code2)) {
+ isRepeat[j] = true;
+ nRepeat++;
+ }
+ }
+ }
+ if (nRepeat == 0) {
+ return;
+ }
+ // make a clause to delete the repeats.
+ String sql = null;
+ for (int i = 0; i < n; i++) {
+ if (isRepeat[i] == false) {
+ continue;
+ }
+ if (sql == null) {
+ sql = String.format("DELETE FROM %s WHERE Id IN (%d", lutTableDef.getTableName(), list.get(i).getDatabaseId());
+ }
+ else {
+ sql = sql + String.format(",%d", list.get(i).getDatabaseId());
+ }
+ }
+ sql += ")";
+ boolean ok = false;
+ try {
+ Statement stmt = con.getConnection().createStatement();
+ ok = stmt.execute(sql);
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ private ArrayList getTopicList(PamConnection con, EmptyTableDefinition lutTableDef) {
+ if (con == null) {
+ return null;
+ }
+ ArrayList topics = new ArrayList<>();
+ String qStr = "SELECT DISTINCT Topic FROM " + lutTableDef.getTableName();
+ try {
+ Statement stmt = con.getConnection().createStatement();
+ boolean ok = stmt.execute(qStr);
+ if (ok == false) {
+ return null;
+ }
+ ResultSet results = stmt.getResultSet();
+ while (results.next()) {
+ String topic = results.getString(1);
+ topics.add(topic);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return null;
+ }
+ return topics;
}
public LookupList createLookupList(PamCursor resultSet, String topic) {
diff --git a/src/generalDatabase/ucanAccess/UCanAccessSystem.java b/src/generalDatabase/ucanAccess/UCanAccessSystem.java
index 8f754aac..3937cf17 100644
--- a/src/generalDatabase/ucanAccess/UCanAccessSystem.java
+++ b/src/generalDatabase/ucanAccess/UCanAccessSystem.java
@@ -153,7 +153,7 @@ public class UCanAccessSystem extends BaseAccessSystem implements PamSettings {
String conStr = "jdbc:ucanaccess://"
+ fl.getAbsolutePath() + passwordEntry+noMem;
System.out.println("UCanAccess connection string = " + conStr);
- conn = DriverManager.getConnection(conStr);
+ conn = DriverManager.getConnection(conStr,"","");
conn.setAutoCommit(false);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/loggerForms/FormDescription.java b/src/loggerForms/FormDescription.java
index 95b204cb..a212b94d 100644
--- a/src/loggerForms/FormDescription.java
+++ b/src/loggerForms/FormDescription.java
@@ -1598,7 +1598,9 @@ public class FormDescription implements Cloneable, Comparable {
normalForm.destroyForm();
}
if (hiddenForm != null) {
- normalForm.destroyForm();
+ if (normalForm != null) {
+ normalForm.destroyForm();
+ }
}
if (subtabForms != null) {
for (LoggerForm aForm:subtabForms) {
diff --git a/src/loggerForms/LoggerForm.java b/src/loggerForms/LoggerForm.java
index 58215478..b31ae9a8 100644
--- a/src/loggerForms/LoggerForm.java
+++ b/src/loggerForms/LoggerForm.java
@@ -21,6 +21,7 @@ import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JOptionPane;
+import javax.swing.JPanel;
import javax.swing.JRootPane;
import javax.swing.JScrollPane;
import javax.swing.Timer;
@@ -529,7 +530,10 @@ public class LoggerForm{
innerCenterPanel.add(currentRow);
currentRow = new LoggerFormPanel(this, new FlowLayout(FlowLayout.LEFT));
}else{
- currentRow.add(c.makeComponent(this));
+ JPanel component = c.makeComponent(this);
+ if (component != null) {
+ currentRow.add(component);
+ }
}
}