update Mail for new JS API

[org.ibex.mail.git] / src / org / ibex / mail / target / Script.java

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index f183aa1..ac94ca9 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -37,9 +37,12 @@ public class Script extends Target {
 
     private class ScriptScope extends JS.Immutable {
         ScriptEnv env = new ScriptEnv();
-        public Object get(Object o) {
-            if (o.equals("m")) return m;
-            if (o.equals("ibex")) return env;
+        public JS get(JS name) throws JSExn {
+            //#jsswitch(name)
+            case "m": return m;
+            case "ibex": return env;
+            default: return null;
+            //#end
             return null;
         }
     }
@@ -89,8 +92,7 @@ public class Script extends Target {
             Sub(String key) { this.key = key; }
             public void put(JS key, JS val) throws JSExn {
                 ScriptEnv.this.put(JSU.S(this.key + "." + JSU.toString(key)), val); }
-            public JS get(JS key) throws JSExn {
-                return ScriptEnv.this.get(JSU.S(this.key + "." + JSU.toString(key))); }
+            public JS get(JS key) throws JSExn { return ScriptEnv.this.get(JSU.S(this.key + "." + JSU.toString(key))); }
             public JS call(JS method, JS[] args) throws JSExn {
                 return ScriptEnv.this.call(JSU.S(this.key + "." + JSU.toString(method)), args);
             }
@@ -125,14 +127,15 @@ public class Script extends Target {
             return super.get(name);
         }
 
-        public JS call(JS name, JS[] args) throws JSExn {
+        public JS call(JS name0, JS[] args) throws JSExn {
             final JS a = args.length >= 1 ? args[0] : null;
             final JS b = args.length >= 2 ? args[1] : null;
             final JS c = args.length >= 3 ? args[2] : null;
             final int nargs = args.length;
+            String name = JSU.toString(name0);
             try {
                 if (name.equals("date")) { return new JSDate(args); }
-                if (name.equals("mail.send")) {
+                if (name.equals("mail.send") || name.equals("send")) {
                     JS m = (JS)a;
                     StringBuffer headers = new StringBuffer();
                     String body = "";
@@ -151,11 +154,11 @@ public class Script extends Target {
                     if (!ok) throw new JSExn("SMTP server rejected message");
                     return JSU.T;
                 }
-                if (name.equals("mail.forward2")) {
+                if (name.equals("mail.forward2") || name.equals("forward2")) {
                     try {
                         Message m2 = Message.newMessage(new org.ibex.io.Stream(m.toString()),
                                                         m.envelopeFrom,
-                                                        new Address(a.toString()));
+                                                        new Address(JSU.toString(a)));
                         org.ibex.mail.protocol.SMTP.Outgoing.accept(m2);
                     } catch (Exception e) {
                         Log.warn(this, e);
@@ -163,7 +166,7 @@ public class Script extends Target {
                     }
                     return null;
                 }
-                if (name.equals("mail.forward")) { return new Target() {
+                if (name.equals("mail.forward") || name.equals("forward")) { return new Target() {
                         public void accept(Message m) throws MailException {
                             try {
                                 Message m2 = Message.newMessage(new org.ibex.io.Stream(m.toString()),
@@ -175,10 +178,10 @@ public class Script extends Target {
                             }
                         }
                     }; }
-                if (name.equals("log.debug")) {    JSU.debug(a== null ? "**null**" : a.toString()); return null; }
-                if (name.equals("log.info")) {     JSU.info(a== null ? "**null**" : a.toString()); return null; }
-                if (name.equals("log.warn")) {     JSU.warn(a== null ? "**null**" : a.toString()); return null; }
-                if (name.equals("log.error")) {    JSU.error(a== null ? "**null**" : a.toString()); return null; }
+                if (name.equals("log.debug") || name.equals("debug")) {    JSU.debug(a== null ? "**null**" : JSU.toString(a)); return null; }
+                if (name.equals("log.info") || name.equals("info")) {     JSU.info(a== null ? "**null**" : JSU.toString(a)); return null; }
+                if (name.equals("log.warn") || name.equals("warn")) {     JSU.warn(a== null ? "**null**" : JSU.toString(a)); return null; }
+                if (name.equals("log.error") || name.equals("error")) {    JSU.error(a== null ? "**null**" : JSU.toString(a)); return null; }
                 switch (nargs) {
                 case 1:
                     if (name.equals("regexp")) {return new JSRegexp(a, null); }
@@ -190,9 +193,9 @@ public class Script extends Target {
                 Log.warn(this, "ibex."+name+"() threw: " + e);
                 Log.warn(this, e);
                 if (e instanceof JSExn) throw ((JSExn)e);
-                throw new JSExn("invalid argument for ibex object method "+name+"()");
+                throw new JSExn("invalid argument for ibex object method "+JSU.toString(name0)+"()");
             }
-            throw new JSExn("invalid number of arguments ("+nargs+") for ibex object method "+name+"()");
+            throw new JSExn("invalid number of arguments ("+nargs+") for ibex object method "+JSU.toString(name0)+"()");
         }
 
         public final JSMath ibexMath = new JSMath() {