Index: openacs-4/packages/boomerang/tcl/boomerang-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/boomerang-init.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/boomerang/tcl/boomerang-init.tcl 3 Apr 2018 21:30:47 -0000 1.2
+++ openacs-4/packages/boomerang/tcl/boomerang-init.tcl 9 Feb 2020 15:26:10 -0000 1.2.2.1
@@ -1,5 +1,3 @@
-
-
#
# We should get the URL from the parameter and register this for every
# toplevel subsite, on which boomerang is enabled
@@ -9,26 +7,32 @@
set node_info [site_node::get_from_url -url $url]
set subsite_id [dict get $node_info object_id]
set enabled_p [parameter::get \
- -package_id $subsite_id \
- -parameter BoomerangEnabled \
- -default 0]
+ -package_id $subsite_id \
+ -parameter BoomerangEnabled \
+ -default 0]
if {$enabled_p} {
- set beaconURL [parameter::get \
- -package_id $subsite_id \
- -parameter BoomerangBeaconUrl \
- -default /boomerang_handler]
- #
- # Register the beaconURL only, when it is not a fully qualified URL
- #
- if {[regexp {^https?://} $beaconURL] == 0} {
- foreach httpMethod {GET POST} {
- ns_register_proc $httpMethod ${url}[string trimleft $beaconURL /] {
- set t0 [clock clicks -microseconds]
- boomerang::handler record -ns_set [ns_getform] -peeraddr [ad_conn peeraddr]
- ns_log notice "boomerang beacon [expr {[clock clicks -microseconds] - $t0}] microseconds"
- ns_return 204 text/plain ""
- }
- }
- }
+ set beaconURL [parameter::get \
+ -package_id $subsite_id \
+ -parameter BoomerangBeaconUrl \
+ -default /boomerang_handler]
+ #
+ # Register the beaconURL only, when it is not a fully qualified URL
+ #
+ if {[regexp {^https?://} $beaconURL] == 0} {
+ foreach httpMethod {GET POST} {
+ ns_register_proc $httpMethod ${url}[string trimleft $beaconURL /] {
+ set t0 [clock clicks -microseconds]
+ boomerang::handler record -ns_set [ns_getform] -peeraddr [ad_conn peeraddr]
+ ns_log notice "boomerang beacon [expr {[clock clicks -microseconds] - $t0}] microseconds"
+ ns_return 204 text/plain ""
+ }
+ }
+ }
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/boomerang/tcl/callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/callback-procs.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/boomerang/tcl/callback-procs.tcl 3 Jan 2018 19:20:58 -0000 1.1
+++ openacs-4/packages/boomerang/tcl/callback-procs.tcl 9 Feb 2020 15:26:10 -0000 1.1.2.1
@@ -13,50 +13,50 @@
# Provide hooks for installing/uninstalling the package
#
ad_proc -private after-install {} {
- #
- # Add additional parameters to acs-subsite
- #
- foreach {name description default datatype} {
- "Enabled"
- "Enable/Disable Boomerang for this Subsite"
- "0" "number"
+ #
+ # Add additional parameters to acs-subsite
+ #
+ foreach {name description default datatype} {
+ "Enabled"
+ "Enable/Disable Boomerang for this Subsite"
+ "0" "number"
- "BeaconUrl"
- "URL for the Beacon. Either a relative URL for the subsite, or and absolute URL pointing to a different Server"
- "/boomerang_handler" "string"
+ "BeaconUrl"
+ "URL for the Beacon. Either a relative URL for the subsite, or and absolute URL pointing to a different Server"
+ "/boomerang_handler" "string"
- "Sample"
- "Integer greater or equal 1, indicating how many requests should be sampled (e.g. 10 means: sample every 10th request)"
- "1" "number"
+ "Sample"
+ "Integer greater or equal 1, indicating how many requests should be sampled (e.g. 10 means: sample every 10th request)"
+ "1" "number"
- } {
- apm_parameter_register "Boomerang$name" \
- $description "acs-subsite" $default $datatype "Boomerang"
- }
+ } {
+ apm_parameter_register "Boomerang$name" \
+ $description "acs-subsite" $default $datatype "Boomerang"
+ }
}
ad_proc -private before-uninstall {} {
- #
- # Remove the package specific parameters from acs-subsite
- #
- foreach parameter {
- Enabled
- BeaconUrl
- Sample
- } {
- ns_log notice [list apm_parameter_unregister \
- -parameter "Boomerang$parameter" \
- -package_key "acs-subsite" \
- "" ]
- ::try {
- apm_parameter_unregister \
- -parameter "Boomerang$parameter" \
- -package_key "acs-subsite" \
- ""
- } on error {errMsg} {
- ns_log notice "apm_parameter_unregister of parameter Boomerang$parameter lead to: $errMsg"
- }
- }
+ #
+ # Remove the package specific parameters from acs-subsite
+ #
+ foreach parameter {
+ Enabled
+ BeaconUrl
+ Sample
+ } {
+ ns_log notice [list apm_parameter_unregister \
+ -parameter "Boomerang$parameter" \
+ -package_key "acs-subsite" \
+ "" ]
+ ::try {
+ apm_parameter_unregister \
+ -parameter "Boomerang$parameter" \
+ -package_key "acs-subsite" \
+ ""
+ } on error {errMsg} {
+ ns_log notice "apm_parameter_unregister of parameter Boomerang$parameter lead to: $errMsg"
+ }
+ }
}
@@ -68,9 +68,15 @@
#
ad_proc -public -callback subsite::page_plugin -impl boomerang {
} {
- Implementation of subsite::page_plugin for boomerang
+ Implementation of subsite::page_plugin for boomerang
} {
- ::boomerang::initialize_widget
+ ::boomerang::initialize_widget
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl 10 Jan 2018 11:17:49 -0000 1.1
+++ openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl 9 Feb 2020 15:26:10 -0000 1.1.2.1
@@ -18,3 +18,9 @@
}
ad_returnredirect .
ad_script_abort
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/boomerang/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/index.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/boomerang/www/sitewide-admin/index.tcl 10 Jan 2018 11:22:38 -0000 1.2
+++ openacs-4/packages/boomerang/www/sitewide-admin/index.tcl 9 Feb 2020 15:26:10 -0000 1.2.2.1
@@ -20,9 +20,15 @@
if {$writable} {
ns_log notice "check for <$plainFile.gz>"
if {[file exists $plainFile.gz]} {
- set compressedFile $plainFile.gz
+ set compressedFile $plainFile.gz
}
} else {
set path $resource_prefix
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End: