Use field variable with qualified field name. FIX namespace!

diff --git a/src/org/marc4j/TurboMarcXmlWriter.java b/src/org/marc4j/TurboMarcXmlWriter.java
index d5ec784..7a7deda 100644 (file)
--- a/src/org/marc4j/TurboMarcXmlWriter.java
+++ b/src/org/marc4j/TurboMarcXmlWriter.java
@@ -199,22 +199,22 @@ public class TurboMarcXmlWriter implements MarcWriter {
     protected static final String prefix = "tmarc:";\r
     \r
     protected static final String CONTROL_FIELD = "c";\r
     protected static final String prefix = "tmarc:";\r
     \r
     protected static final String CONTROL_FIELD = "c";\r

-    protected static final String Q_CONTROL_FIELD = prefix + "c";\r
+    protected static final String Q_CONTROL_FIELD = prefix + CONTROL_FIELD;\r

 \r
     protected static final String DATA_FIELD = "d";\r
 \r
     protected static final String DATA_FIELD = "d";\r

-    protected static final String Q_DATA_FIELD = prefix + "d";\r
+    protected static final String Q_DATA_FIELD = prefix + DATA_FIELD;\r

 \r
     protected static final String SUBFIELD = "s";\r
 \r
     protected static final String SUBFIELD = "s";\r

-    protected static final String Q_SUBFIELD = prefix + "s";\r
+    protected static final String Q_SUBFIELD = prefix + SUBFIELD;\r

 \r
 \r

-    protected static final String COLLECTION = "c";\r
-    protected static final String Q_COLLECTION = prefix + "c";\r
+    protected static final String COLLECTION = "collection";\r
+    protected static final String Q_COLLECTION = prefix + COLLECTION;\r

 \r
     protected static final String RECORD = "r";\r
 \r
     protected static final String RECORD = "r";\r

-    protected static final String Q_RECORD = prefix + "r";\r
+    protected static final String Q_RECORD = prefix + RECORD;\r

 \r
     protected static final String LEADER = "l";\r
 \r
     protected static final String LEADER = "l";\r

-    protected static final String Q_LEADER = prefix + "l";\r
+    protected static final String Q_LEADER = prefix + LEADER;\r

 \r
     private boolean indent = false;\r
 \r
 \r
     private boolean indent = false;\r
 \r

@@ -414,7 +414,7 @@ public class TurboMarcXmlWriter implements MarcWriter {
             AttributesImpl atts = new AttributesImpl();\r
             handler.startDocument();\r
             // The next line duplicates the namespace declaration for Marc XML\r
             AttributesImpl atts = new AttributesImpl();\r
             handler.startDocument();\r
             // The next line duplicates the namespace declaration for Marc XML\r

-            handler.startPrefixMapping("tmarc", Constants.MARCXML_NS_URI);\r
+            handler.startPrefixMapping("tmarc", Constants.TURBO_MARCXML_NS_URI);\r

             // add namespace declaration using attribute - need better solution\r
             atts.addAttribute(Constants.TURBO_MARCXML_NS_URI, "xmlns", "xmlns:tmarc",\r
                               "CDATA", Constants.TURBO_MARCXML_NS_URI);            \r
             // add namespace declaration using attribute - need better solution\r
             atts.addAttribute(Constants.TURBO_MARCXML_NS_URI, "xmlns", "xmlns:tmarc",\r
                               "CDATA", Constants.TURBO_MARCXML_NS_URI);            \r