Bring back a modified ISBN check and add more tests (JabRef#11217)

* Bring back a modified ISBN check and add more tests Signed-off-by: AbdAlRahmanGad <[email protected]> * Reformulate the ISBN check. Signed-off-by: AbdAlRahmanGad <[email protected]> * Change order of conditions for more readability Signed-off-by: AbdAlRahmanGad <[email protected]> --------- Signed-off-by: AbdAlRahmanGad <[email protected]>
JabRef · Apr 18, 2024 · 2b5fddd · 2b5fddd
1 parent 3f81c1d
commit 2b5fddd
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -25,6 +26,8 @@
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.entry.identifier.ISBN;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
 import com.google.common.collect.Sets;
@@ -337,6 +340,16 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
             return false;
         }
 
+        // In case an ISBN is present, it is a strong indicator that the entries are equal.
+        // Only in InBook, InCollection, or Article the ISBN may be equal and the puplication on different pages (and thus not equal)
+        Optional<ISBN> oneISBN = one.getISBN();
+        Optional<ISBN> twoISBN = two.getISBN();
+        if (oneISBN.isPresent() && twoISBN.isPresent()
+                && Objects.equals(oneISBN, twoISBN)
+                && !List.of(StandardEntryType.Article, StandardEntryType.InBook, StandardEntryType.InCollection).contains(one.getType())) {
+            return true;
+        }
+
         final Optional<BibEntryType> type = entryTypesManager.enrich(one.getType(), bibDatabaseMode);
         if (type.isPresent()) {
             BibEntryType entryType = type.get();

diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -555,4 +555,30 @@ void differentArticlesFromTheSameBookAreNotDuplicates() {
 
         assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
+
+    @Test
+    void differentInbooksWithTheSameISBNAreNotDuplicates() {
+        BibEntry entryOne = new BibEntry(StandardEntryType.InBook)
+                .withField(StandardField.TITLE, "Performance on a Signal")
+                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+
+        BibEntry entryTwo = new BibEntry(StandardEntryType.InBook)
+                .withField(StandardField.TITLE, "Rest in Treatment")
+                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+
+        assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
+    }
+
+    @Test
+    void differentInCollectionWithTheSameISBNAreNotDuplicates() {
+        BibEntry entryOne = new BibEntry(StandardEntryType.InCollection)
+                .withField(StandardField.TITLE, "Performance on a Signal")
+                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+
+        BibEntry entryTwo = new BibEntry(StandardEntryType.InCollection)
+                .withField(StandardField.TITLE, "Rest in Treatment")
+                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+
+        assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
+    }
 }