diff --git a/src/main/java/org/jabref/cli/JournalListMvGenerator.java b/src/main/java/org/jabref/cli/JournalListMvGenerator.java index dad187dc81a..17f1d4c1719 100644 --- a/src/main/java/org/jabref/cli/JournalListMvGenerator.java +++ b/src/main/java/org/jabref/cli/JournalListMvGenerator.java @@ -47,6 +47,10 @@ public static void main(String[] args) throws IOException { compressHigh(). open()) { MVMap fullToAbbreviation = store.openMap("FullToAbbreviation"); + MVMap abbreviationToName = store.openMap("AbbreviationToName"); + MVMap dotlessToName = store.openMap("DotlessToName"); + MVMap shortestUniqueToName = store.openMap("ShortestUniqueToName"); + stream.forEach(Unchecked.consumer(path -> { String fileName = path.getFileName().toString(); System.out.print("Checking "); @@ -67,7 +71,13 @@ public static void main(String[] args) throws IOException { } return abbreviation2; })); - fullToAbbreviation.putAll(abbreviationMap); + + abbreviationMap.forEach((name, abbr) -> { + fullToAbbreviation.put(name, abbr); + abbreviationToName.put(abbr.getAbbreviation(), name); + dotlessToName.put(abbr.getDotlessAbbreviation(), name); + shortestUniqueToName.put(abbr.getShortestUniqueAbbreviation(), name); + }); } })); } diff --git a/src/main/java/org/jabref/logic/journals/Abbreviation.java b/src/main/java/org/jabref/logic/journals/Abbreviation.java index 0e6a371c427..e751beb6f0f 100644 --- a/src/main/java/org/jabref/logic/journals/Abbreviation.java +++ b/src/main/java/org/jabref/logic/journals/Abbreviation.java @@ -8,12 +8,9 @@ * JabRef Journal Abbreviations Documentation */ public class Abbreviation implements Comparable, Serializable { - - private static final long serialVersionUID = 1; - - private transient String name; + private final String name; private final String abbreviation; - private transient String dotlessAbbreviation; + private final String dotlessAbbreviation; // Is the empty string if not available private String shortestUniqueAbbreviation; diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java index 4191be45857..369285daa43 100644 --- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java +++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java @@ -3,9 +3,7 @@ import java.nio.file.Path; import java.util.Collection; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -24,10 +22,17 @@ public class JournalAbbreviationRepository { static final Pattern QUESTION_MARK = Pattern.compile("\\?"); - private final Map fullToAbbreviationObject = new HashMap<>(); - private final Map abbreviationToAbbreviationObject = new HashMap<>(); - private final Map dotlessToAbbreviationObject = new HashMap<>(); - private final Map shortestUniqueToAbbreviationObject = new HashMap<>(); + // These fields need to be public to be used in JournalMvGenerator.java + private static final String FULL_TO_ABBREVIATION_MAP_NAME = "FullToAbbreviation"; + private static final String ABBREVIATION_TO_ABBREVIATION_MAP_NAME = "AbbreviationToName"; + private static final String DOTLESS_TO_ABBREVIATION_MAP_NAME = "DotlessToName"; + private static final String SHORTEST_UNIQUE_TO_ABBREVIATION_MAP_NAME = "ShortestUniqueToName"; + + private final MVStore store; + private MVMap fullToAbbreviationMap; + private MVMap abbreviationToNameMap; + private MVMap dotlessToNameMap; + private MVMap shortestUniqueToNameMap; private final TreeSet customAbbreviations = new TreeSet<>(); private final StringSimilarity similarity = new StringSimilarity(); @@ -35,38 +40,31 @@ public class JournalAbbreviationRepository { * Initializes the internal data based on the abbreviations found in the given MV file */ public JournalAbbreviationRepository(Path journalList) { - MVMap mvFullToAbbreviationObject; - try (MVStore store = new MVStore.Builder().readOnly().fileName(journalList.toAbsolutePath().toString()).open()) { - mvFullToAbbreviationObject = store.openMap("FullToAbbreviation"); - mvFullToAbbreviationObject.forEach((name, abbreviation) -> { - String abbrevationString = abbreviation.getAbbreviation(); - String shortestUniqueAbbreviation = abbreviation.getShortestUniqueAbbreviation(); - Abbreviation newAbbreviation = new Abbreviation( - name, - abbrevationString, - shortestUniqueAbbreviation - ); - fullToAbbreviationObject.put(name, newAbbreviation); - abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation); - dotlessToAbbreviationObject.put(newAbbreviation.getDotlessAbbreviation(), newAbbreviation); - shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation); - }); - } + String journalPath = journalList.toAbsolutePath().toString(); + store = new MVStore.Builder().fileName(journalPath).open(); + + openMaps(store); } /** * Initializes the repository with demonstration data. Used if no abbreviation file is found. */ public JournalAbbreviationRepository() { + // this will persist in memory + store = new MVStore.Builder().open(); + + openMaps(store); + Abbreviation newAbbreviation = new Abbreviation( "Demonstration", "Demo", "Dem" ); - fullToAbbreviationObject.put("Demonstration", newAbbreviation); - abbreviationToAbbreviationObject.put("Demo", newAbbreviation); - dotlessToAbbreviationObject.put("Demo", newAbbreviation); - shortestUniqueToAbbreviationObject.put("Dem", newAbbreviation); + + fullToAbbreviationMap.put("Demonstration", newAbbreviation); + abbreviationToNameMap.put("Demo", "Demonstration"); + dotlessToNameMap.put("Demo", "Demonstration"); + shortestUniqueToNameMap.put("Dem", "Demonstration"); } private static boolean isMatched(String name, Abbreviation abbreviation) { @@ -108,9 +106,9 @@ public boolean isAbbreviatedName(String journalName) { } String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&"); return customAbbreviations.stream().anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation)) - || abbreviationToAbbreviationObject.containsKey(journal) - || dotlessToAbbreviationObject.containsKey(journal) - || shortestUniqueToAbbreviationObject.containsKey(journal); + || abbreviationToNameMap.containsKey(journal) + || dotlessToNameMap.containsKey(journal) + || shortestUniqueToNameMap.containsKey(journal); } /** @@ -130,10 +128,21 @@ public Optional get(String input) { return customAbbreviation; } - Optional abbreviation = Optional.ofNullable(fullToAbbreviationObject.get(journal)) - .or(() -> Optional.ofNullable(abbreviationToAbbreviationObject.get(journal))) - .or(() -> Optional.ofNullable(dotlessToAbbreviationObject.get(journal))) - .or(() -> Optional.ofNullable(shortestUniqueToAbbreviationObject.get(journal))); + // If the abbreviation is coming from fullToAbbreviationMap, then it's the name + Optional abbreviation = Optional.ofNullable(fullToAbbreviationMap.get(journal)); + + if (abbreviation.isEmpty()) { + String name = abbreviationToNameMap.get(journal); + if (name == null) { + name = dotlessToNameMap.get(journal); + } + if (name == null) { + name = shortestUniqueToNameMap.get(journal); + } + if (name != null) { + abbreviation = Optional.ofNullable(fullToAbbreviationMap.get(name)); + } + } if (abbreviation.isEmpty()) { abbreviation = findAbbreviationFuzzyMatched(journal); @@ -148,7 +157,7 @@ private Optional findAbbreviationFuzzyMatched(String input) { return customMatch; } - return findBestFuzzyMatched(fullToAbbreviationObject.values(), input); + return findBestFuzzyMatched(fullToAbbreviationMap.values(), input); } private Optional findBestFuzzyMatched(Collection abbreviations, String input) { @@ -156,9 +165,9 @@ private Optional findBestFuzzyMatched(Collection abb final double SIMILARITY_THRESHOLD = 1.0; List candidates = abbreviations.stream() - .filter(abbreviation -> similarity.isSimilar(input, abbreviation.getName())) - .sorted(Comparator.comparingDouble(abbreviation -> similarity.editDistanceIgnoreCase(input, abbreviation.getName()))) - .toList(); + .filter(abbreviation -> similarity.isSimilar(input, abbreviation.getName())) + .sorted(Comparator.comparingDouble(abbreviation -> similarity.editDistanceIgnoreCase(input, abbreviation.getName()))) + .toList(); if (candidates.isEmpty()) { return Optional.empty(); @@ -211,10 +220,17 @@ public Optional getShortestUniqueAbbreviation(String text) { } public Set getFullNames() { - return fullToAbbreviationObject.keySet(); + return fullToAbbreviationMap.keySet(); } public Collection getAllLoaded() { - return fullToAbbreviationObject.values(); + return fullToAbbreviationMap.values(); + } + + private void openMaps(MVStore store) { + fullToAbbreviationMap = store.openMap(FULL_TO_ABBREVIATION_MAP_NAME); + abbreviationToNameMap = store.openMap(ABBREVIATION_TO_ABBREVIATION_MAP_NAME); + dotlessToNameMap = store.openMap(DOTLESS_TO_ABBREVIATION_MAP_NAME); + shortestUniqueToNameMap = store.openMap(SHORTEST_UNIQUE_TO_ABBREVIATION_MAP_NAME); } }