added support for NuPRL stylesheets

diff --git a/helm/scripts/init.d/etc_default_helm_mowgli b/helm/scripts/init.d/etc_default_helm_mowgli
index daa04d1b8c2f3ea5e747e2062304a1af2994c6e9..08bf08766f39994c2640757865b3712efb19a8cc 100644 (file)
--- a/helm/scripts/init.d/etc_default_helm_mowgli
+++ b/helm/scripts/init.d/etc_default_helm_mowgli
@@ -28,4 +28,6 @@ HTTP_GETTER_CACHE_DIRS="
   # user which will own the daemons and the cache directories
 OWNER="sacerdot:helm"
 
+NUPRL_UWOBO_PANEL_CONF="/projects/helm/NuPRL/uwobo-panel/control.html"
+
 # vim: set ft=sh:

diff --git a/helm/scripts/init.d/helm-tomcat_mowgli b/helm/scripts/init.d/helm-tomcat_mowgli
index 45f3c141e9976eb2ddfd8f7754dc16c817fa8ac2..d56a1b2c9b24e2221f491cc5d3a3b4eb90d7e907 100755 (executable)
--- a/helm/scripts/init.d/helm-tomcat_mowgli
+++ b/helm/scripts/init.d/helm-tomcat_mowgli
@@ -24,19 +24,26 @@ case "$1" in
     echo -n "Loading UWOBO stylesheets (mowgli) ... "
     $UWOBO_INIT_SCRIPT > /dev/null
     echo "done!"
+    echo -n "Loading UWOBO stylesheets (mowgli NuPRL) ... "
+    $UWOBO_INIT_SCRIPT $NUPRL_UWOBO_PANEL_CONF > /dev/null
+    echo "done!"
     ;;
 
   stop)
     $UWOBO_INIT_SCRIPT --unload > /dev/null
+    $UWOBO_INIT_SCRIPT --unload $NUPRL_UWOBO_PANEL_CONF > /dev/null
     ;;
 
   reload)
     $UWOBO_INIT_SCRIPT --reload > /dev/null
+    $UWOBO_INIT_SCRIPT --reload $NUPRL_UWOBO_PANEL_CONF > /dev/null
     ;;
 
   restart)
     $UWOBO_INIT_SCRIPT --unload > /dev/null
+    $UWOBO_INIT_SCRIPT --unload $NUPRL_UWOBO_PANEL_CONF > /dev/null
     $UWOBO_INIT_SCRIPT > /dev/null
+    $UWOBO_INIT_SCRIPT $NUPRL_UWOBO_PANEL_CONF > /dev/null
     ;;
 
   *)

diff --git a/helm/scripts/init.d/loadPredefinedStylesheets.pl b/helm/scripts/init.d/loadPredefinedStylesheets.pl
index bf04ef4fb7d204b5c341214f5c9e6ff3415112f7..a4a31d9238fa77df1bedd91ce4b0fd917ca25caa 100755 (executable)
--- a/helm/scripts/init.d/loadPredefinedStylesheets.pl
+++ b/helm/scripts/init.d/loadPredefinedStylesheets.pl
@@ -5,10 +5,14 @@ use LWP::UserAgent;
 use URI::Escape;
 
 my $usage = <<EOHELP;
-loadPredefinedStylesheets.pl
-loadPredefinedStylesheets.pl { -u | --unload }
-loadPredefinedStylesheets.pl { -r | --reload }
-loadPredefinedStylesheets.pl { -h | --help }
+loadPredefinedStylesheets.pl [ uwobo_panel_conf_file ]
+loadPredefinedStylesheets.pl { -u | --unload } [ uwobo_panel_conf_file ]
+loadPredefinedStylesheets.pl { -r | --reload } [ uwobo_panel_conf_file ]
+loadPredefinedStylesheets.pl { -h | --help   } [ uwobo_panel_conf_file ]
+
+If uwobo_panel_conf_file is provided, it's used as HTML file from which
+parse XSLT stylesheets, otherwise UWOBO_PANEL_CONF environment variable
+is used.
 EOHELP
 
 sub getPredefinedStylesheets ($) {
@@ -47,11 +51,16 @@ sub getPredefinedStylesheets ($) {
 
 my $action = "load";
 my $opt = shift || "";
-die $usage if (($opt eq "-h") or ($opt eq "--helm"));
-$action = "unload" if (($opt eq "-u") or ($opt eq "--unload"));
-$action = "reload" if (($opt eq "-r") or ($opt eq "--reload"));
-
-my $confile = $ENV{"UWOBO_PANEL_CONF"} || die "UWOBO_PANEL_CONF not defined";
+die $usage if (($opt eq "-h") or ($opt eq "--help"));
+if (($opt eq "-u") or ($opt eq "--unload")) {
+  $action = "unload";
+} elsif (($opt eq "-r") or ($opt eq "--reload")) {
+  $action = "reload";
+} else {
+  unshift (@ARGV, $opt);
+}
+my $confile =
+  shift || $ENV{"UWOBO_PANEL_CONF"} || die "UWOBO_PANEL_CONF not defined";
 my $getter_url = $ENV{"HELM_GETTER_URL"} || die "HELM_GETTER_URL not defined";
 my $uwobo_url = $ENV{"HELM_UWOBO_URL"} || die "HELM_UWOBO_URL not defined";
 my %styles = getPredefinedStylesheets($confile);