WB-1251: part 2

WildMeOrg · Dec 30, 2020 · aa943d2 · aa943d2
1 parent 233be8a
commit aa943d2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/org/ecocean/identity/IBEISIA.java b/src/main/java/org/ecocean/identity/IBEISIA.java
@@ -53,6 +53,7 @@
 import org.json.JSONException;
 
 import java.net.URL;
+import java.net.URLEncoder;
 
 import org.ecocean.CommonConfiguration;
 import org.ecocean.media.*;
@@ -65,6 +66,7 @@
 
 import java.io.File;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
@@ -1708,7 +1710,7 @@ public static int updateSpeciesOnIA(Shepherd myShepherd, List<Annotation> anns)
             if(ann.getIAClass()==null)continue;
             uuids.add(ann.getAcmId());
             //species.add(taxonomyString);
-            species.add(ann.getIAClass());
+            species.add(ann.getIAClass().replaceAll("\\+","%2B"));
         }
 System.out.println("updateSpeciesOnIA(): " + uuids);
 System.out.println("updateSpeciesOnIA(): " + species);
@@ -2431,6 +2433,10 @@ public static URL iaURL(String context, String urlSuffix) {
             System.out.println("INFO: setting iaBaseURL=" + iaBaseURL);
         }
         String ustr = iaBaseURL;
+
+        System.out.println("!!!ustr: "+iaBaseURL);
+        System.out.println("!!!urlSuffix: "+urlSuffix);
+
         if (urlSuffix != null) {
             if (urlSuffix.indexOf("/") == 0) urlSuffix = urlSuffix.substring(1);  //get rid of leading /
             ustr += urlSuffix;
@@ -3222,10 +3228,12 @@ public static void iaUpdateSpecies(List<String> uuids, List<String> species, Str
         }
         JSONArray idList = new JSONArray();
         JSONArray speciesList = new JSONArray();
+        System.out.println("!!!IGOTS: "+species.toString());
         for (int i = 0 ; i < uuids.size() ; i++) {
             idList.put(toFancyUUID(uuids.get(i)));
-            speciesList.put(species.get(i).replaceAll(" ", "_").toLowerCase());
+            speciesList.put(species.get(i));
         }
+        System.out.println("!!!IPUTS: "+speciesList.toString());
         JSONObject rtn = RestClient.put(iaURL(context, "/api/annot/species/json/?annot_uuid_list=" + idList.toString() + "&species_text_list=" + speciesList.toString()), null);
     }
 
@@ -4436,4 +4444,5 @@ public static Map<String,String> iaSpeciesDiff(Shepherd myShepherd, boolean incl
         return diff;
     }
 
+
 }