joerg/marc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch open map state in json builder

Browse source
This commit is contained in:
Jörg Prante 2023-01-29 23:09:37 +01:00
parent 00b72d0ddd
commit 87628fe3e2
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/xbib/marc/json/JsonBuilder.java
View file

@ -156,6 +156,10 @@ public class JsonBuilder {
return appendable.toString(); return appendable.toString();
} }
void patchOpenMapState() {
state.first = false;
}
private void beginKey(String k) throws IOException { private void beginKey(String k) throws IOException {
if (state.first) { if (state.first) {
state.first = false; state.first = false;

6
src/main/java/org/xbib/marc/json/MarcJsonWriter.java
View file

@ -312,6 +312,8 @@ public class MarcJsonWriter extends MarcContentHandler implements Flushable, Clo
/** /**
* Write MARC record using fields, indicators, and subfield structures, * Write MARC record using fields, indicators, and subfield structures,
* therefore allowing duplicate keys in the output. * therefore allowing duplicate keys in the output.
* Duplicate keys are rejected by Elasticsearch.
*
* @param marcRecord the MARC record * @param marcRecord the MARC record
* @throws IOException if writing fails * @throws IOException if writing fails
*/ */
@ -371,6 +373,8 @@ public class MarcJsonWriter extends MarcContentHandler implements Flushable, Clo
/** /**
* Write MARC record from underlying map as key-oriented JSON. Use repeat maps to create lists. * Write MARC record from underlying map as key-oriented JSON. Use repeat maps to create lists.
* Because no duplicate keyes are generated, this is the variant for Elasticsearch.
*
* @param marcRecord the MARC record * @param marcRecord the MARC record
* @throws IOException if writing fails * @throws IOException if writing fails
*/ */
@ -521,6 +525,8 @@ public class MarcJsonWriter extends MarcContentHandler implements Flushable, Clo
} }
if (!style.contains(Style.EMBEDDED_RECORD)) { if (!style.contains(Style.EMBEDDED_RECORD)) {
sb.append('}'); sb.append('}');
} else {
jsonBuilder.patchOpenMapState();
} }
writer.write(sb.toString()); writer.write(sb.toString());
} }