Remove condition "If ISBN is equal means it's a duplicate" in "duplic…

…ate check" (#11191) * Remove condition "If 'ISBN' is equal means it's a duplicate" and gave 'ISBN' a weight Signed-off-by: AbdAlRahmanGad <[email protected]> * Remove ISBN weight * Update CHANGELOG.md --------- Signed-off-by: AbdAlRahmanGad <[email protected]> Co-authored-by: Oliver Kopp <[email protected]>
JabRef · Apr 16, 2024 · d92c2d7 · d92c2d7
1 parent a4a569f
commit d92c2d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 ### Changed
 
 - We replaced the word "Key bindings" with "Keyboard shortcuts" in the Preferences tab. [#11153](https://github.com/JabRef/jabref/pull/11153)
+- We slightly improved the duplicate check if ISBN numbers are present. [#8885](https://github.com/JabRef/jabref/issues/8885)
 
 ### Fixed
 

diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -25,7 +25,6 @@
 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.strings.StringUtil;
 
 import com.google.common.collect.Sets;
@@ -331,12 +330,6 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
         if (oneDOI.isPresent() && twoDOI.isPresent()) {
             return Objects.equals(oneDOI, twoDOI);
         }
-        // check ISBN
-        Optional<ISBN> oneISBN = one.getISBN();
-        Optional<ISBN> twoISBN = two.getISBN();
-        if (oneISBN.isPresent() && twoISBN.isPresent()) {
-            return Objects.equals(oneISBN, twoISBN);
-        }
 
         if (haveDifferentEntryType(one, two) ||
                 haveDifferentEditions(one, two) ||

diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -10,7 +10,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -382,13 +381,13 @@ public void twoEntriesWithDoiContainingUnderscoresAreNotEqual() {
     }
 
     @Test
-    public void twoEntriesWithSameISBNButDifferentTypesAreDuplicates() {
+    public void twoEntriesWithSameISBNButDifferentTypesAreNotDuplicates() {
         simpleArticle.setField(StandardField.ISBN, "0-123456-47-9");
         unrelatedArticle.setField(StandardField.ISBN, "0-123456-47-9");
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertFalse(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
     }
 
     public static Stream<Arguments> twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
@@ -525,7 +524,9 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
         assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
-    @Disabled("Book entries can have the same ISBN due to different chapters. The Test fails as crossref identifies both entries as the same.")
+    /**
+     * Book entries can have the same ISBN due to different chapters. The Test fails as crossref identifies both entries as the same.
+     */
     @Test
     void differentArticlesFromTheSameBookAreNotDuplicates() {
         BibEntry entryOne = new BibEntry(StandardEntryType.Article)