Update for current metafacture-fix master branch. (metafacture/metafa…

…cture-fix#170) Differences in reference files: - Various (inconsequential) order changes.
hbz · Apr 26, 2022 · 515ee4c · 515ee4c
1 parent 4972f39
commit 515ee4c
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 222 deletions.
diff --git a/src/main/java/hbz/limetrans/function/Dedup.java b/src/main/java/hbz/limetrans/function/Dedup.java
@@ -1,6 +1,5 @@
 package hbz.limetrans.function;
 
-import org.metafacture.metafix.FixPath;
 import org.metafacture.metafix.Metafix;
 import org.metafacture.metafix.Record;
 import org.metafacture.metafix.api.FixFunction;
@@ -18,7 +17,7 @@ public Dedup() {
     @Override
     public void apply(final Metafix aMetafix, final Record aRecord, final List<String> aParams, final Map<String, String> aOptions) {
         final Set<String> set = new HashSet<>();
-        new FixPath(aParams.get(0)).transformIn(aRecord, s -> set.add(s) ? s : null);
+        aRecord.transform(aParams.get(0), s -> set.add(s) ? s : null);
     }
 
 }
diff --git a/src/main/java/hbz/limetrans/function/ISSN.java b/src/main/java/hbz/limetrans/function/ISSN.java
@@ -1,6 +1,5 @@
 package hbz.limetrans.function;
 
-import org.metafacture.metafix.FixPath;
 import org.metafacture.metafix.Metafix;
 import org.metafacture.metafix.Record;
 import org.metafacture.metafix.api.FixFunction;
@@ -20,7 +19,7 @@ public ISSN() {
 
     @Override
     public void apply(final Metafix aMetafix, final Record aRecord, final List<String> aParams, final Map<String, String> aOptions) {
-        new FixPath(aParams.get(0)).transformIn(aRecord, s -> {
+        aRecord.transform(aParams.get(0), s -> {
             final Matcher m = PATTERN.matcher(s);
 
             if (m.find()) {

diff --git a/src/main/java/hbz/limetrans/function/ZDB.java b/src/main/java/hbz/limetrans/function/ZDB.java
@@ -1,6 +1,5 @@
 package hbz.limetrans.function;
 
-import org.metafacture.metafix.FixPath;
 import org.metafacture.metafix.Metafix;
 import org.metafacture.metafix.Record;
 import org.metafacture.metafix.api.FixFunction;
@@ -47,7 +46,7 @@ public String process(final String aValue) {
 
     @Override
     public void apply(final Metafix aMetafix, final Record aRecord, final List<String> aParams, final Map<String, String> aOptions) {
-        new FixPath(aParams.get(0)).transformIn(aRecord, s -> process(s));
+        aRecord.transform(aParams.get(0), this::process);
     }
 
 }
diff --git a/src/test/resources/limetrans/reference.fix/alma-468-supplements.json b/src/test/resources/limetrans/reference.fix/alma-468-supplements.json
@@ -325,19 +325,19 @@
     "designation" : "HT001253222"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/11/27/file_131/0000000.pdf",
     "relatedto" : "Dummy",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/11/27/file_131/0000000.pdf"
+    "format" : "application/pdf"
   }, {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/11/27/file_131/2235259.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/11/27/file_131/2235259.pdf"
+    "format" : "application/pdf"
   } ],
   "SubjectHeadings" : [ {
     "subject" : "Banach-Raum"
@@ -448,11 +448,11 @@
     "designation" : "HT001235103"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/06/01/file_109/1947137.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/06/01/file_109/1947137.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -558,11 +558,11 @@
     "extent" : "299 S. : Ill., graph. Darst."
   },
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2017/08/06/file_1/7325160.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2017/08/06/file_1/7325160.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -997,11 +997,11 @@
     "designation" : "HT001247052"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/05/18/file_28/1834997.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/05/18/file_28/1834997.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -1104,11 +1104,11 @@
     "designation" : "HT001233099"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/06/08/file_19/1991501.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2007/06/08/file_19/1991501.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -1350,11 +1350,11 @@
     "designation" : "HT001253222"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2008/05/19/file_182/2366129.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2008/05/19/file_182/2366129.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -1559,11 +1559,11 @@
     "designation" : "HT003430388"
   } ],
   "OnlineAccess" : [ {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2006/01/25/file_401/1409545.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
     "contact" : "X:migimw",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage/2006/01/25/file_401/1409545.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "V:DE-605",
@@ -2405,12 +2405,12 @@
     "identifierForLinkingEntry" : "HT020371784"
   } ],
   "OnlineAccess" : [ {
-    "nonpublicnote" : "Verlag",
-    "uri" : "https://beck-online.beck.de/?vpath=bibdata%2Fkomm%2FJoHeEhe_7%2Fcont%2FJoHeEhe%2Ehtm"
+    "uri" : "https://beck-online.beck.de/?vpath=bibdata%2Fkomm%2FJoHeEhe_7%2Fcont%2FJoHeEhe%2Ehtm",
+    "nonpublicnote" : "Verlag"
   }, {
     "publicnote" : "Beck online - Hochschulmodul (Books ZDB-18-BOH)",
-    "isInternalLinkFor" : "DE-468",
-    "uri" : "https://eu04.alma.exlibrisgroup.com/view/uresolver/49HBZ_WUP/openurl?u.ignore_date_coverage=true&portfolio_pid=53487259870006441&Force_direct=true"
+    "uri" : "https://eu04.alma.exlibrisgroup.com/view/uresolver/49HBZ_WUP/openurl?u.ignore_date_coverage=true&portfolio_pid=53487259870006441&Force_direct=true",
+    "isInternalLinkFor" : "DE-468"
   } ],
   "xbib" : [ {
     "uid" : "(DE-605)990367446770206441"
@@ -2648,12 +2648,12 @@
     "identifierISBN" : "9783662616505"
   } ],
   "OnlineAccess" : [ {
-    "nonpublicnote" : "Resolving-System",
-    "uri" : "https://doi.org/10.1007/978-3-662-61651-2"
+    "uri" : "https://doi.org/10.1007/978-3-662-61651-2",
+    "nonpublicnote" : "Resolving-System"
   }, {
     "publicnote" : "Springer Technik, Informatik 2020 (ZDB-2-STI)",
-    "isInternalLinkFor" : "DE-468",
-    "uri" : "https://eu04.alma.exlibrisgroup.com/view/uresolver/49HBZ_WUP/openurl?u.ignore_date_coverage=true&portfolio_pid=53736556350006441&Force_direct=true"
+    "uri" : "https://eu04.alma.exlibrisgroup.com/view/uresolver/49HBZ_WUP/openurl?u.ignore_date_coverage=true&portfolio_pid=53736556350006441&Force_direct=true",
+    "isInternalLinkFor" : "DE-468"
   } ],
   "ClassifierDigitization" : [ {
     "classifier" : "ZDB-2-STI"
@@ -2768,16 +2768,16 @@
     "extent" : "295 Seiten : Illustrationen, 1 Diagramm, Noten"
   },
   "OnlineAccess" : [ {
+    "uri" : "http://d-nb.info/1171264887/04",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "B:DE-101",
-    "format" : "application/pdf",
-    "uri" : "http://d-nb.info/1171264887/04"
+    "format" : "application/pdf"
   }, {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2018/12/13/file_30/8219872.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "B:DE-101",
     "contact" : "B:DE-101",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2018/12/13/file_30/8219872.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "B:DE-101",
@@ -2892,9 +2892,9 @@
     "identifierGND" : [ "119352354" ]
   } ],
   "OnlineAccess" : [ {
+    "uri" : "www.folkwang-uni.de/fileadmin/medien/Downloads/Bibliothek/Inhaltsverzeichnisse/HT002102871.pdf",
     "nonpublicnote" : "Inhaltsverzeichnis",
-    "format" : "application/pdf",
-    "uri" : "www.folkwang-uni.de/fileadmin/medien/Downloads/Bibliothek/Inhaltsverzeichnisse/HT002102871.pdf"
+    "format" : "application/pdf"
   } ],
   "SubjectGHBLocal" : [ {
     "source" : "DE-468",
@@ -3155,14 +3155,14 @@
     "designation" : "HT001231731"
   } ],
   "OnlineAccess" : [ {
-    "contact" : "X:MVB",
-    "uri" : "http://www.degruyter.com/search?f_0=isbnissn&q_0=9783110643381&searchTitles=true"
+    "uri" : "http://www.degruyter.com/search?f_0=isbnissn&q_0=9783110643381&searchTitles=true",
+    "contact" : "X:MVB"
   }, {
+    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2019/06/06/file_11/8476562.pdf",
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "X:MVB",
     "contact" : "B:DE-101",
-    "format" : "application/pdf",
-    "uri" : "http://digitale-objekte.hbz-nrw.de/storage2/2019/06/06/file_11/8476562.pdf"
+    "format" : "application/pdf"
   }, {
     "relatedto" : "Inhaltsverzeichnis",
     "contact" : "X:MVB",