Merge branch 'master' into flukebook

WildMeOrg · Nov 22, 2023 · fc253f9 · fc253f9
2 parents a1b50ba + 18d5ca6
commit fc253f9
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main/java/org/ecocean/servlet/importer/StandardImport.java b/src/main/java/org/ecocean/servlet/importer/StandardImport.java
@@ -1859,10 +1859,10 @@ public MarkedIndividual loadIndividual(Row row, Encounter enc, Shepherd myShephe
 
     boolean newIndividual = false;
     String individualID = getIndividualID(row, colIndexMap, verbose, missingColumns, unusedColumns, feedback);
-    if (individualID==null) {
-      return null;
-    }
-
+    if (individualID==null) return null;
+    individualID = individualID.trim();
+    if (individualID.equals("")) return null;
+    System.out.println("loadIndividual() individualID=" + individualID);
 
     User u = getUserForRowOrCurrent(row, myShepherd, colIndexMap, verbose, missingColumns, unusedColumns,feedback,request);
     if (!userIndividualCache.containsKey(u)&&"user".equals(individualScope)) {
@@ -1873,10 +1873,6 @@ public MarkedIndividual loadIndividual(Row row, Encounter enc, Shepherd myShephe
       User itU = (User)uIt.next();
     }
 
-
-    // no
-    individualID = individualID.trim();
-
     MarkedIndividual mark = null;