Changeset 6816 for SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUXMLStreamWriter.java

Timestamp:

11/17/15 12:28:02 (9 years ago)

Author:

Oliver Schonefeld

Message:

• first step towards SRU 2.0 argument parsing and response serialization

File:

• SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUXMLStreamWriter.java (modified) (7 diffs)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUXMLStreamWriter.java

@@ -45 +45 @@
     }
     private static final SAXParserFactory factory;
-    private final SRURecordPacking packing;
+    private final SRURecordXmlEscaping recordEscaping;
     private final Writer writer;
     private final XMLStreamWriter xmlwriter;
@@ -55 +55 @@
 
 
-    SRUXMLStreamWriter(OutputStream stream, XMLOutputFactory factory,
-            SRURecordPacking recordPacking, int indent) throws IOException,
-            XMLStreamException {
-        this.packing = recordPacking;
+    SRUXMLStreamWriter(OutputStream stream,
+            XMLOutputFactory factory,
+            SRURecordXmlEscaping recordXmlEscaping,
+            int indent) throws IOException, XMLStreamException {
+        this.recordEscaping = recordXmlEscaping;
         this.writer = new OutputStreamWriter(stream,
                 SRUServer.RESPONSE_ENCODING) {
             @Override
             public void write(int c) throws IOException {
-                if (writingRecord && (packing == SRURecordPacking.STRING)) {
+                if (writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING)) {
                     /*
                      * NOTE: need to write single characters here, because
@@ -98 +99 @@
             @Override
             public void write(char[] c, int off, int len) throws IOException {
-                if (writingRecord && (packing == SRURecordPacking.STRING)) {
+                if (writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING)) {
                     for (int i = off; i < len; i++) {
                         this.write(c[i]);
@@ -109 +110 @@
             @Override
             public void write(String s, int off, int len) throws IOException {
-                if (writingRecord && (packing == SRURecordPacking.STRING)) {
+                if (writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING)) {
                     for (int i = off; i < len; i++) {
                         this.write(s.charAt(i));
@@ -480 +481 @@
 
     private void onStartElement() throws XMLStreamException {
-        if (!(writingRecord && (packing == SRURecordPacking.STRING))) {
+        if (!(writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING))) {
             stateStack.push(IndentingState.SEEN_ELEMENT);
             state = IndentingState.SEEN_NOTHING;
@@ -493 +494 @@
 
     private void onEndElement() throws XMLStreamException {
-        if (!(writingRecord && (packing == SRURecordPacking.STRING))) {
+        if (!(writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING))) {
             depth--;
             if (state == IndentingState.SEEN_ELEMENT) {
@@ -505 +506 @@
 
     private void onEmptyElement() throws XMLStreamException {
-        if (!(writingRecord && (packing == SRURecordPacking.STRING))) {
+        if (!(writingRecord && (recordEscaping == SRURecordXmlEscaping.STRING))) {
             state = IndentingState.SEEN_ELEMENT;
             if (depth > 0) {