Skip to content

Make textKey (default "content") configurable in XML-JSON conversion #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make textKey (default "content") configurable in XML-JSON conversion #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Make textKey (default "content") configurable in XML-JSON conversion
  • Loading branch information
@jnothman
jnothman committed Nov 11, 2014
commit a75a060bc81bfe980bd172e985e3dd591e6c5e9b
68 changes: 52 additions & 16 deletions XML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,15 @@ public static void noSpace(String string) throws JSONException {

/**
* Scan the content following the named tag, attaching it to the context.
* @param x The XMLTokener containing the source string.
* @param context The JSONObject that will include the new material.
* @param name The tag name.
* @param x The XMLTokener containing the source string.
* @param context The JSONObject that will include the new material.
* @param name The tag name.
* @param textKey The key used to contain text node content.
* @return true if the close tag is processed.
* @throws JSONException
*/
private static boolean parse(XMLTokener x, JSONObject context,
String name) throws JSONException {
String name, String textKey) throws JSONException {
char c;
int i;
JSONObject jsonobject = null;
Expand Down Expand Up @@ -163,7 +164,7 @@ private static boolean parse(XMLTokener x, JSONObject context,
if (x.next() == '[') {
string = x.nextCDATA();
if (string.length() > 0) {
context.accumulate("content", string);
context.accumulate(textKey, string);
}
return false;
}
Expand Down Expand Up @@ -261,20 +262,20 @@ private static boolean parse(XMLTokener x, JSONObject context,
} else if (token instanceof String) {
string = (String)token;
if (string.length() > 0) {
jsonobject.accumulate("content",
jsonobject.accumulate(textKey,
XML.stringToValue(string));
}

// Nested element

} else if (token == LT) {
if (parse(x, jsonobject, tagName)) {
if (parse(x, jsonobject, tagName, textKey)) {
if (jsonobject.length() == 0) {
context.accumulate(tagName, "");
} else if (jsonobject.length() == 1 &&
jsonobject.opt("content") != null) {
jsonobject.opt(textKey) != null) {
context.accumulate(tagName,
jsonobject.opt("content"));
jsonobject.opt(textKey));
} else {
context.accumulate(tagName, jsonobject);
}
Expand Down Expand Up @@ -349,10 +350,31 @@ public static Object stringToValue(String string) {
* @throws JSONException
*/
public static JSONObject toJSONObject(String string) throws JSONException {
return toJSONObject(string, "content");
}


/**
* Convert a well-formed (but not necessarily valid) XML string into a
* JSONObject. Some information may be lost in this transformation
* because JSON is a data format and XML is a document format. XML uses
* elements, attributes, and content text, while JSON uses unordered
* collections of name/value pairs and arrays of values. JSON does not
* does not like to distinguish between elements and attributes.
* Sequences of similar elements are represented as JSONArrays. Content
* text may be placed in a member keyed by <code>textKey</code>.
* Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
* @param string The source string.
* @param textKey The JSON key to contain text node content.
* @return A JSONObject containing the structured data from the XML string.
* @throws JSONException
*/
public static JSONObject toJSONObject(String string,
String textKey) throws JSONException {
JSONObject jo = new JSONObject();
XMLTokener x = new XMLTokener(string);
while (x.more() && x.skipPast("<")) {
parse(x, jo, null);
parse(x, jo, null, textKey);
}
return jo;
}
Expand All @@ -371,13 +393,27 @@ public static String toString(Object object) throws JSONException {

/**
* Convert a JSONObject into a well-formed, element-normal XML string.
* @param object A JSONObject.
* @param object A JSONObject.
* @param tagName The optional name of the enclosing tag.
* @return A string.
* @throws JSONException
*/
public static String toString(Object object, String tagName)
throws JSONException {
return toString(object, tagName, "content");
}


/**
* Convert a JSONObject into a well-formed, element-normal XML string.
* @param object A JSONObject.
* @param tagName The optional name of the enclosing tag, or null for none.
* @param textKey The JSON key containing XML text node content.
* @return A string.
* @throws JSONException
*/
public static String toString(Object object, String tagName, String textKey)
throws JSONException {
StringBuilder sb = new StringBuilder();
int i;
JSONArray ja;
Expand Down Expand Up @@ -411,7 +447,7 @@ public static String toString(Object object, String tagName)

// Emit content in body

if ("content".equals(key)) {
if (textKey.equals(key)) {
if (value instanceof JSONArray) {
ja = (JSONArray)value;
length = ja.length();
Expand All @@ -436,12 +472,12 @@ public static String toString(Object object, String tagName)
sb.append('<');
sb.append(key);
sb.append('>');
sb.append(toString(value));
sb.append(toString(value, null, textKey));
sb.append("</");
sb.append(key);
sb.append('>');
} else {
sb.append(toString(value, key));
sb.append(toString(value, key, textKey));
}
}
} else if ("".equals(value)) {
Expand All @@ -452,7 +488,7 @@ public static String toString(Object object, String tagName)
// Emit a new tag <k>

} else {
sb.append(toString(value, key));
sb.append(toString(value, key, textKey));
}
}
if (tagName != null) {
Expand All @@ -476,7 +512,7 @@ public static String toString(Object object, String tagName)
ja = (JSONArray)object;
length = ja.length();
for (i = 0; i < length; i += 1) {
sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName, textKey));
}
return sb.toString();
} else {
Expand Down