From f9ff72cbda6b4e59448fd79ef9e12f264d48015f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Jul 2005 00:23:57 +0000 Subject: r8298: - started building a library of js routines in scripting/libjs/ - switched the existing test programs over to using the library - added install of js lib (This used to be commit 2a444dedbe44347268affc6458196f93ca7d372b) --- source4/scripting/libjs/base.js | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 source4/scripting/libjs/base.js (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js new file mode 100644 index 0000000000..504cd82259 --- /dev/null +++ b/source4/scripting/libjs/base.js @@ -0,0 +1,53 @@ +/* + base js library functions + Copyright Andrew Tridgell 2005 + released under the GNU GPL v2 or later +*/ + +if (global["HAVE_BASE_JS"] != undefined) { + return; +} +HAVE_BASE_JS=1 + +/* + helper function to setup a rpc io object, ready for input +*/ +function irpcObj() +{ + var o = new Object(); + o.input = new Object(); + return o; +} + +/* + check that a status result is OK +*/ +function check_status_ok(status) +{ + if (status.is_ok != true) { + printVars(status); + } + assert(status.is_ok == true); +} + +/* + check that two arrays are equal +*/ +function check_array_equal(a1, a2) +{ + assert(a1.length == a2.length); + for (i=0; i Date: Mon, 11 Jul 2005 09:19:50 +0000 Subject: r8318: added a bunch more ejs calls. getgr*() getpw*() strlower() strupper() IfaceList() (This used to be commit 1517ad490dd67302f38ab9dcd8a3b24b73b8d550) --- source4/scripting/libjs/base.js | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index 504cd82259..f5498789c5 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -50,4 +50,3 @@ function check_array_zero(a) assert(a[i] == 0); } } - -- cgit From 2dce83de0c4de67f15e95456d6a63864d2f6ad85 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 12 Jul 2005 02:36:07 +0000 Subject: r8338: - added a substitute_var() js library function for doing hash driven substitution of variables in strings - the js provision script now correctly processes provision.ldif (This used to be commit c2946003e06c4898ba0444cd0b69d3203753be94) --- source4/scripting/libjs/base.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index f5498789c5..c6b05755c4 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -50,3 +50,32 @@ function check_array_zero(a) assert(a[i] == 0); } } + +/* + substitute strings of the form ${NAME} in str, replacing + with substitutions from subobj +*/ +function substitute_var(str, subobj) +{ + var list = split("${", str); + var i; + for (i=1;i Date: Tue, 12 Jul 2005 06:57:25 +0000 Subject: r8355: - added a vsprintf() function - removed the --outputdir option from provision, as its not used any more (as ejs knows the real paths) (This used to be commit abbf9c703c17c2edc2d978dade3619a96c38d0d9) --- source4/scripting/libjs/base.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index c6b05755c4..181b3ca959 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -9,6 +9,14 @@ if (global["HAVE_BASE_JS"] != undefined) { } HAVE_BASE_JS=1 +/* + an essential function! +*/ +function printf() +{ + print(vsprintf(arguments)); +} + /* helper function to setup a rpc io object, ready for input */ -- cgit From 82f1a9474d85f75291d0af0e51d55fa904d42055 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 19 Jul 2005 09:30:53 +0000 Subject: r8590: added server status utility functions for checking on the status of a task via irpc - for stream tasks, returns the number of connections - for non-stream tasks, returns "RUNNING" For both, return "DISABLED" or "NOT RESPONDING" appropriately (This used to be commit 78d6303814382f7835212f5045f12180e396b540) --- source4/scripting/libjs/base.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index 181b3ca959..39b62b133e 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -87,3 +87,14 @@ function substitute_var(str, subobj) } return join("", list); } + +/* + return "s" if a number should be shown as plural +*/ +function plural(n) +{ + if (n == 1) { + return ""; + } + return "s"; +} -- cgit From 620301858a5b747002eebe2b9fcef10712ee8249 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 20 Jul 2005 07:04:07 +0000 Subject: r8638: continue the trend of maknig our C functions true ejs objects by making the string functions into an object. To keep existing code working I have added: string_init(global); into base.js. That brings the functions into the global scope for our existing scripts (This used to be commit a978484738168b82441c4dc4f5f803d349769a4b) --- source4/scripting/libjs/base.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index 39b62b133e..8a07f4e383 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -9,6 +9,9 @@ if (global["HAVE_BASE_JS"] != undefined) { } HAVE_BASE_JS=1 +/* bring the string functions into the global frame */ +string_init(global); + /* an essential function! */ -- cgit From 318ac84440754b467cdfb363a47e3fafce1b0fec Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 Nov 2005 04:07:24 +0000 Subject: r11500: fixed a bug in the variable substition code using the new limit argument to split() (This used to be commit 25131efea8c1a2b0bfa7f999766ebcbab8fa8006) --- source4/scripting/libjs/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index 8a07f4e383..fbceabf993 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -71,7 +71,7 @@ function substitute_var(str, subobj) var list = split("${", str); var i; for (i=1;i Date: Tue, 15 Aug 2006 02:39:38 +0000 Subject: r17548: It is a good idea to commit the fix (from mkhl) before the test that shows the need for... Martin Kuhl writes: The ejs function `substitute_var' returns `undefined' when the first argument ends in a pattern that should be substituted. For that reason, the second assertion fails in the following test-case: ,---- | libinclude("base.js"); | | var obj = new Object(); | obj.FOO = "foo"; | obj.BAR = "bar"; | var str1 = "${FOO}:${BAR}"; | var str2 = "${FOO}:${BAR} "; // note the space after the brace | var sub1 = substitute_var(str1, obj); | var sub2 = substitute_var(str2, obj); | | assert(str1 + " " == str2); | assert(sub1 + " " == sub2); `---- The problem is that the function `split' returns a single-element array in both cases: a) the string to split doesn't contain the split pattern b) the string ends with the split pattern To work around this, the following patch tests this condition and returns `undefined' only if the string to split (`list[i]') really didn't contain a closing brace. (This used to be commit 8a6908200b1e459bc9067a9d1f9635185a7eee16) --- source4/scripting/libjs/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index fbceabf993..df0bfe0ce9 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -72,7 +72,7 @@ function substitute_var(str, subobj) var i; for (i=1;i Date: Fri, 28 Mar 2008 01:08:49 -0500 Subject: Convert some more files to GPLv3. (This used to be commit ebe5e8399422eb7e2ff4deb546338823e2718907) --- source4/scripting/libjs/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index df0bfe0ce9..d861073a07 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -1,7 +1,7 @@ /* base js library functions Copyright Andrew Tridgell 2005 - released under the GNU GPL v2 or later + released under the GNU GPL version 3 or later */ if (global["HAVE_BASE_JS"] != undefined) { -- cgit From 3a76da248d2c3b8cf90ade4a441dd99c4583183f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 May 2008 14:08:17 +0200 Subject: Remove unused libjs functions. (This used to be commit 657a87fecc2e79e3c3f66c551e392cc341bca8cf) --- source4/scripting/libjs/base.js | 53 ----------------------------------------- 1 file changed, 53 deletions(-) (limited to 'source4/scripting/libjs/base.js') diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js index d861073a07..790dfeb3e0 100644 --- a/source4/scripting/libjs/base.js +++ b/source4/scripting/libjs/base.js @@ -20,48 +20,6 @@ function printf() print(vsprintf(arguments)); } -/* - helper function to setup a rpc io object, ready for input -*/ -function irpcObj() -{ - var o = new Object(); - o.input = new Object(); - return o; -} - -/* - check that a status result is OK -*/ -function check_status_ok(status) -{ - if (status.is_ok != true) { - printVars(status); - } - assert(status.is_ok == true); -} - -/* - check that two arrays are equal -*/ -function check_array_equal(a1, a2) -{ - assert(a1.length == a2.length); - for (i=0; i