Fix duplicate detection when using -recurse/having path info

GlobalDataverseCommunityConsortium · Nov 7, 2024 · b845468 · b845468
1 parent 565cdfc
commit b845468
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>DVUploader</groupId>
     <artifactId>DVUploader</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/src/main/java/org/sead/uploader/dataverse/DVUploader.java b/src/main/java/org/sead/uploader/dataverse/DVUploader.java
@@ -329,7 +329,8 @@ public String itemExists(String path, Resource item) {
                             println("out:" + relPath);
         }
 
-        String sourcepath = item.getName();
+        //Create a path/name string w/o an initial /
+        String sourcepath = (path.length()==1 ? "" : path.substring(1)) + item.getName();
 
         // One-time: get metadata for dataset to see if it exists and what files it
         // contains
@@ -440,9 +441,11 @@ public String itemExists(String path, Resource item) {
 
     @Override
     protected String verifyDataByHash(String tagId, String path, Resource item) {
-        JSONObject checksum = existingItems.get(item.getName());
+        String sourcepath = (path.startsWith("/") ? "" : path) + item.getName();
+
+        JSONObject checksum = existingItems.get(sourcepath);
         if (!checksum.getString("value").equals(item.getHash(checksum.getString("type")))) {
-            hashIssues.put(path + item.getName(), "!!!: A different version of this item exists with ID: " + tagId);
+            hashIssues.put(sourcepath, "!!!: A different version of this item exists with ID: " + tagId);
             return null;
         } // else it matches!
         return tagId;