X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXMLRPC.java;h=ac8324991b30fe8031071015b010ac7a50293ca8;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=f2e8eee88534d28e7708c43283a2dbd8fe7f7d2a;hpb=e6a665b309c7103a3a29c2cd96b1073409c13606;p=org.ibex.core.git diff --git a/src/org/xwt/XMLRPC.java b/src/org/xwt/XMLRPC.java index f2e8eee..ac83249 100644 --- a/src/org/xwt/XMLRPC.java +++ b/src/org/xwt/XMLRPC.java @@ -1,4 +1,4 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import java.io.*; @@ -30,7 +30,7 @@ import org.bouncycastle.util.encoders.Base64; * convert. * */ -class XMLRPC extends JS.Function { +class XMLRPC extends JS.Callable { public Object[] keys() { throw new Error("not implemented"); } @@ -57,7 +57,7 @@ class XMLRPC extends JS.Function { * * If an <array> tag is encountered, a null is pushed onto the * stack. When a </data> is encountered, we search back on the - * stack to the last null, replace it with a NativeArray, and + * stack to the last null, replace it with a NativeJS.Array, and * insert into it all elements above it on the stack. * * If a <struct> tag is encountered, a JSObject is pushed @@ -79,97 +79,94 @@ class XMLRPC extends JS.Function { // Methods to Recieve and parse XML-RPC Response //////////////////////////////////////////////////// private class Helper extends XML { - public Helper() { super(BUFFER_SIZE); } - - public void startElement(XML.Element c) { - content.reset(); - if (c.localName.equals("fault")) fault = true; - else if (c.localName.equals("struct")) objects.setElementAt(new JS.Obj(), objects.size() - 1); - else if (c.localName.equals("array")) objects.setElementAt(null, objects.size() - 1); - else if (c.localName.equals("value")) objects.addElement(""); - } - - public void endElement(XML.Element c) { - - if (c.localName.equals("int") || c.localName.equals("i4")) - objects.setElementAt(new Integer(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - - else if (c.localName.equals("boolean")) - objects.setElementAt(content.getBuf()[0] == '1' ? Boolean.TRUE : Boolean.FALSE, objects.size() - 1); - - else if (c.localName.equals("string")) - objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - - else if (c.localName.equals("double")) - objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - - else if (c.localName.equals("base64")) - objects.setElementAt(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1); - - else if (c.localName.equals("name")) - objects.addElement(new String(content.getBuf(), 0, content.size())); - - else if (c.localName.equals("value") && "".equals(objects.lastElement())) - objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - - else if (c.localName.equals("dateTime.iso8601")) { - throw new Error("not implemented"); - /* - String s = new String(content.getBuf(), 0, content.size()); - - // strip whitespace - int i=0; - while(Character.isWhitespace(s.charAt(i))) i++; - if (i > 0) s = s.substring(i); - - try { - NativeDate nd = (NativeDate)Context.enter().newObject(org.xwt.util.JS.Obj.defaultObjects, "Date"); - double date = NativeDate.date_msecFromDate(Double.valueOf(s.substring(0, 4)).doubleValue(), - Double.valueOf(s.substring(4, 6)).doubleValue() - 1, - Double.valueOf(s.substring(6, 8)).doubleValue(), - Double.valueOf(s.substring(9, 11)).doubleValue(), - Double.valueOf(s.substring(12, 14)).doubleValue(), - Double.valueOf(s.substring(15, 17)).doubleValue(), - (double)0 - ); - nd.jsFunction_setTime(NativeDate.internalUTC(date)); - objects.setElementAt(nd, objects.size() - 1); - - } catch (Exception e) { - if (Log.on) Log.log(this, "error parsing date : " + s); - if (Log.on) Log.log(this, e); - } - */ - - } else if (c.localName.equals("member")) { - Object memberValue = objects.elementAt(objects.size() - 1); - String memberName = (String)objects.elementAt(objects.size() - 2); - JS struct = (JS)objects.elementAt(objects.size() - 3); - struct.put(memberName, memberValue); - objects.setSize(objects.size() - 2); - - } else if (c.localName.equals("data")) { - int i; - for(i=objects.size() - 1; objects.elementAt(i) != null; i--); - JS.Array arr = new JS.Array(); - for(int j = i + 1; j 0) s = s.substring(i); + + try { + org.xwt.js.Date nd = new org.xwt.js.Date(); + double date = org.xwt.js.Date.date_msecFromDate(Double.valueOf(s.substring(0, 4)).doubleValue(), + Double.valueOf(s.substring(4, 6)).doubleValue() - 1, + Double.valueOf(s.substring(6, 8)).doubleValue(), + Double.valueOf(s.substring(9, 11)).doubleValue(), + Double.valueOf(s.substring(12, 14)).doubleValue(), + Double.valueOf(s.substring(15, 17)).doubleValue(), + (double)0 + ); + nd.jsFunction_setTime(org.xwt.js.Date.internalUTC(date)); + objects.setElementAt(nd, objects.size() - 1); + + } catch (Exception e) { + if (Log.on) Log.log(this, "error parsing date : " + s); + if (Log.on) Log.log(this, e); + } + + } else if (c.localName.equals("member")) { + Object memberValue = objects.elementAt(objects.size() - 1); + String memberName = (String)objects.elementAt(objects.size() - 2); + JS struct = (JS)objects.elementAt(objects.size() - 3); + struct.put(memberName, memberValue); + objects.setSize(objects.size() - 2); + + } else if (c.localName.equals("data")) { + int i; + for(i=objects.size() - 1; objects.elementAt(i) != null; i--); + JS.Array arr = new JS.Array(); + for(int j = i + 1; j\n"); - } else if (o instanceof ByteStream) { + } else if (o instanceof Res) { try { sb.append(" \n"); - InputStream is = ((ByteStream)o).getInputStream(); + InputStream is = ((Res)o).getInputStream(); byte[] buf = new byte[54]; while(true) { int numread = is.read(buf, 0, 54); @@ -240,12 +237,9 @@ class XMLRPC extends JS.Function { } sb.append("\n"); - /* } else if (o instanceof org.xwt.js.Date) { sb.append(" "); - FIXME - org.xwt.js.Date d = (org.xwt.js.Date)o; - Date d = new Date(nd.getRawTime()); + java.util.Date d = new java.util.Date(((org.xwt.js.Date)o).getRawTime()); sb.append(d.getYear() + 1900); if (d.getMonth() + 1 < 10) sb.append('0'); sb.append(d.getMonth() + 1); @@ -261,7 +255,6 @@ class XMLRPC extends JS.Function { if (d.getSeconds() < 10) sb.append('0'); sb.append(d.getSeconds()); sb.append("\n"); - */ } else if (o instanceof JS.Array) { if (tracker.get(o) != null) throw new JS.Exn("attempted to send multi-ref data structure via XML-RPC"); @@ -308,11 +301,11 @@ class XMLRPC extends JS.Function { while ((s = br2.readLine()) != null) Log.log(this, "send: " + s); } - HTTP.HTTPInputStream is = http.POST("text/xml", content); + InputStream is = http.POST("text/xml", content); try { BufferedReader br = !Log.verbose ? - new BufferedReader(new InputStreamReader(new Filter(is))) : - new BufferedReader(new FilterReader(new InputStreamReader(new Filter(is))) { + new BufferedReader(new InputStreamReader(is)) : + new BufferedReader(new FilterReader(new InputStreamReader(is)) { public int read() throws IOException { int i = super.read(); if (Log.on) Log.log(this, "recv: " + ((char)i)); @@ -366,10 +359,7 @@ class XMLRPC extends JS.Function { return objects.elementAt(0); } - public final Object _call(JS.Array args) throws JS.Exn { - - if (!ThreadMessage.suspendThread()) return null; - + public final Object call(JS.Array args) throws JS.Exn { try { return call2(args); } catch (IOException se) { @@ -377,17 +367,14 @@ class XMLRPC extends JS.Function { throw new JS.Exn("socket exception: " + se); } catch (JS.Exn jse) { - if (Log.on) Log.log(this, jse.toString()); + if (Log.on) Log.log(this, jse.toString()); throw jse; - } finally { - ThreadMessage.resumeThread(); } - } /** When you get a property from an XMLRPC, it just returns another XMLRPC with the property name tacked onto methodname. */ - public Object get(String name) { - return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name, http); + public Object get(Object name) { + return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name.toString(), http); } public XMLRPC(String url, String methodname) { @@ -395,7 +382,6 @@ class XMLRPC extends JS.Function { } public XMLRPC(String url, String methodname, HTTP http) { - super(-1, "java", null, null); this.http = http; this.url = url; this.methodname = methodname; @@ -410,24 +396,4 @@ class XMLRPC extends JS.Function { public AccessibleCharArrayWriter(int i) { super(i); } } - /** private filter class to make sure that network transfers don't interfere with UI responsiveness */ - private static class Filter extends FilterInputStream { - public Filter(InputStream is) { super(is); } - public int read() throws IOException { - Thread.yield(); - while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; - return super.read(); - } - public int read(byte[] b) throws IOException { - Thread.yield(); - while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; - return super.read(b); - } - public int read(byte[] b, int i, int j) throws IOException { - Thread.yield(); - while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { }; - return super.read(b, i, j); - } - } - }