r21351: Change ldb ejs bindings return codes.

We were returning just true/false and discarding error number and string.

This checking probably breaks swat, will fix it in next round as swat
is what made me look into this as I had no way to get back error messages
to show to the users.

Simo.
(This used to be commit 35886b4ae68be475b0fc8b2689ca04d766661261)

1 files changed, 101 insertions, 101 deletions

diff --git a/testprogs/ejs/ldb.js b/testprogs/ejs/ldb.js
index 06b6ec7f50..774219a1ab 100755
--- a/testprogs/ejs/ldb.js
+++ b/testprogs/ejs/ldb.js
@@ -32,33 +32,33 @@ dn: cn=x,cn=test
 objectClass: foo
 x: 3
 ");
-	assert(ok);
+	assert(ok.error == 0);
 
 	println("Testing ldb.search");
 	var res = ldb.search("(objectClass=*)");
-	assert(res[0].objectClass[0] == "foo");
-	assert(res[0].dn == "cn=x,cn=test");
-	assert(res[0].x == 3);
+	assert(res.msgs[0].objectClass[0] == "foo");
+	assert(res.msgs[0].dn == "cn=x,cn=test");
+	assert(res.msgs[0].x == 3);
 
 	ok = ldb.add("
 dn: cn=x2,cn=test
 objectClass: foo
 x: 4
 ");
-	assert(ok);
+	assert(ok.error == 0);
 	var attrs = new Array("x");
 	res = ldb.search("x=4", NULL, ldb.SCOPE_DEFAULT, attrs);
-	assert(res[0].x == 4);
-	assert(res[0].objectClass == undefined);
-	assert(res[0].dn == "cn=x2,cn=test");
+	assert(res.msgs[0].x == 4);
+	assert(res.msgs[0].objectClass == undefined);
+	assert(res.msgs[0].dn == "cn=x2,cn=test");
 
 	ok = ldb.del("cn=x,cn=test");
-	assert(ok);
+	assert(ok.error == 0);
 
 	ok = ldb.rename("cn=x2,cn=test", "cn=x3,cn=test");
-	assert(ok);
+	assert(ok.error == 0);
 	res = ldb.search("x=4", NULL, ldb.SCOPE_DEFAULT, attrs);
-	assert(res[0].dn == "cn=x3,cn=test");
+	assert(res.msgs[0].dn == "cn=x3,cn=test");
 
 	ok = ldb.modify("
 dn: cn=x3,cn=test
@@ -68,13 +68,13 @@ x: 7
 ");
 
 	res = ldb.search("x=7");
-	assert(res.length == 1);
-	assert(res[0].x.length == 2);
+	assert(res.msgs.length == 1);
+	assert(res.msgs[0].x.length == 2);
 
 	/* Check a few things before we add modules */
-	assert(res[0].objectGUID == undefined);
-	assert(res[0].createTimestamp == undefined);
-	assert(res[0].whenCreated == undefined);
+	assert(res.msgs[0].objectGUID == undefined);
+	assert(res.msgs[0].createTimestamp == undefined);
+	assert(res.msgs[0].whenCreated == undefined);
 
 }
 	
@@ -111,23 +111,23 @@ dn: @ATTRIBUTES
 cn: CASE_INSENSITIVE
 caseattr: CASE_INSENSITIVE
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	/* Confirm that the attributes were replicated */
 	var res_attrs =  parttestldb.search("cn=*", "@ATTRIBUTES",  parttestldb.SCOPE_BASE);
-	assert(res_attrs[0].cn == "CASE_INSENSITIVE");
+	assert(res_attrs.msgs[0].cn == "CASE_INSENSITIVE");
 
 	ok = ldb.add("
 dn: cn=x8,cn=PartTest
 objectClass: foo
 x: 8
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	ok = ldb.add("
@@ -136,9 +136,9 @@ objectClass: foo
 x: 9
 cn: X9
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	ok = ldb.add("
@@ -147,59 +147,59 @@ objectClass: foo
 x: 9
 cn: X9
 ");
-	if (ok) {
+	if (ok.error == 0) {
 		println("Should have failed to add cn=X9,cn=PartTest");
-		assert(!ok);
+		assert(ok.error != 0);
 	}
 
 	var res = ldb.search("x=8", "cn=PartTest", ldb.SCOPE_DEFAULT);
-	assert(res[0].objectGUID != undefined);
-	assert(res[0].uSNCreated != undefined);
-	assert(res[0].uSNChanged != undefined);
-	assert(res[0].createTimestamp == undefined);
-	assert(res[0].whenCreated != undefined);
-	assert(res[0].name == "x8");
-	assert(res[0].cn == "x8");
+	assert(res.msgs[0].objectGUID != undefined);
+	assert(res.msgs[0].uSNCreated != undefined);
+	assert(res.msgs[0].uSNChanged != undefined);
+	assert(res.msgs[0].createTimestamp == undefined);
+	assert(res.msgs[0].whenCreated != undefined);
+	assert(res.msgs[0].name == "x8");
+	assert(res.msgs[0].cn == "x8");
 
 	/* Confirm that this ended up in the correct LDB */
 	var res_otherldb =  parttestldb.search("x=8", "cn=PartTest",  parttestldb.SCOPE_DEFAULT);
-	assert(res_otherldb[0].objectGUID != undefined);
-	assert(res_otherldb[0].createTimestamp == undefined);
-	assert(res_otherldb[0].whenCreated != undefined);
-	assert(res_otherldb[0].name == "x8");
-	assert(res_otherldb[0].cn == "x8");
+	assert(res_otherldb.msgs[0].objectGUID != undefined);
+	assert(res_otherldb.msgs[0].createTimestamp == undefined);
+	assert(res_otherldb.msgs[0].whenCreated != undefined);
+	assert(res_otherldb.msgs[0].name == "x8");
+	assert(res_otherldb.msgs[0].cn == "x8");
 
 	var attrs = new Array("*", "createTimestamp");
 	var res2 = ldb.search("x=9", "cn=PartTest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res2[0].objectGUID != undefined);
-	assert(res2[0].createTimestamp != undefined);
-	assert(res2[0].whenCreated != undefined);
-	assert(res2[0].name == "x9");
-	assert(res2[0].cn == "x9");
+	assert(res2.msgs[0].objectGUID != undefined);
+	assert(res2.msgs[0].createTimestamp != undefined);
+	assert(res2.msgs[0].whenCreated != undefined);
+	assert(res2.msgs[0].name == "x9");
+	assert(res2.msgs[0].cn == "x9");
 
-	assert(res[0].objectGUID != res2[0].objectGUID);
+	assert(res.msgs[0].objectGUID != res2.msgs[0].objectGUID);
 
 	var attrs = new Array("*");
 	var res3 = ldb.search("", "", ldb.SCOPE_BASE, attrs);
-	assert(res3[0].cn == undefined);
-	assert(res3[0].distinguishedName == undefined);
-	assert(res3[0].name == undefined);
-	assert(res3[0].currentTime != undefined);
-	assert(res3[0].highestCommittedUSN != undefined);
-
-	assert(res3[0].namingContexts[0] == "cn=Sub,cn=Sub,cn=PartTest");
-	assert(res3[0].namingContexts[1] == "cn=Sub,cn=PartTest");
-	assert(res3[0].namingContexts[2] == "cn=PartTest");
-	assert(res3[0].namingContexts[3] == "cn=SideTest");
-	var usn = res3[0].highestCommittedUSN;
+	assert(res3.msgs[0].cn == undefined);
+	assert(res3.msgs[0].distinguishedName == undefined);
+	assert(res3.msgs[0].name == undefined);
+	assert(res3.msgs[0].currentTime != undefined);
+	assert(res3.msgs[0].highestCommittedUSN != undefined);
+
+	assert(res3.msgs[0].namingContexts[0] == "cn=Sub,cn=Sub,cn=PartTest");
+	assert(res3.msgs[0].namingContexts[1] == "cn=Sub,cn=PartTest");
+	assert(res3.msgs[0].namingContexts[2] == "cn=PartTest");
+	assert(res3.msgs[0].namingContexts[3] == "cn=SideTest");
+	var usn = res3.msgs[0].highestCommittedUSN;
 
 	/* Start a transaction.  We are going to abort it later, to
 	 * show we clean up all partitions */
 
 	ok = ldb.transaction_start()
 	if (!ok) {
-		println("Failed to start a transaction: " + ldb.errstring());
-		assert(ok);
+		println("Failed to start a transaction: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	
@@ -208,53 +208,53 @@ dn: cn=x10,cn=parttest
 objectClass: foo
 x: 10
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	var attrs = new Array("highestCommittedUSN");
 	var res4 = ldb.search("", "", ldb.SCOPE_BASE, attrs);
-	var usn2 = res4[0].highestCommittedUSN;
-	assert(usn < res4[0].highestCommittedUSN);
+	var usn2 = res4.msgs[0].highestCommittedUSN;
+	assert(usn < res4.msgs[0].highestCommittedUSN);
 
 	ok = ldb.add("
 dn: cn=x11,cn=sub,cn=parttest
 objectClass: foo
 x: 11
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	var attrs = new Array("highestCommittedUSN");
 	var res5 = ldb.search("", "", ldb.SCOPE_BASE, attrs);
-	assert(usn2 < res5[0].highestCommittedUSN);
+	assert(usn2 < res5.msgs[0].highestCommittedUSN);
 	
 	var attrs = new Array("*", "createTimestamp");
 	var res6 = ldb.search("x=11", "cn=parttest", ldb.SCOPE_SUB, attrs);
-	assert(res6.length == 0);
+	assert(res6.msgs.length == 0);
 
 	var attrs = new Array("*", "createTimestamp");
 	var res7 = ldb.search("x=10", "cn=sub,cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res7.length == 0);
+	assert(res7.msgs.length == 0);
 
 	var res8 = ldb.search("x=11", "cn=sub,cn=parttest", ldb.SCOPE_DEFAULT, attrs);
 	
-	assert(res8[0].objectGUID == undefined); /* The objectGUID module is not loaded here */
-	assert(res8[0].uSNCreated == undefined); /* The objectGUID module is not loaded here */
-	assert(res8[0].name == "x11");
-	assert(res8[0].cn == "x11");
+	assert(res8.msgs[0].objectGUID == undefined); /* The objectGUID module is not loaded here */
+	assert(res8.msgs[0].uSNCreated == undefined); /* The objectGUID module is not loaded here */
+	assert(res8.msgs[0].name == "x11");
+	assert(res8.msgs[0].cn == "x11");
 
 	ok = ldb.add("
 dn: caseattr=XY,cn=PartTest
 objectClass: foo
 x: Y
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	ok = ldb.add("
@@ -263,9 +263,9 @@ objectClass: foo
 x: Z
 caseattr: XZ
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	ok = ldb.add("
@@ -274,9 +274,9 @@ objectClass: foo
 x: Z
 caseattr: xz
 ");
-	if (ok) {
+	if (ok.error == 0) {
 		println("Should have failed to add caseattr=xz,cn=PartTest");
-		assert(!ok);
+		assert(ok.error != 0);
 	}
 
 	ok = ldb.add("
@@ -285,9 +285,9 @@ objectClass: foo
 x: Z
 caseattr2: XZ
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	ok = ldb.add("
@@ -296,35 +296,35 @@ objectClass: foo
 x: Z
 caseattr2: Xz
 ");
-	if (!ok) {
-		println("Failed to add: " + ldb.errstring());
-		assert(ok);
+	if (ok.error != 0) {
+		println("Failed to add: " + ok.errstr);
+		assert(ok.error == 0);
 	}
 
 	var resX = ldb.search("caseattr=xz", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(resX.length == 1); 
-	assert(resX[0].objectGUID != undefined);
-	assert(resX[0].createTimestamp != undefined);
-	assert(resX[0].whenCreated != undefined);
-	assert(resX[0].name == "XZ");
+	assert(resX.msgs.length == 1); 
+	assert(resX.msgs[0].objectGUID != undefined);
+	assert(resX.msgs[0].createTimestamp != undefined);
+	assert(resX.msgs[0].whenCreated != undefined);
+	assert(resX.msgs[0].name == "XZ");
 
 	var rescount = ldb.search("(|(caseattr=*)(cn=*))", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(rescount.length == 5); 
+	assert(rescount.msgs.length == 5); 
 
 	/* Check this attribute is *not* case sensitive */
 	var resXcount = ldb.search("caseattr=x*", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(resXcount.length == 2); 
+	assert(resXcount.msgs.length == 2); 
 	
 	/* Check that this attribute *is* case sensitive */
 	var resXcount2 = ldb.search("caseattr2=xz", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(resXcount2.length == 0); 
+	assert(resXcount2.msgs.length == 0); 
 	
 
 	/* Now abort the transaction to show that even with
 	 * partitions, it is aborted everywhere */
 	ok = ldb.transaction_cancel();
 	if (!ok) {
-		println("Failed to cancel a transaction: " + ldb.errstring());
+		println("Failed to cancel a transaction: " + ok.errstr);
 		assert(ok);
 	}
 
@@ -332,19 +332,19 @@ caseattr2: Xz
 
 	var attrs = new Array("highestCommittedUSN");
 	var res9 = ldb.search("", "", ldb.SCOPE_BASE, attrs);
-	assert(usn == res9[0].highestCommittedUSN);
+	assert(usn == res9.msgs[0].highestCommittedUSN);
 	
 	var attrs = new Array("*");
 	var res10 = ldb.search("x=11", "cn=sub,cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res10.length == 0);
+	assert(res10.msgs.length == 0);
 
 	var attrs = new Array("*");
 	var res11 = ldb.search("x=10", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res11.length == 0);
+	assert(res11.msgs.length == 0);
 
 	var attrs = new Array("*");
 	var res12 = ldb.search("caseattr=*", "cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res12.length == 0);
+	assert(res12.msgs.length == 0);
 
 }