issue #163: improve field index name cache

pkiraly · Sep 27, 2022 · a6b4486 · a6b4486
1 parent 64cb786
commit a6b4486
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/de/gwdg/metadataqa/marc/MarcSubfield.java b/src/main/java/de/gwdg/metadataqa/marc/MarcSubfield.java
@@ -132,7 +132,7 @@ public Map<String, List<String>> getKeyValuePairs(DataFieldKeyGenerator keyGener
       prefixCache = new HashMap<>();
     }
 
-    String cacheKey = this.getField().getTag() + "$" + code + "-" + keyGenerator.getType().getType();
+    String cacheKey = String.format("%s$%s-%s-%s", this.getField().getTag(), code, keyGenerator.getType().getType(), keyGenerator.getMarcVersion());
     if (!prefixCache.containsKey(cacheKey))
       prefixCache.put(cacheKey, keyGenerator.forSubfield(this));
     String prefix = prefixCache.get(cacheKey);

diff --git a/src/main/java/de/gwdg/metadataqa/marc/Utils.java b/src/main/java/de/gwdg/metadataqa/marc/Utils.java
@@ -1,16 +1,13 @@
 package de.gwdg.metadataqa.marc;
 
-import com.opencsv.CSVWriter;
 import de.gwdg.metadataqa.marc.dao.DataField;
 import de.gwdg.metadataqa.marc.definition.structure.ControlfieldPositionDefinition;
 import de.gwdg.metadataqa.marc.definition.structure.DataFieldDefinition;
 
 import de.gwdg.metadataqa.marc.definition.MarcVersion;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/src/main/java/de/gwdg/metadataqa/marc/utils/keygenerator/DataFieldKeyGenerator.java b/src/main/java/de/gwdg/metadataqa/marc/utils/keygenerator/DataFieldKeyGenerator.java
@@ -187,4 +187,8 @@ public String forFull() {
   public SolrFieldType getType() {
     return type;
   }
+
+  public MarcVersion getMarcVersion() {
+    return marcVersion;
+  }
 }