r19295: ldbbrowse: the search tab is now doing something vaguely reasonable.

(This used to be commit 039069b3fd10e2ea614c385c6b432b235e1c226b)

3 files changed, 74 insertions, 84 deletions

diff --git a/services/request.esp b/services/request.esp
index 982f39fcaa..970ea6b4fb 100644
--- a/services/request.esp
+++ b/services/request.esp
@@ -118,7 +118,7 @@ jsonrpc.Constant.ErrorCode.MethodNotFound        = 4;
  * This error is also used to indicate an illegal parameter value, in server
  * scripts.
  */
-jsonrpc.Constant.ErrorCode.PaameterMismatch      = 5;
+jsonrpc.Constant.ErrorCode.ParameterMismatch     = 5;
 
 /**
  * Error code, value 6: Permission Denied
@@ -337,7 +337,7 @@ var nameFirstLetter =
 if (strspn(jsonInput.method, nameChars) != strlen(jsonInput.method))
 {
     /* There's some illegal character in the service name */
-    error.setError(JsonRpcError.MethodNotFound,
+    error.setError(jsonrpc.Constant.ErrorCode.MethodNotFound,
                    "Illegal character found in method name.");
     error.Send();
     return;
@@ -364,7 +364,7 @@ if (strspn(substr(jsonInput.method, 0, 1), nameFirstLetter) != 1)
 if (strspn(jsonInput.service, "." + nameChars) != strlen(jsonInput.service))
 {
     /* There's some illegal character in the service name */
-    error.setError(JsonRpcError.IllegalService,
+    error.setError(jsonrpc.Constant.ErrorCode.IllegalService,
                    "Illegal character found in service name.");
     error.Send();
     return;
@@ -379,7 +379,7 @@ if (strspn(jsonInput.service, "." + nameChars) != strlen(jsonInput.service))
  */
 if (typeof(strstr(jsonInput.service, "..")) != "pointer")
 {
-    error.setError(JsonRpcError.IllegalService,
+    error.setError(jsonrpc.Constant.ErrorCode.IllegalService,
                    "Illegal use of two consecutive dots in service name");
     error.Send();
     return;
diff --git a/services/resources.esp b/services/resources.esp
index d4a77f7907..d491ed5701 100644
--- a/services/resources.esp
+++ b/services/resources.esp
@@ -28,15 +28,6 @@ function _resourcesCreate()
     /* We'll maintain our own count of the number of open resources */
     o.resourceList.count = 0;
 
-    /*
-     * Resource types
-     */
-    o.Type = new Object();
-    o.Type.ldb          = 1;    /* database handle */
-    o.Type.tid          = 2;    /* tree id */
-    o.Type.fid          = 3;    /* file id */
-    /* etc., etc., etc. */
-
 
     /*
      * Set a new saved resource.
@@ -48,7 +39,7 @@ function _resourcesCreate()
         {
             /* Yup. */
             error.setOrigin(jsonrpc.Constant.ErrorOrigin.Server);
-            error.setError(JsonRpcError_ResourceError,
+            error.setError(jsonrpc.Constant.ErrorCode.ResourceError,
                            "Session limit on resources (" +
                            RESOURCE_LIMIT +
                            ") exceeded.");
@@ -81,7 +72,7 @@ function _resourcesCreate()
     /*
      * Get a previously-saved resource
      */
-    function _get(resourceId, type, error)
+    function _get(resourceId, error)
     {
         /* Does the specified resource id exist? */
         if (! this.resourceList[resourceId])
@@ -96,22 +87,40 @@ function _resourcesCreate()
         /* Retrieve the resource */
         var r = this.resourceList[resourceId];
 
-        /* Is the specified resource the correct type? */
-        if (r.type != type)
-        {
-            /* Nope. */
-            error.setOrigin(jsonrpc.Constant.ErrorOrigin.Server);
-            error.setError(jsonrpc.Constant.ErrorCode.ResourceError,
-                           "Incorrect type for specified resource id.");
-            return error;
-        }
-
         /* Give 'em what they came for! */
         return r.resource;
     }
     o.get = _get;
 
     /*
+     * Find a previously-saved resource
+     */
+    function _find(type, error)
+    {
+        /* Does the specified resource id exist? */
+        for (var resourceId in this.resourceList)
+        {
+            /* Retrieve the resource */
+            var r = this.resourceList[resourceId];
+
+            /* Ignore "id" and "count" integer fields */
+            if (typeof(r) == "object")
+            {
+                /* Is the specified resource the correct type? */
+                if (r.type == type)
+                {
+                    /* Yup, this is the one they want. */
+                    return resourceId;
+                }
+            }
+        }
+
+        /* It wasn't found. */
+        return undefined;
+    }
+    o.find = _find;
+
+    /*
      * Release a previously-saved resource, allowing it to be freed
      */
     function _release(resourceId, error)
diff --git a/services/samba/ldb.esp b/services/samba/ldb.esp
index 2eff5ba57d..d886d1a566 100644
--- a/services/samba/ldb.esp
+++ b/services/samba/ldb.esp
@@ -39,18 +39,25 @@ function _connect(params, error)
 {
     if (params.length < 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <db_name> [<option> ...]");
         return error;
     }
 
+    /* First, see if this database was already opened */
+    var resourceId = session.resources.find("ldb:" + params[0], error);
+    if (resourceId != undefined)
+    {
+        /* It was.  Give 'em the resource id */
+        return resourceId;
+    }
+
+    /* Database was not previously opened.  Connect to it. */
     ldb = ldb_init();
     var ret = ldb.connect(params[0]);
     if (ret && ldb.db)
     {
-        return session.resources.set(ldb,
-                                     session.resources.Type.ldb,
-                                     error);
+        return session.resources.set(ldb, "ldb:" + params[0], error);
     }
     else
     {
@@ -78,14 +85,12 @@ function _close(params, error)
 {
     if (params.length != 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -121,14 +126,12 @@ function _transaction_start(params, error)
 {
     if (params.length != 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -156,14 +159,12 @@ function _transaction_cancel(params, error)
 {
     if (params.length != 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -191,14 +192,12 @@ function _transaction_commit(params, error)
 {
     if (params.length != 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -243,15 +242,13 @@ function _search(params, error)
 {
     if (params.length < 2 || params.length > 5)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: " +
                        "<resource_id> <expr> [<baseDN> [<scope> [<attrs>]]]");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -287,12 +284,12 @@ function _search(params, error)
     }
     else
     {
-        error.setError(JsonRpcError_ParameterMismatch,
-                       "invalid scope");
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
+                       "invalid scope: " + scope);
         return error;
     }
 
-    return ldb.transaction_search(expr, baseDN, scope, attrs);
+    return ldb.search(expr, baseDN, scope, attrs);
 }
 jsonrpc.method.search = _search;
 
@@ -317,14 +314,12 @@ function _add(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <ldif>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -355,14 +350,12 @@ function _modify(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <ldif>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -393,14 +386,12 @@ function _del(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <dn>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -434,14 +425,12 @@ function _rename(params, error)
 {
     if (params.length != 3)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <old_dn> <new_dn>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -472,14 +461,12 @@ function _base64encode(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <string_to_be_encoded>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -510,14 +497,12 @@ function _base64decode(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <string_to_be_decoded>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -548,14 +533,12 @@ function _base64decode(params, error)
 {
     if (params.length != 2)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id> <string_to_be_decoded>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;
@@ -582,14 +565,12 @@ function _errstring(params, error)
 {
     if (params.length != 1)
     {
-        error.setError(JsonRpcError_ParameterMismatch,
+        error.setError(jsonrpc.Constant.ErrorCode.ParameterMismatch,
                        "usage: <resource_id>");
         return error;
     }
 
-    ldb = session.resources.get(params[0],
-                                session.resources.Type.ldb,
-                                error);
+    ldb = session.resources.get(params[0], error);
     if (ldb["__type"] == "_JsonRpcError")
     {
         return ldb;