ocaml 3.09 transition

[helm.git] / helm / scripts / init.d / loadPredefinedStylesheets.pl

diff --git a/helm/scripts/init.d/loadPredefinedStylesheets.pl b/helm/scripts/init.d/loadPredefinedStylesheets.pl
index bf04ef4fb7d204b5c341214f5c9e6ff3415112f7..700cf68f5d3ff854c4de116dbb07e8adab24aade 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);
@@ -65,18 +74,18 @@ if ($action eq "load") {  # load predefined stylesheets
     $request_url .= "bind=$k,";
     my $tmp = "";
     if ($use_getter) {
-      $tmp .= $getter_url . "getxslt?uri="
+      $tmp .= $getter_url . "/getxslt?uri="
     }
     $tmp .= $ur;
     $request_url .= uri_escape($tmp);
   }
-  $request_url = $uwobo_url . "add?$request_url";
+  $request_url = $uwobo_url . "/add?$request_url";
 
 } elsif ($action eq "unload") { # unload predefined stylesheets
-  $request_url = $uwobo_url . "remove?keys=" . join(',', keys %styles);
+  $request_url = $uwobo_url . "/remove?keys=" . join(',', keys %styles);
 
 } elsif ($action eq "reload") { # reload predefined stylesheets
-  $request_url = $uwobo_url . "reload?keys=" . join(',', keys %styles);
+  $request_url = $uwobo_url . "/reload?keys=" . join(',', keys %styles);
 
 } else {  # unknown action
   die "Unknown action '$action'";