r8198: - handled push/pull of simple strings in ejs

- improved the error handling, so the ejs wrappers don't just ignore a type they
  don't handle, instead an exception is issued saying what isn't handled
(This used to be commit a77c2aa8606ad668f6a513211a1d9e7d6193d741)

1 files changed, 44 insertions, 3 deletions

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 4984518c7f..75f748f146 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -24,21 +24,38 @@
 #include "lib/ejs/ejs.h"
 #include "scripting/ejs/ejsrpc.h"
 
-NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
+NTSTATUS ejs_pull_rpc(int eid, const char *callname, 
+		      struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
 {
-	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);	
+	NT_STATUS_HAVE_NO_MEMORY(ejs);
+	ejs->eid = eid;
+	ejs->callname = callname;
 	return ejs_pull(ejs, v, ptr);
 }
 
 
-NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
+NTSTATUS ejs_push_rpc(int eid, const char *callname, 
+		      struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
 {
 	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	NT_STATUS_HAVE_NO_MEMORY(ejs);
+	ejs->eid = eid;
+	ejs->callname = callname;
 	return ejs_push(ejs, v, ptr);
 }
 
 
 /*
+  panic in the ejs wrapper code
+ */
+NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why)
+{
+	ejsSetErrorMsg(ejs->eid, "rpc_call '%s' failed - %s", ejs->callname, why);
+	return NT_STATUS_INTERNAL_ERROR;
+}
+
+/*
   find a mpr component, allowing for sub objects, using the '.' convention
 */
 static struct MprVar *mprGetVar(struct MprVar *v, const char *name)
@@ -279,3 +296,27 @@ NTSTATUS ejs_push_array(struct ejs_rpc *ejs,
 	return mprSetVar(v, "length", mprCreateIntegerVar(i));
 }
 			
+
+/*
+  pull a string
+*/
+NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char **s)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*s = mprToString(var);
+	return NT_STATUS_OK;
+}
+
+/*
+  push a string
+*/
+NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char *s)
+{
+	return mprSetVar(v, name, mprCreateStringVar(s, True));
+}