Unify month field formatting in test bib files

src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java

@@ -10,6 +10,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.xml.bind.JAXBContext;
@@ -40,6 +41,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
@@ -153,6 +155,13 @@ private void parseInbook(Inbook inbook, BibEntry bibEntry, Entry entry) {
  JAXBElement<BigInteger> number = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, "number"),
  BigInteger.class, new BigInteger(value));
  inbook.getContent().add(number);
+ } else if (StandardField.MONTH.equals(key)) {
+ Optional<Month> month = bibEntry.getMonth();
+ if (month.isPresent()) {
+ JAXBElement<String> element = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, key.getName()),
+ String.class, month.get().getFullName());
+ inbook.getContent().add(element);
+ }
  } else {
  JAXBElement<String> element = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, key.getName()), String.class,
  value);
@@ -205,6 +214,12 @@ private <T> void parse(T entryType, BibEntry bibEntry, Entry entry) {
  LOGGER.warn("The value %s of the 'number' field is not an integer and thus is ignored for the export", value);
  }
  break;
+ } else if (StandardField.MONTH.equals(key)) {
+ Optional<Month> month = bibEntry.getMonth();
+ if (month.isPresent()) {
+ method.invoke(entryType, month.get().getFullName());
+ }
+ break;
  } else {
  method.invoke(entryType, value);
  break;

src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import javax.xml.bind.JAXBContext;
@@ -27,6 +28,7 @@
 import org.jabref.logic.importer.fileformat.bibtexml.Incollection;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
@@ -176,6 +178,9 @@ private <T> void parse(T entryType, Map<Field, String> fields) {
  } else if (method.getName().equals("getNumber")) {
  putNumber(fields, (BigInteger) method.invoke(entryType));
  continue;
+ } else if (method.getName().equals("getMonth")) {
+ putMonth(fields, Month.parse((String) method.invoke(entryType)));
+ continue;
  } else if (isMethodToIgnore(method.getName())) {
  continue;
  } else if (method.getName().startsWith("get")) {
@@ -208,7 +213,11 @@ private void parseInbook(Inbook inbook, Map<Field, String> fields) {
  Object elementValue = element.getValue();
  if (elementValue instanceof String) {
  String value = (String) elementValue;
- putIfValueNotNull(fields, field, value);
+ if (StandardField.MONTH.equals(field)) {
+ putMonth(fields, Month.parse(value));
+ } else {
+ putIfValueNotNull(fields, field, value);
+ }
  } else if (elementValue instanceof BigInteger) {
  BigInteger value = (BigInteger) elementValue;
  if (StandardField.NUMBER.equals(field)) {
@@ -241,6 +250,12 @@ private void putNumber(Map<Field, String> fields, BigInteger number) {
  }
  }
 
+ private void putMonth(Map<Field, String> fields, Optional<Month> month) {
+ if (month.isPresent()) {
+ fields.put(StandardField.MONTH, month.get().getJabRefFormat());
+ }
+ }
+
  private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
  if (value != null) {
  fields.put(field, value);

src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java

@@ -589,7 +589,6 @@ private String parseFieldContent(Field field) throws IOException {
  int character;
 
  while (((character = peek()) != ',') && (character != '}') && (character != ')')) {
-
  if (eof) {
  throw new IOException("Error in line " + line + ": EOF in mid-string");
  }
@@ -602,7 +601,6 @@ private String parseFieldContent(Field field) throws IOException {
  // brackets to know when the string is finished.
  StringBuilder text = parseBracketedTextExactly();
  value.append(fieldContentParser.format(text, field));
-
  } else if (Character.isDigit((char) character)) { // value is a number
  String number = parseTextToken();
  value.append(number);
@@ -619,7 +617,6 @@ private String parseFieldContent(Field field) throws IOException {
  skipWhitespace();
  }
  return value.toString();
-
  }
 
  /**

src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java

@@ -143,7 +143,7 @@ private static void processCapitalization(Map<Field, String> map) {
  public ParserResult importDatabase(BufferedReader reader) throws IOException {
  Objects.requireNonNull(reader);
 
- List<BibEntry> bibitems = new ArrayList<>();
+ List<BibEntry> bibEntries = new ArrayList<>();
  StringBuilder sb = new StringBuilder();
 
  // Pattern fieldPattern = Pattern.compile("^AU |^TI |^SO |^DT |^C1 |^AB
@@ -233,7 +233,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
  } else if ("SO".equals(beg) || "JA".equals(beg)) {
  hm.put(StandardField.JOURNAL, EOL_PATTERN.matcher(value).replaceAll(" "));
  } else if ("ID".equals(beg) || "KW".equals(beg)) {
-
  value = EOL_PATTERN.matcher(value).replaceAll(" ");
  String existingKeywords = hm.get(StandardField.KEYWORDS);
  if ((existingKeywords == null) || existingKeywords.contains(value)) {
@@ -242,7 +241,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
  existingKeywords += ", " + value;
  }
  hm.put(StandardField.KEYWORDS, existingKeywords);
-
  } else if ("AB".equals(beg)) {
  hm.put(StandardField.ABSTRACT, EOL_PATTERN.matcher(value).replaceAll(" "));
  } else if ("BP".equals(beg) || "BR".equals(beg) || "SP".equals(beg)) {
@@ -271,12 +269,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
  } else if ("DI".equals(beg)) {
  hm.put(StandardField.DOI, value);
  } else if ("PD".equals(beg)) {
-
  String month = IsiImporter.parseMonth(value);
  if (month != null) {
  hm.put(StandardField.MONTH, month);
  }
-
  } else if ("DT".equals(beg)) {
  if ("Review".equals(value)) {
  type = StandardEntryType.Article; // set "Review" in Note/Comment?
@@ -327,17 +323,19 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
  b.setField(hm);
 
- bibitems.add(b);
+ bibEntries.add(b);
  }
- return new ParserResult(bibitems);
+ return new ParserResult(bibEntries);
  }
 
  private static String parsePages(String value) {
  return value.replace("-", "--");
  }
 
- public static String parseMonth(String value) {
-
+ /**
+ * Parses the month and returns it in the JabRef format
+ */
+ static String parseMonth(String value) {
  String[] parts = value.split("\\s|\\-");
  for (String part1 : parts) {
  Optional<Month> month = Month.getMonthByShortName(part1.toLowerCase(Locale.ROOT));

src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java

@@ -13,6 +13,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -74,6 +75,7 @@
 import org.jabref.logic.importer.fileformat.medline.Text;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
@@ -603,7 +605,10 @@ private void addPubDate(Map<Field, String> fields, PubDate pubDate) {
  } else {
  fields.put(StandardField.YEAR, pubDate.getYear());
  if (pubDate.getMonth() != null) {
- fields.put(StandardField.MONTH, pubDate.getMonth());
+ Optional<Month> month = Month.parse(pubDate.getMonth());
+ if (month.isPresent()) {
+ fields.put(StandardField.MONTH, month.get().getJabRefFormat());
+ }
  } else if (pubDate.getSeason() != null) {
  fields.put(new UnknownField("season"), pubDate.getSeason());
  }

src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java

@@ -330,22 +330,22 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
  // skip keyword
  this.lastLine = "".equals(this.lastLine) ? "" : this.lastLine.substring(this.lastLine.indexOf(':') + 1).trim();
 
- // parse keywords field
  if ("Keywords".equals(keyword)) {
+ // parse keywords field
  String content = readMultipleLines(in);
  String[] keywords = content.split("[,;]");
  be.addKeywords(Arrays.asList(keywords),
  importFormatPreferences.getKeywordSeparator());
- // parse JEL field
  } else if ("JEL".equals(keyword)) {
+ // parse JEL field
  be.setField(new UnknownField("jel"), readMultipleLines(in));
 
  } else if (keyword.startsWith("Date")) {
  // parse date field
  String content = readMultipleLines(in);
  Date.parse(content).ifPresent(be::setDate);
- // parse URL field
  } else if (keyword.startsWith("URL")) {
+ // parse URL field
  String content;
  if (multilineUrlFieldAllowed) {
  content = readMultipleLines(in);
@@ -354,10 +354,8 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
  readLine(in);
  }
  be.setField(StandardField.URL, content);
-
- // authors field
  } else if (keyword.startsWith("By")) {
- // parse authors
+ // parse authors field
  parseAuthors(be, in);
  } else {
  readLine(in);

src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java

@@ -67,13 +67,11 @@ private void extractAuthor() {
 
  /**
  * Year in BibTex - Date in DublinCore is only the year information, because dc interprets empty months as January.
- * Tries to extract the month as well.
- * In JabRef the bibtex/month/value is prioritized.
- * <br/>
- * The problem is the default value of the calendar, which is always January, also if there is no month information in
- * the xmp metdata. The idea is, to reject all information with YYYY-01-01. In cases, where xmp is written with JabRef
- * the month property filled with jan will override this behavior and no data is lost. In the cases, where xmp
- * is written by another service, the assumption is, that the 1st January is not a publication date at all.
+ * Tries to extract the month as well. In JabRef the bibtex/month/value is prioritized. <br/> The problem is the
+ * default value of the calendar, which is always January, also if there is no month information in the xmp metdata.
+ * The idea is, to reject all information with YYYY-01-01. In cases, where xmp is written with JabRef the month
+ * property filled with jan will override this behavior and no data is lost. In the cases, where xmp is written by
+ * another service, the assumption is, that the 1st January is not a publication date at all.
  */
  private void extractYearAndMonth() {
  List<String> dates = dcSchema.getUnqualifiedSequenceValueList("date");
@@ -87,12 +85,11 @@ private void extractYearAndMonth() {
  }
  if (calender != null) {
  bibEntry.setField(StandardField.YEAR, String.valueOf(calender.get(Calendar.YEAR)));
+ int monthNumber = calender.get(Calendar.MONTH) + 1;
  // not the 1st of January
- if (!((calender.get(Calendar.MONTH) == 0) && (calender.get(Calendar.DAY_OF_MONTH) == 1))) {
- Optional<Month> month = Month.getMonthByNumber(calender.get(Calendar.MONTH) + 1);
- if (month.isPresent()) {
- bibEntry.setField(StandardField.MONTH, month.get().getShortName());
- }
+ if (!((monthNumber == 1) && (calender.get(Calendar.DAY_OF_MONTH) == 1))) {
+ Month.getMonthByNumber(monthNumber)
+ .ifPresent(month -> bibEntry.setMonth(month));
  }
  }
  }
@@ -129,15 +126,13 @@ private void extractPublisher() {
  }
 
  /**
- * This method sets all fields, which are custom in bibtext and therefore supported by jabref, but which are not included in the DublinCore format.
- * <p/>
+ * This method sets all fields, which are custom in BibTeX and therefore supported by JabRef, but which are not
+ * included in the DublinCore format.
+ * <p>
  * The relation attribute of DublinCore is abused to insert these custom fields.
  */
  private void extractBibTexFields() {
- List<String> relationships = dcSchema.getRelations();
-
  Predicate<String> isBibTeXElement = s -> s.startsWith("bibtex/");
-
  Consumer<String> splitBibTeXElement = s -> {
  // the default pattern is bibtex/key/value, but some fields contains url etc.
  // so the value property contains additional slashes, which makes the usage of
@@ -154,15 +149,15 @@ private void extractBibTexFields() {
  // see also DublinCoreExtractor#extractYearAndMonth
  if (StandardField.MONTH.equals(key)) {
  Optional<Month> parsedMonth = Month.parse(value);
- parsedMonth.ifPresent(month -> bibEntry.setField(key, month.getShortName()));
+ parsedMonth.ifPresent(bibEntry::setMonth);
  }
  }
-
  };
+ List<String> relationships = dcSchema.getRelations();
  if (relationships != null) {
  relationships.stream()
- .filter(isBibTeXElement)
- .forEach(splitBibTeXElement);
+  .filter(isBibTeXElement)
+  .forEach(splitBibTeXElement);
  }
  }
 
@@ -220,26 +215,27 @@ private void extractType() {
  }
 
  /**
- * Helper function for retrieving a BibEntry from the DublinCore metadata
- * in a PDF file.
+ * Helper function for retrieving a BibEntry from the DublinCore metadata in a PDF file.
+ * <p>
+ * To understand how to get hold of a DublinCore have a look in the test cases for XMPUtil.
+ * <p>
+ * The BibEntry is build by mapping individual fields in the dublin core (like creator, title, subject) to fields in
+ * a bibtex bibEntry. In case special "bibtex/" entries are contained, the normal dublin core fields take
+ * precedence. For instance, the dublin core date takes precedence over bibtex/month.
  *
- * To understand how to get hold of a DublinCore have a look in the
- * test cases for XMPUtil.
- *
- * The BibEntry is build by mapping individual fields in the dublin core
- * (like creator, title, subject) to fields in a bibtex bibEntry.
- *
- * @return The bibtex bibEntry found in the document information.
+ * @return The bibEntry extracted from the document information.
  */
  public Optional<BibEntry> extractBibtexEntry() {
+ // first extract "bibtex/" entries
+ this.extractBibTexFields();
 
+ // then extract all "standard" dublin core entries
  this.extractEditor();
  this.extractAuthor();
  this.extractYearAndMonth();
  this.extractAbstract();
  this.extractDOI();
  this.extractPublisher();
- this.extractBibTexFields();
  this.extractRights();
  this.extractSource();
  this.extractSubject();

src/main/java/org/jabref/model/entry/BibEntry.java

@@ -614,7 +614,7 @@ public Object clone() {
  */
  @Override
  public String toString() {
- return CanonicalBibtexEntry.getCanonicalRepresentation(this);
+ return CanonicalBibEntry.getCanonicalRepresentation(this);
  }
 
  /**