Do not search string gazetteer with ISO, but with name

BernhardWebstudio · Dec 1, 2023 · 8f43f63 · 8f43f63
1 parent ecdfc35
commit 8f43f63
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.classpath b/.classpath
@@ -43,15 +43,18 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java b/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java
@@ -761,14 +761,15 @@ public JSONObject resolveLocation(Specimen specimen) throws IOException, Interru
             return null;
         }
         String searchString = "";
-        if (specimen.getPrimaryDivisonISO() != null && !specimen.getPrimaryDivisonISO().equals("unknown")) {
-            searchString = specimen.getPrimaryDivisonISO();
-        } else {
-            if (specimen.getPrimaryDivison() != null && !specimen.getPrimaryDivison().equals("unknown")) {
-                searchString = specimen.getPrimaryDivison();
-            }
-            if (specimen.getCountry() != null && !specimen.getCountry().equals("unknown")) {
-                searchString += " " + specimen.getCountry();
+        if (specimen.getPrimaryDivison() != null && !specimen.getPrimaryDivison().equals("unknown")) {
+            searchString = specimen.getPrimaryDivison();
+        }
+        if (specimen.getCountry() != null && !specimen.getCountry().equals("unknown")) {
+            searchString += " " + specimen.getCountry();
+        }
+        if (Objects.equals(searchString.trim(), "")) {
+            if (specimen.getPrimaryDivisonISO() != null && !specimen.getPrimaryDivisonISO().equals("unknown")) {
+                searchString = specimen.getPrimaryDivisonISO();
             }
         }
 
@@ -781,7 +782,7 @@ public JSONObject resolveLocation(Specimen specimen) throws IOException, Interru
         JSONObject parent = null;
         try {
             parent = resolveCountry(specimen.getCountry());
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
 
         JSONObject finalParent = parent;
@@ -800,11 +801,10 @@ public JSONObject resolveLocation(Specimen specimen) throws IOException, Interru
      * @return the nahima returned object if only one
      */
     public JSONObject resolveTypeStatus(String status) throws IOException, InterruptedException, SkipSpecimenException, InvocationTargetException {
-        JSONObject result = this.resolveOrCreateInteractive(status, "typusstatus", "typusstatus_all_fields_1", new JSONObject(new HashMap<>() {{
+        return this.resolveOrCreateInteractive(status, "typusstatus", "typusstatus_all_fields_1", new JSONObject(new HashMap<>() {{
             put("name", status);
             put("bemerkung", getCreatedByThisSoftwareIndication());
         }}), false, 0);
-        return result;
     }
 
     /**
@@ -814,11 +814,10 @@ public JSONObject resolveTypeStatus(String status) throws IOException, Interrupt
      * @param unitSubject the unit type
      */
     public JSONObject resolveUnitFor(String unit, String unitSubject) throws IOException, InterruptedException, SkipSpecimenException, InvocationTargetException {
-        JSONObject results = this.resolveOrCreateInteractive(unit, unitSubject, unitSubject + "_all_fields", new JSONObject(new HashMap<>() {{
+        return this.resolveOrCreateInteractive(unit, unitSubject, unitSubject + "_all_fields", new JSONObject(new HashMap<>() {{
             put("name", unit);
             put("bemerkung", getCreatedByThisSoftwareIndication());
         }}));
-        return results;
     }
 
     /**