diff --git a/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java b/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java index af1e82b..5a9447b 100644 --- a/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java +++ b/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java @@ -486,7 +486,7 @@ protected JSONObject findSimilarMatch(JSONArray foundObjects, String objectType, if (selectionHelper.get(key) instanceof JSONObject && selectionHelper.getJSONObject(key).has("en-US")) { requiredMatches += 1; keysToMatch.add(key); - } else if (selectionHelper.get(key) instanceof String && !((String) selectionHelper.get(key)).contains("DataShot")) { + } else if (selectionHelper.get(key) instanceof String && !((String) selectionHelper.get(key)).contains("Created by DataShot")) { keysToMatch.add(key); requiredMatches += 1; } @@ -547,7 +547,7 @@ protected JSONObject findSimilarMatch(JSONArray foundObjects, String objectType, return foundObjects.getJSONObject(carefulPossiblyCorrectIndices.get(0)); } } else { - log.warn("Did not find any similar matches. Required matches: " + requiredMatches); + log.warn("Did not find any similar matches in " + objectsToCompare.size() + " results of " + objectType + ". Required matches: " + requiredMatches); } return null; } @@ -1386,7 +1386,7 @@ public JSONObject wrapForCreation(JSONObject inner, String objectType, String ma * @return the object with the adjusted/added fields */ public JSONObject addDefaultValuesForCreation(JSONObject inner, JSONObject pool) { - return addDefaultValuesForCreation(inner, pool); + return addDefaultValuesForCreation(inner, pool, null); } /**