From 9914cf5e183df4930c6b85a5a24d96be08d7716d Mon Sep 17 00:00:00 2001 From: Tomas Abad Date: Wed, 31 May 2023 17:49:58 +0200 Subject: [PATCH 1/7] Cosmetic Extra speces removed. --- scripts/v6/ch10-01-bad-script.rsc | 2 +- scripts/v6/ch10-02-bad-script.rsc | 2 +- scripts/v6/ch10-03-bad-script.rsc | 2 +- scripts/v7/ch10-01-bad-script.rsc | 2 +- scripts/v7/ch10-02-bad-script.rsc | 2 +- scripts/v7/ch10-03-bad-script.rsc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/v6/ch10-01-bad-script.rsc b/scripts/v6/ch10-01-bad-script.rsc index 5863b08..d5a024d 100644 --- a/scripts/v6/ch10-01-bad-script.rsc +++ b/scripts/v6/ch10-01-bad-script.rsc @@ -4,7 +4,7 @@ :foreach s in=$w do={ :local i [:resolve $s]; - :local p [/ping $i count=3 ]; + :local p [/ping $i count=3]; :local u [/tool fetch url=("https://$s") mode=https http-method=get \ as-value keep-result=no]; diff --git a/scripts/v6/ch10-02-bad-script.rsc b/scripts/v6/ch10-02-bad-script.rsc index d914d85..4e4c1cf 100644 --- a/scripts/v6/ch10-02-bad-script.rsc +++ b/scripts/v6/ch10-02-bad-script.rsc @@ -13,7 +13,7 @@ :local i [:resolve $s]; # try pinging the IP address of this site - :local p [/ping $i count=3 ]; + :local p [/ping $i count=3]; # try fetching the web page of this site :local u [/tool fetch url=("https://$s") mode=https http-method=get \ diff --git a/scripts/v6/ch10-03-bad-script.rsc b/scripts/v6/ch10-03-bad-script.rsc index c64f5e5..ca840fc 100644 --- a/scripts/v6/ch10-03-bad-script.rsc +++ b/scripts/v6/ch10-03-bad-script.rsc @@ -13,7 +13,7 @@ :local IpAddress [:resolve $SiteName]; # try pinging the IP address of this site - :local PingResult [/ping $IpAddress count=3 ]; + :local PingResult [/ping $IpAddress count=3]; # try getting the web page of this site :local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \ diff --git a/scripts/v7/ch10-01-bad-script.rsc b/scripts/v7/ch10-01-bad-script.rsc index 5863b08..d5a024d 100644 --- a/scripts/v7/ch10-01-bad-script.rsc +++ b/scripts/v7/ch10-01-bad-script.rsc @@ -4,7 +4,7 @@ :foreach s in=$w do={ :local i [:resolve $s]; - :local p [/ping $i count=3 ]; + :local p [/ping $i count=3]; :local u [/tool fetch url=("https://$s") mode=https http-method=get \ as-value keep-result=no]; diff --git a/scripts/v7/ch10-02-bad-script.rsc b/scripts/v7/ch10-02-bad-script.rsc index d914d85..4e4c1cf 100644 --- a/scripts/v7/ch10-02-bad-script.rsc +++ b/scripts/v7/ch10-02-bad-script.rsc @@ -13,7 +13,7 @@ :local i [:resolve $s]; # try pinging the IP address of this site - :local p [/ping $i count=3 ]; + :local p [/ping $i count=3]; # try fetching the web page of this site :local u [/tool fetch url=("https://$s") mode=https http-method=get \ diff --git a/scripts/v7/ch10-03-bad-script.rsc b/scripts/v7/ch10-03-bad-script.rsc index c64f5e5..ca840fc 100644 --- a/scripts/v7/ch10-03-bad-script.rsc +++ b/scripts/v7/ch10-03-bad-script.rsc @@ -13,7 +13,7 @@ :local IpAddress [:resolve $SiteName]; # try pinging the IP address of this site - :local PingResult [/ping $IpAddress count=3 ]; + :local PingResult [/ping $IpAddress count=3]; # try getting the web page of this site :local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \ From 78cac6a07c6965e3575b7ed1962e1faf797648bf Mon Sep 17 00:00:00 2001 From: Tomas Abad Date: Wed, 31 May 2023 18:14:19 +0200 Subject: [PATCH 2/7] Cosmetic Headers of files unified. --- scripts/v6/ch10-04-bad-script.rsc | 5 ++++- scripts/v6/ch10-05-error_check.rsc | 4 ++-- scripts/v6/ch10-06-error_check.rsc | 4 ++-- scripts/v6/ch10-07-bad-script.rsc | 7 +++++-- scripts/v6/ch10-08-bad-script.rsc | 7 +++++-- scripts/v6/ch10-09-simple-pause.rsc | 4 ++-- scripts/v6/ch10-10-add-remove-vlans.rsc | 4 ++-- scripts/v6/ch10-11-add-remove-vlans.rsc | 4 ++-- scripts/v6/ch10-12-add-remove-vlans.rsc | 4 ++-- scripts/v7/ch10-04-bad-script.rsc | 7 +++++-- scripts/v7/ch10-05-error_check.rsc | 4 ++-- scripts/v7/ch10-06-error_check.rsc | 4 ++-- scripts/v7/ch10-07-bad-script.rsc | 7 +++++-- scripts/v7/ch10-08-bad-script.rsc | 7 +++++-- scripts/v7/ch10-09-simple-pause.rsc | 4 ++-- scripts/v7/ch10-10-add-remove-vlans.rsc | 4 ++-- scripts/v7/ch10-11-add-remove-vlans.rsc | 4 ++-- scripts/v7/ch10-12-add-remove-vlans.rsc | 4 ++-- 18 files changed, 53 insertions(+), 35 deletions(-) diff --git a/scripts/v6/ch10-04-bad-script.rsc b/scripts/v6/ch10-04-bad-script.rsc index 91b6404..eecd90f 100644 --- a/scripts/v6/ch10-04-bad-script.rsc +++ b/scripts/v6/ch10-04-bad-script.rsc @@ -1,7 +1,10 @@ -:global Filename "ch10-04-bad-script.rsc" +# filename: ch10-04-bad-script.rsc +# # A simple script to perform a series of tests on a # list of web sites. +:global Filename "ch10-04-bad-script.rsc" + # function to log error message :global LogMessageFunc do={ :global Filename; diff --git a/scripts/v6/ch10-05-error_check.rsc b/scripts/v6/ch10-05-error_check.rsc index 11c35ea..eb3948e 100644 --- a/scripts/v6/ch10-05-error_check.rsc +++ b/scripts/v6/ch10-05-error_check.rsc @@ -1,7 +1,7 @@ -# ch10-05-error-check.rsc +# filename: ch10-05-error-check.rsc :local WebSites { "badname1234.com"; "google.com"}; :foreach SiteName in=$WebSites do={ :local SiteIpAddress [:resolve $SiteName]; :put "Site IP for $SiteName is $SiteIpAddress"; -} \ No newline at end of file +} diff --git a/scripts/v6/ch10-06-error_check.rsc b/scripts/v6/ch10-06-error_check.rsc index 411d986..32f0d9b 100644 --- a/scripts/v6/ch10-06-error_check.rsc +++ b/scripts/v6/ch10-06-error_check.rsc @@ -1,4 +1,4 @@ -# ch10-06-error-check.rsc +# filename: ch10-06-error-check.rsc :local WebSites { "badname1234.com"; "google.com"}; :foreach SiteName in=$WebSites do={ :do { @@ -7,4 +7,4 @@ } on-error={ :put "Name lookup failed for $SiteName"; } -} \ No newline at end of file +} diff --git a/scripts/v6/ch10-07-bad-script.rsc b/scripts/v6/ch10-07-bad-script.rsc index 8144789..35b7902 100644 --- a/scripts/v6/ch10-07-bad-script.rsc +++ b/scripts/v6/ch10-07-bad-script.rsc @@ -1,6 +1,9 @@ +# filename: ch10-07-bad-script.rsc +# +# A simple script to perform a series of tests on a +# list of web sites. + :global Filename "ch10-07-bad-script.rsc" -# A script to perform a series of tests on a -# list of web sites. # function to log error messages :global LogMessageFunc do={ diff --git a/scripts/v6/ch10-08-bad-script.rsc b/scripts/v6/ch10-08-bad-script.rsc index e978be6..2c33842 100644 --- a/scripts/v6/ch10-08-bad-script.rsc +++ b/scripts/v6/ch10-08-bad-script.rsc @@ -1,7 +1,10 @@ -:global Filename "ch10-08-bad-script.rsc" -# A script to perform a series of tests on a +# filename: ch10-08-bad-script.rsc +# +# A simple script to perform a series of tests on a # list of web sites. +:global Filename "ch10-08-bad-script.rsc" + # set DEBUG to "true" for script debugging output, # "false" for normal operation :global DEBUG false; diff --git a/scripts/v6/ch10-09-simple-pause.rsc b/scripts/v6/ch10-09-simple-pause.rsc index ffb7efd..bb2520d 100644 --- a/scripts/v6/ch10-09-simple-pause.rsc +++ b/scripts/v6/ch10-09-simple-pause.rsc @@ -1,7 +1,7 @@ -# ch10-09-simple-pause.rsc +# filename: ch10-09-simple-pause.rsc # A simple script that includes a 2 second pause :put "Hello we're going to pause now..."; :delay 2; -:put "Pause complete. We're all done now!"; \ No newline at end of file +:put "Pause complete. We're all done now!"; diff --git a/scripts/v6/ch10-10-add-remove-vlans.rsc b/scripts/v6/ch10-10-add-remove-vlans.rsc index c5d877f..67aaa17 100644 --- a/scripts/v6/ch10-10-add-remove-vlans.rsc +++ b/scripts/v6/ch10-10-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-10-add-remove-vlans.rsc +# filename: ch10-10-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/fromon-error={ # a Mikrotik router interface @@ -24,4 +24,4 @@ # add VLAN to LAN interface :local VlanName "VLAN$VlanId"; /interface vlan remove "$VlanName"; -} \ No newline at end of file +} diff --git a/scripts/v6/ch10-11-add-remove-vlans.rsc b/scripts/v6/ch10-11-add-remove-vlans.rsc index 49d912a..8cf2a61 100644 --- a/scripts/v6/ch10-11-add-remove-vlans.rsc +++ b/scripts/v6/ch10-11-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-11-add-remove-vlans.rsc +# filename: ch10-11-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/from # a Mikrotik router interface @@ -20,4 +20,4 @@ # add VLAN to LAN interface :local VlanName "VLAN$VlanId"; /interface vlan remove "$VlanName"; -} \ No newline at end of file +} diff --git a/scripts/v6/ch10-12-add-remove-vlans.rsc b/scripts/v6/ch10-12-add-remove-vlans.rsc index ffa3ce0..2d601f4 100644 --- a/scripts/v6/ch10-12-add-remove-vlans.rsc +++ b/scripts/v6/ch10-12-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-12-add-remove-vlans.rsc +# filename: ch10-12-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/from # a Mikrotik router interface @@ -28,4 +28,4 @@ } }]; -:put "Remove loop time: $RemoveLoopTime"; \ No newline at end of file +:put "Remove loop time: $RemoveLoopTime"; diff --git a/scripts/v7/ch10-04-bad-script.rsc b/scripts/v7/ch10-04-bad-script.rsc index 91b6404..c3e9080 100644 --- a/scripts/v7/ch10-04-bad-script.rsc +++ b/scripts/v7/ch10-04-bad-script.rsc @@ -1,6 +1,9 @@ -:global Filename "ch10-04-bad-script.rsc" +# filename: ch10-04-bad-script.rsc +# # A simple script to perform a series of tests on a -# list of web sites. +# list of web sites. + +:global Filename "ch10-04-bad-script.rsc" # function to log error message :global LogMessageFunc do={ diff --git a/scripts/v7/ch10-05-error_check.rsc b/scripts/v7/ch10-05-error_check.rsc index 11c35ea..eb3948e 100644 --- a/scripts/v7/ch10-05-error_check.rsc +++ b/scripts/v7/ch10-05-error_check.rsc @@ -1,7 +1,7 @@ -# ch10-05-error-check.rsc +# filename: ch10-05-error-check.rsc :local WebSites { "badname1234.com"; "google.com"}; :foreach SiteName in=$WebSites do={ :local SiteIpAddress [:resolve $SiteName]; :put "Site IP for $SiteName is $SiteIpAddress"; -} \ No newline at end of file +} diff --git a/scripts/v7/ch10-06-error_check.rsc b/scripts/v7/ch10-06-error_check.rsc index 411d986..32f0d9b 100644 --- a/scripts/v7/ch10-06-error_check.rsc +++ b/scripts/v7/ch10-06-error_check.rsc @@ -1,4 +1,4 @@ -# ch10-06-error-check.rsc +# filename: ch10-06-error-check.rsc :local WebSites { "badname1234.com"; "google.com"}; :foreach SiteName in=$WebSites do={ :do { @@ -7,4 +7,4 @@ } on-error={ :put "Name lookup failed for $SiteName"; } -} \ No newline at end of file +} diff --git a/scripts/v7/ch10-07-bad-script.rsc b/scripts/v7/ch10-07-bad-script.rsc index 8144789..35b7902 100644 --- a/scripts/v7/ch10-07-bad-script.rsc +++ b/scripts/v7/ch10-07-bad-script.rsc @@ -1,6 +1,9 @@ +# filename: ch10-07-bad-script.rsc +# +# A simple script to perform a series of tests on a +# list of web sites. + :global Filename "ch10-07-bad-script.rsc" -# A script to perform a series of tests on a -# list of web sites. # function to log error messages :global LogMessageFunc do={ diff --git a/scripts/v7/ch10-08-bad-script.rsc b/scripts/v7/ch10-08-bad-script.rsc index e978be6..2c33842 100644 --- a/scripts/v7/ch10-08-bad-script.rsc +++ b/scripts/v7/ch10-08-bad-script.rsc @@ -1,7 +1,10 @@ -:global Filename "ch10-08-bad-script.rsc" -# A script to perform a series of tests on a +# filename: ch10-08-bad-script.rsc +# +# A simple script to perform a series of tests on a # list of web sites. +:global Filename "ch10-08-bad-script.rsc" + # set DEBUG to "true" for script debugging output, # "false" for normal operation :global DEBUG false; diff --git a/scripts/v7/ch10-09-simple-pause.rsc b/scripts/v7/ch10-09-simple-pause.rsc index ffb7efd..bb2520d 100644 --- a/scripts/v7/ch10-09-simple-pause.rsc +++ b/scripts/v7/ch10-09-simple-pause.rsc @@ -1,7 +1,7 @@ -# ch10-09-simple-pause.rsc +# filename: ch10-09-simple-pause.rsc # A simple script that includes a 2 second pause :put "Hello we're going to pause now..."; :delay 2; -:put "Pause complete. We're all done now!"; \ No newline at end of file +:put "Pause complete. We're all done now!"; diff --git a/scripts/v7/ch10-10-add-remove-vlans.rsc b/scripts/v7/ch10-10-add-remove-vlans.rsc index 390cffd..a93e4ff 100644 --- a/scripts/v7/ch10-10-add-remove-vlans.rsc +++ b/scripts/v7/ch10-10-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-10-add-remove-vlans.rsc +# filename: ch10-10-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/from # a Mikrotik router interface @@ -24,4 +24,4 @@ # add VLAN to LAN interface :local VlanName "VLAN$VlanId"; /interface/vlan remove "$VlanName"; -} \ No newline at end of file +} diff --git a/scripts/v7/ch10-11-add-remove-vlans.rsc b/scripts/v7/ch10-11-add-remove-vlans.rsc index 49d912a..8cf2a61 100644 --- a/scripts/v7/ch10-11-add-remove-vlans.rsc +++ b/scripts/v7/ch10-11-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-11-add-remove-vlans.rsc +# filename: ch10-11-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/from # a Mikrotik router interface @@ -20,4 +20,4 @@ # add VLAN to LAN interface :local VlanName "VLAN$VlanId"; /interface vlan remove "$VlanName"; -} \ No newline at end of file +} diff --git a/scripts/v7/ch10-12-add-remove-vlans.rsc b/scripts/v7/ch10-12-add-remove-vlans.rsc index ffa3ce0..2d601f4 100644 --- a/scripts/v7/ch10-12-add-remove-vlans.rsc +++ b/scripts/v7/ch10-12-add-remove-vlans.rsc @@ -1,4 +1,4 @@ -# ch10-12-add-remove-vlans.rsc +# filename: ch10-12-add-remove-vlans.rsc # a script to add and remove 50 VLANs to/from # a Mikrotik router interface @@ -28,4 +28,4 @@ } }]; -:put "Remove loop time: $RemoveLoopTime"; \ No newline at end of file +:put "Remove loop time: $RemoveLoopTime"; From b6b5e2a58ce4a47d98b4ffd9afe761c6410f737f Mon Sep 17 00:00:00 2001 From: Tomas Abad Date: Wed, 31 May 2023 18:26:23 +0200 Subject: [PATCH 3/7] Syntax errors These changes have not been verified, but it seems clear that they are error. --- scripts/v6/ch10-04-bad-script.rsc | 4 ++-- scripts/v6/ch10-07-bad-script.rsc | 6 +++--- scripts/v6/ch10-08-bad-script.rsc | 8 ++++---- scripts/v7/ch10-04-bad-script.rsc | 4 ++-- scripts/v7/ch10-07-bad-script.rsc | 6 +++--- scripts/v7/ch10-08-bad-script.rsc | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/v6/ch10-04-bad-script.rsc b/scripts/v6/ch10-04-bad-script.rsc index eecd90f..a2bf857 100644 --- a/scripts/v6/ch10-04-bad-script.rsc +++ b/scripts/v6/ch10-04-bad-script.rsc @@ -21,7 +21,7 @@ # check arg type str of correct length passed if (([:typeof $WebSiteName]!="str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ a valid string!"); } @@ -50,7 +50,7 @@ # check arg type str of correct length passed if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); } diff --git a/scripts/v6/ch10-07-bad-script.rsc b/scripts/v6/ch10-07-bad-script.rsc index 35b7902..804f021 100644 --- a/scripts/v6/ch10-07-bad-script.rsc +++ b/scripts/v6/ch10-07-bad-script.rsc @@ -21,7 +21,7 @@ # check arg type str of correct length passed :if (([:typeof $WebSiteName] != "str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ a valid string!"); @@ -67,7 +67,7 @@ # check arg type str of correct length passed :if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); :return "*** test failed ***"; @@ -80,7 +80,7 @@ } on-error={ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - :return { "duration"="*** test failed ***" } + :return { "*** test failed ***" } } } diff --git a/scripts/v6/ch10-08-bad-script.rsc b/scripts/v6/ch10-08-bad-script.rsc index 2c33842..850141d 100644 --- a/scripts/v6/ch10-08-bad-script.rsc +++ b/scripts/v6/ch10-08-bad-script.rsc @@ -37,7 +37,7 @@ $DebugFunc "Checking arg data type is correct"; :if (([:typeof $WebSiteName] != "str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ :local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \ not a valid string!"; $LogMessageFunc $ErrorMsg; @@ -88,10 +88,10 @@ # check arg type str of correct length passed if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); - :return { "duration"="*** test failed ***" }; + :return { "*** test failed ***" }; } do { @@ -100,7 +100,7 @@ } on-error { $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - return { "duration"="*** test failed ***" }; + return { "*** test failed ***" }; } } diff --git a/scripts/v7/ch10-04-bad-script.rsc b/scripts/v7/ch10-04-bad-script.rsc index c3e9080..ab39fc7 100644 --- a/scripts/v7/ch10-04-bad-script.rsc +++ b/scripts/v7/ch10-04-bad-script.rsc @@ -21,7 +21,7 @@ # check arg type str of correct length passed if (([:typeof $WebSiteName]!="str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ a valid string!"); } @@ -50,7 +50,7 @@ # check arg type str of correct length passed if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); } diff --git a/scripts/v7/ch10-07-bad-script.rsc b/scripts/v7/ch10-07-bad-script.rsc index 35b7902..804f021 100644 --- a/scripts/v7/ch10-07-bad-script.rsc +++ b/scripts/v7/ch10-07-bad-script.rsc @@ -21,7 +21,7 @@ # check arg type str of correct length passed :if (([:typeof $WebSiteName] != "str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ a valid string!"); @@ -67,7 +67,7 @@ # check arg type str of correct length passed :if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); :return "*** test failed ***"; @@ -80,7 +80,7 @@ } on-error={ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - :return { "duration"="*** test failed ***" } + :return { "*** test failed ***" } } } diff --git a/scripts/v7/ch10-08-bad-script.rsc b/scripts/v7/ch10-08-bad-script.rsc index 2c33842..850141d 100644 --- a/scripts/v7/ch10-08-bad-script.rsc +++ b/scripts/v7/ch10-08-bad-script.rsc @@ -37,7 +37,7 @@ $DebugFunc "Checking arg data type is correct"; :if (([:typeof $WebSiteName] != "str") or \ - ([:len value=$WebSiteName] < 6)) do={ + ([:len $WebSiteName] < 6)) do={ :local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \ not a valid string!"; $LogMessageFunc $ErrorMsg; @@ -88,10 +88,10 @@ # check arg type str of correct length passed if (([:typeof $SiteName] != "str") or \ - ([:len value=$SiteName] < 6)) do={ + ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); - :return { "duration"="*** test failed ***" }; + :return { "*** test failed ***" }; } do { @@ -100,7 +100,7 @@ } on-error { $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - return { "duration"="*** test failed ***" }; + return { "*** test failed ***" }; } } From 7b81c76f3f04ee69cec2a08e7a147c99ff435ee3 Mon Sep 17 00:00:00 2001 From: Wifinigel <84858080+nigelbowden@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:25:21 +0100 Subject: [PATCH 4/7] remove file not incuded in book --- scripts/v7/ch4-02-ip-prefix-slicer.rsc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 scripts/v7/ch4-02-ip-prefix-slicer.rsc diff --git a/scripts/v7/ch4-02-ip-prefix-slicer.rsc b/scripts/v7/ch4-02-ip-prefix-slicer.rsc new file mode 100644 index 0000000..85df49c --- /dev/null +++ b/scripts/v7/ch4-02-ip-prefix-slicer.rsc @@ -0,0 +1,14 @@ +# ch4-02-ip-prefix-slicer.rsc + +# Create a function to slice up an IP prefix +:global IpPrefixSlicerFunc do={ + :local InterfaceIp ([/ip/address get $1]->"address"); + :local SlashPosition [:find $InterfaceIp "/"]; + :local IpAddress [:pick $InterfaceIp 0 $SlashPosition]; + :return [:toip $IpAddress] +} + +# Run the function for ID *1 and verify data type of result +:local IpAddress [$IpPrefixSlicerFunc *1]; +:put ("Result: $IpAddress"); +:put ("Data type: " . [:typeof $IpAddress]); \ No newline at end of file From 2c67ee8038f543ebd27ba0e641247198d11b2fbc Mon Sep 17 00:00:00 2001 From: Wifinigel <84858080+nigelbowden@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:27:25 +0100 Subject: [PATCH 5/7] remove file not included in book --- scripts/v7/ch4-02-ip-prefix-slicer.rsc | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 scripts/v7/ch4-02-ip-prefix-slicer.rsc diff --git a/scripts/v7/ch4-02-ip-prefix-slicer.rsc b/scripts/v7/ch4-02-ip-prefix-slicer.rsc deleted file mode 100644 index 85df49c..0000000 --- a/scripts/v7/ch4-02-ip-prefix-slicer.rsc +++ /dev/null @@ -1,14 +0,0 @@ -# ch4-02-ip-prefix-slicer.rsc - -# Create a function to slice up an IP prefix -:global IpPrefixSlicerFunc do={ - :local InterfaceIp ([/ip/address get $1]->"address"); - :local SlashPosition [:find $InterfaceIp "/"]; - :local IpAddress [:pick $InterfaceIp 0 $SlashPosition]; - :return [:toip $IpAddress] -} - -# Run the function for ID *1 and verify data type of result -:local IpAddress [$IpPrefixSlicerFunc *1]; -:put ("Result: $IpAddress"); -:put ("Data type: " . [:typeof $IpAddress]); \ No newline at end of file From 3b7f9b30bd01564f0f9200231fafe22cbacbc046 Mon Sep 17 00:00:00 2001 From: Wifinigel <84858080+nigelbowden@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:41:25 +0100 Subject: [PATCH 6/7] add missing line-end semi-colon --- scripts/v6/ch10-04-bad-script.rsc | 2 +- scripts/v7/ch10-04-bad-script.rsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/v6/ch10-04-bad-script.rsc b/scripts/v6/ch10-04-bad-script.rsc index a2bf857..e7f0fdc 100644 --- a/scripts/v6/ch10-04-bad-script.rsc +++ b/scripts/v6/ch10-04-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-04-bad-script.rsc" +:global Filename "ch10-04-bad-script.rsc"; # function to log error message :global LogMessageFunc do={ diff --git a/scripts/v7/ch10-04-bad-script.rsc b/scripts/v7/ch10-04-bad-script.rsc index ab39fc7..5e4242f 100644 --- a/scripts/v7/ch10-04-bad-script.rsc +++ b/scripts/v7/ch10-04-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-04-bad-script.rsc" +:global Filename "ch10-04-bad-script.rsc"; # function to log error message :global LogMessageFunc do={ From cf3f613f3dfeff8b990ea1b30b262377fd867cdc Mon Sep 17 00:00:00 2001 From: Wifinigel <84858080+nigelbowden@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:42:03 +0100 Subject: [PATCH 7/7] add mising semi-colon & fix return array --- scripts/v6/ch10-07-bad-script.rsc | 4 ++-- scripts/v6/ch10-08-bad-script.rsc | 6 +++--- scripts/v7/ch10-07-bad-script.rsc | 4 ++-- scripts/v7/ch10-08-bad-script.rsc | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/v6/ch10-07-bad-script.rsc b/scripts/v6/ch10-07-bad-script.rsc index 804f021..19ba9ef 100644 --- a/scripts/v6/ch10-07-bad-script.rsc +++ b/scripts/v6/ch10-07-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-07-bad-script.rsc" +:global Filename "ch10-07-bad-script.rsc"; # function to log error messages :global LogMessageFunc do={ @@ -80,7 +80,7 @@ } on-error={ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - :return { "*** test failed ***" } + :return { "duration"="*** test failed ***" } } } diff --git a/scripts/v6/ch10-08-bad-script.rsc b/scripts/v6/ch10-08-bad-script.rsc index 850141d..30aa87f 100644 --- a/scripts/v6/ch10-08-bad-script.rsc +++ b/scripts/v6/ch10-08-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-08-bad-script.rsc" +:global Filename "ch10-08-bad-script.rsc"; # set DEBUG to "true" for script debugging output, # "false" for normal operation @@ -91,7 +91,7 @@ ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); - :return { "*** test failed ***" }; + :return { "duration"="*** test failed ***" } } do { @@ -100,7 +100,7 @@ } on-error { $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - return { "*** test failed ***" }; + :return { "duration"="*** test failed ***" } } } diff --git a/scripts/v7/ch10-07-bad-script.rsc b/scripts/v7/ch10-07-bad-script.rsc index 804f021..19ba9ef 100644 --- a/scripts/v7/ch10-07-bad-script.rsc +++ b/scripts/v7/ch10-07-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-07-bad-script.rsc" +:global Filename "ch10-07-bad-script.rsc"; # function to log error messages :global LogMessageFunc do={ @@ -80,7 +80,7 @@ } on-error={ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - :return { "*** test failed ***" } + :return { "duration"="*** test failed ***" } } } diff --git a/scripts/v7/ch10-08-bad-script.rsc b/scripts/v7/ch10-08-bad-script.rsc index 850141d..30aa87f 100644 --- a/scripts/v7/ch10-08-bad-script.rsc +++ b/scripts/v7/ch10-08-bad-script.rsc @@ -3,7 +3,7 @@ # A simple script to perform a series of tests on a # list of web sites. -:global Filename "ch10-08-bad-script.rsc" +:global Filename "ch10-08-bad-script.rsc"; # set DEBUG to "true" for script debugging output, # "false" for normal operation @@ -91,7 +91,7 @@ ([:len $SiteName] < 6)) do={ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ valid string!"); - :return { "*** test failed ***" }; + :return { "duration"="*** test failed ***" } } do { @@ -100,7 +100,7 @@ } on-error { $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $SiteName !"); - return { "*** test failed ***" }; + :return { "duration"="*** test failed ***" } } }