Merge pull request JabRef#5101 from VMichelan/fix-issue-4816

* Adds priority to date fields when importing ris files * Updates RisImport test cases. * Changes array to arrayasList Abbreviates isDateTag() and getDatePriority() * Use indexOf to find out if a tag is a date
Landi29 · Jul 11, 2019 · 95f6c1e · 95f6c1e
2 parents 65006ae + 97cfb72
commit 95f6c1e
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 18 deletions.
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -6,6 +6,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -27,7 +28,7 @@ public class RisImporter extends Importer {
 
     private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile("TY  - .*");
     private static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
-
+    
     @Override
     public String getName() {
         return "RIS";
@@ -59,9 +60,15 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         String[] entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
                                         .split("ER  -.*\\n");
 
+        //stores all the date tags from highest to lowest priority
+        List<String> dateTags = Arrays.asList("Y1", "PY", "DA", "Y2");
+
         for (String entry1 : entries) {
 
-            boolean foundDate = false;
+            String dateTag = "";
+            String dateValue = "";
+            int datePriority = dateTags.size();
+            int tagPriority;
 
             String type = "";
             String author = "";
@@ -193,25 +200,19 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         }
                     } else if ("UR".equals(tag) || "L2".equals(tag) || "LK".equals(tag)) {
                         fields.put(FieldName.URL, value);
-                    } else if (!foundDate && (("Y1".equals(tag) || "Y2".equals(tag) || "PY".equals(tag) || "DA".equals(tag)) && (value.length() >= 4))) {
-                        String year = value.substring(0, 4);
+                    } else if ((tagPriority = dateTags.indexOf(tag)) != -1 && value.length() >= 4) {
 
-                        try {
-                            Year.parse(year, formatter);
-                            //if the year is parsebale we have found our date
-                            fields.put(FieldName.YEAR, value.substring(0, 4));
-                            foundDate = true;
-                        } catch (DateTimeParseException ex) {
-                            //We can't parse the year, we ignore it
-                        }
+                        if (tagPriority < datePriority) {
+                            String year = value.substring(0, 4);
 
-                        String[] parts = value.split("/");
-                        if ((parts.length > 1) && !parts[1].isEmpty()) {
                             try {
-                                int monthNumber = Integer.parseInt(parts[1]);
-                                month = Month.getMonthByNumber(monthNumber);
-                            } catch (NumberFormatException ex) {
-                                // The month part is unparseable, so we ignore it.
+                                    Year.parse(year, formatter);
+                                    //if the year is parsebale we have found a higher priority date
+                                    dateTag = tag;
+                                    dateValue = value;
+                                    datePriority = tagPriority;
+                            } catch (DateTimeParseException ex) {
+                                //We can't parse the year, we ignore it
                             }
                         }
                     } else if ("KW".equals(tag)) {
@@ -277,6 +278,21 @@ else if ("AV".equals(tag)) {
                 fields.put(FieldName.PAGES, startPage + endPage);
             }
 
+            // if we found a date
+            if (dateTag.length() > 0) {
+                fields.put(FieldName.YEAR, dateValue.substring(0, 4));
+
+                String[] parts = dateValue.split("/");
+                if ((parts.length > 1) && !parts[1].isEmpty()) {
+                    try {
+                        int monthNumber = Integer.parseInt(parts[1]);
+                        month = Month.getMonthByNumber(monthNumber);
+                    } catch (NumberFormatException ex) {
+                        // The month part is unparseable, so we ignore it.
+                    }
+                }
+            }
+
             // Remove empty fields:
             fields.entrySet().removeIf(key -> (key.getValue() == null) || key.getValue().trim().isEmpty());
 

diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib b/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTest3.bib
@@ -5,6 +5,7 @@ @incollection{
   issn = {978-1-4822-5326-9},
   journal = {Dermoscopy Image Analysis},
   number = {0},
+  month = {#sep#},
   pages = {1-22},
   publisher = {CRC Press},
   series = {Digital Imaging and Computer Vision},

diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.1.bib b/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.1.bib
@@ -0,0 +1,15 @@
+@article{,
+    author = {Valle-Delgado, J. J. and Molina-Bolívar, J. A. and Galisteo-González, F. and Gálvez-Ruiz, M. J. and Feiler, A. and Rutland, M. W.},
+    comment = {doi: 10.1063/1.1954747},
+    doi = {10.1063/1.1954747},
+    issn = {0021-9606},
+    journal = {J. Chem. Phys.},
+    month = {#jul#},
+    number = {3},
+    pages = {034708},
+    publisher = {American Institute of Physics},
+    title = {Hydration forces between silica surfaces: Experimental data and predictions from different theories},
+    url = {https://doi.org/10.1063/1.1954747},
+    volume = {123},
+    year = {2005}
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.1.ris b/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.1.ris
@@ -0,0 +1,27 @@
+
+
+TY  - JOUR
+T1  - Hydration forces between silica surfaces: Experimental data and predictions from different theories
+AU  - Valle-Delgado,J. J. 
+AU  - Molina-Bolívar,J. A. 
+AU  - Galisteo-González,F. 
+AU  - Gálvez-Ruiz,M. J. 
+AU  - Feiler,A. 
+AU  - Rutland,M. W. 
+Y2  - 2019/03/28
+Y1  - 2005/07/15
+PY  - 2005
+DA  - 2005/07/15
+N1  - doi: 10.1063/1.1954747
+DO  - 10.1063/1.1954747
+T2  - The Journal of Chemical Physics
+JF  - The Journal of Chemical Physics
+JO  - J. Chem. Phys.
+SP  - 034708
+VL  - 123
+IS  - 3
+PB  - American Institute of Physics
+SN  - 0021-9606
+M3  - doi: 10.1063/1.1954747
+UR  - https://doi.org/10.1063/1.1954747
+ER  - 
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.2.bib b/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.2.bib
@@ -0,0 +1,15 @@
+@article{,
+    author = {Valle-Delgado, J. J. and Molina-Bolívar, J. A. and Galisteo-González, F. and Gálvez-Ruiz, M. J. and Feiler, A. and Rutland, M. W.},
+    comment = {doi: 10.1063/1.1954747},
+    doi = {10.1063/1.1954747},
+    issn = {0021-9606},
+    journal = {J. Chem. Phys.},
+    month = {#jul#},
+    number = {3},
+    pages = {034708},
+    publisher = {American Institute of Physics},
+    title = {Hydration forces between silica surfaces: Experimental data and predictions from different theories},
+    url = {https://doi.org/10.1063/1.1954747},
+    volume = {123},
+    year = {2005}
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.2.ris b/src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestDate1.2.ris
@@ -0,0 +1,27 @@
+
+
+TY  - JOUR
+T1  - Hydration forces between silica surfaces: Experimental data and predictions from different theories
+AU  - Valle-Delgado,J. J. 
+AU  - Molina-Bolívar,J. A. 
+AU  - Galisteo-González,F. 
+AU  - Gálvez-Ruiz,M. J. 
+AU  - Feiler,A. 
+AU  - Rutland,M. W. 
+Y1  - 2005/07/15
+PY  - 2005
+DA  - 2005/07/15
+Y2  - 2019/03/28
+N1  - doi: 10.1063/1.1954747
+DO  - 10.1063/1.1954747
+T2  - The Journal of Chemical Physics
+JF  - The Journal of Chemical Physics
+JO  - J. Chem. Phys.
+SP  - 034708
+VL  - 123
+IS  - 3
+PB  - American Institute of Physics
+SN  - 0021-9606
+M3  - doi: 10.1063/1.1954747
+UR  - https://doi.org/10.1063/1.1954747
+ER  -