CVS Update: xmlpull-api-v1/addons/java/xmlrpc/samples
Stefan Haustein <[email protected]> Wed, 19 Feb 2003 11:54:34 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
haustein 03/02/19 11:54:34
Modified: addons/java/xmlrpc/src/org/xmlpull/v1/xmlrpc
XmlRpcParserME.java
addons/java/xmlrpc/samples sample.xml
Log:
xml rpc fixes
Revision Changes Path
1.2 +13 -10 xmlpull-api-v1/addons/java/xmlrpc/src/org/xmlpull/v1/xmlrpc/XmlRpcParserME.java
Index: XmlRpcParserME.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/xmlrpc/src/org/xmlpull/v1/xmlrpc/XmlRpcParserME.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- XmlRpcParserME.java 18 Feb 2003 19:00:44 -0000 1.1
+++ XmlRpcParserME.java 19 Feb 2003 16:54:34 -0000 1.2
@@ -58,9 +58,8 @@
}
protected Object parseType(String name) throws IOException, XmlPullParserException {
- if (name.equals("double"))
- return new Double(parser.nextText());
- else if (name.equals("int") || name.equals("i4"))
+ // System.out.println("type:"+name);
+ if (name.equals("int") || name.equals("i4"))
return new Integer(Integer.parseInt(parser.nextText()));
else if (name.equals("array"))
return parseArray();
@@ -84,22 +83,26 @@
parser.require(XmlPullParser.START_TAG, "", "value"); // precondition
parser.next();
- Object result;
+ Object result = null;
- if (parser.getEventType() == XmlPullParser.END_TAG)
- result = "";
- else if (parser.getEventType() == XmlPullParser.TEXT) {
+ if (parser.getEventType() == XmlPullParser.TEXT) {
result = parser.getText();
parser.nextTag();
}
- else {
- parser.require(XmlPullParser.START_TAG, "", null);
+
+
+ if (parser.getEventType() == XmlPullParser.START_TAG) {
+
+ if (result != null && ((String) result).trim().length() > 0)
+ throw new RuntimeException("illegal mixed content!");
+
String name = parser.getName();
result = parseType(name);
parser.require(XmlPullParser.END_TAG, "", name);
parser.nextTag();
}
+
parser.require(XmlPullParser.END_TAG, "", "value"); // postcond.
return result;
}
1.2 +5 -15 xmlpull-api-v1/addons/java/xmlrpc/samples/sample.xml
Index: sample.xml
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/xmlrpc/samples/sample.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- sample.xml 19 Feb 2003 16:27:36 -0000 1.1
+++ sample.xml 19 Feb 2003 16:54:34 -0000 1.2
@@ -20,9 +20,7 @@
</member>
<member>
<name>dateCreated</name>
- <value>
- <dateTime.iso8601>20030218T14:54:21</dateTime.iso8601>
- </value>
+ <value>20030218T14:54:21</value>
</member>
<member>
<name>postid</name>
@@ -44,9 +42,7 @@
</member>
<member>
<name>dateCreated</name>
- <value>
- <dateTime.iso8601>20030218T10:18:01</dateTime.iso8601>
- </value>
+ <value>20030218T10:18:01</value>
</member>
<member>
<name>postid</name>
@@ -68,9 +64,7 @@
</member>
<member>
<name>dateCreated</name>
- <value>
- <dateTime.iso8601>20030218T10:04:29</dateTime.iso8601>
- </value>
+ <value>20030218T10:04:29</value>
</member>
<member>
<name>postid</name>
@@ -92,9 +86,7 @@
</member>
<member>
<name>dateCreated</name>
- <value>
- <dateTime.iso8601>20030218T10:02:38</dateTime.iso8601>
- </value>
+ <value>20030218T10:02:38</value>
</member>
<member>
<name>postid</name>
@@ -116,9 +108,7 @@
</member>
<member>
<name>dateCreated</name>
- <value>
- <dateTime.iso8601>20030218T09:49:47</dateTime.iso8601>
- </value>
+ <value>20030218T09:49:47</value>
</member>
<member>
<name>postid</name>
------------------------ Yahoo! Groups Sponsor ---------------------~-->
Get 128 Bit SSL Encryption!
http://us.click.yahoo.com/FpY02D/vN2EAA/xGHJAA/2U_rlB/TM
---------------------------------------------------------------------~->
To unsubscribe from this group, send an email to:
[email protected]
Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/