- Uwobo ported to Helm_registry

- Environment variables used only by loadPredefinedStylesheets.pl moved from
  template.* to etc_default_helm_mowgli

diff --git a/helm/scripts/init.d/etc_default_helm_mowgli b/helm/scripts/init.d/etc_default_helm_mowgli
index d4b099e5b286c84ae7447a3ddeb6d8e0d90ed395..5e5c4dacd473d4182a69da5e7f28a6f71801c0df 100644 (file)
--- a/helm/scripts/init.d/etc_default_helm_mowgli
+++ b/helm/scripts/init.d/etc_default_helm_mowgli
@@ -29,6 +29,9 @@ HTTP_GETTER_CACHE_DIRS="
   # user which will own the daemons and the cache directories
 OWNER="sacerdot:helm"
 
+export HELM_GETTER_URL=http://mowgli.cs.unibo.it:58081
+export HELM_UWOBO_URL=http://mowgli.cs.unibo.it:58080
+export UWOBO_PANEL_CONF=/projects/helm/public_html/uwobo/panel/control.html
 NUPRL_UWOBO_PANEL_CONF="/projects/helm/nuprl/NuPRL/uwobo-panel/control.html"
 
 export MATHQL_DB_MAP=/projects/helm/shared/scripts/init.d/mathql_db_map.txt

diff --git a/helm/scripts/init.d/loadPredefinedStylesheets.pl b/helm/scripts/init.d/loadPredefinedStylesheets.pl
index a4a31d9238fa77df1bedd91ce4b0fd917ca25caa..700cf68f5d3ff854c4de116dbb07e8adab24aade 100755 (executable)
--- a/helm/scripts/init.d/loadPredefinedStylesheets.pl
+++ b/helm/scripts/init.d/loadPredefinedStylesheets.pl
@@ -74,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'";

diff --git a/helm/scripts/template.cshrc b/helm/scripts/template.cshrc
index d2a2c871f96801729e2e5d8a43f92d72ac0f5441..bed73a0143ca7222666a7ac370f37188ac7d75cb 100644 (file)
--- a/helm/scripts/template.cshrc
+++ b/helm/scripts/template.cshrc
@@ -26,25 +26,13 @@ setenv PATH $HELMROOT/shared/scripts:$PATH
 setenv HELM_CONFIGURATION_DIR $HELMROOT/$COQV/$WHERE/local/etc/helm
 setenv HELM_STYLE_DIR $HELMROOT/$COQV/style
 setenv HELM_LIB_DIR $HELMROOT/$COQV/$WHERE/local/lib/helm
-setenv HTTP_GETTER_RDF_DIR $HELMROOT/shared/$COQV/rdf_library
-setenv HTTP_GETTER_RDF_DBM $HELMROOT/shared/$COQV/rdf_urls_of_uris.db
-setenv HTTP_GETTER_XSLT_DBM $HELMROOT/shared/$COQV/xslt_urls_of_uris.db
-setenv HTTP_GETTER_RDF_INDEXNAME rdf_index.txt
-setenv HTTP_GETTER_XSLT_INDEXNAME xslt_index.txt
 setenv HELM_ANNOTATIONS_DIR pippo
 setenv HELM_ANNOTATIONS_URL pippo
-setenv UWOBO_PANEL_CONF /projects/helm/public_html/uwobo/panel/control.html
-setenv UWOBO_PORT 58080
-setenv UWOBO_LOG_FILE /var/log/mowgli/uwobo
-setenv HTTP_GETTER_PORT 58081
 setenv URI_SET_QUEUE_PORT 58082
 setenv DRAW_GRAPH_PORT 58083
 setenv PROOF_CHECKER_PORT 58084
 setenv SEARCH_ENGINE_PORT 58085
 setenv DRAW_GRAPH_DIR /projects/helm/daemons/graphs/tools
-setenv HELM_UWOBO_URL http://mowgli.cs.unibo.it:$UWOBO_PORT/
-setenv HTTP_GETTER_DTD_BASE_URL http://mowgli.cs.unibo.it/dtd
-setenv HELM_GETTER_URL http://mowgli.cs.unibo.it:$HTTP_GETTER_PORT/
 setenv SEARCH_ENGINE_HTML_DIR /projects/helm/daemon/searchEngine/html
 
 echo HELM_CONFIGURATION_DIR=$HELM_CONFIGURATION_DIR

diff --git a/helm/scripts/template.rc b/helm/scripts/template.rc
index 19a9817e2ba7151c1bfa3aeea5fe674c0d8f515a..6a0e47421c46559e501a111a2288916a351d9f6c 100644 (file)
--- a/helm/scripts/template.rc
+++ b/helm/scripts/template.rc
@@ -26,25 +26,13 @@ export PATH=$HELMROOT/shared/scripts:$PATH
 export HELM_CONFIGURATION_DIR=$HELMROOT/$COQV/$WHERE/local/etc/helm
 export HELM_STYLE_DIR=$HELMROOT/$COQV/style
 export HELM_LIB_DIR=$HELMROOT/$COQV/$WHERE/local/lib/helm
-export HTTP_GETTER_RDF_DIR=$HELMROOT/shared/$COQV/rdf_library
-export HTTP_GETTER_RDF_DBM=$HELMROOT/shared/$COQV/rdf_urls_of_uris.db
-export HTTP_GETTER_XSLT_DBM=$HELMROOT/shared/$COQV/xslt_urls_of_uris.db
-export HTTP_GETTER_RDF_INDEXNAME=rdf_index.txt
-export HTTP_GETTER_XSLT_INDEXNAME=xslt_index.txt
 export HELM_ANNOTATIONS_DIR=pippo
 export HELM_ANNOTATIONS_URL=pippo
-export UWOBO_PANEL_CONF=/projects/helm/public_html/uwobo/panel/control.html
-export UWOBO_PORT=58080
-export UWOBO_LOG_FILE=/var/log/mowgli/uwobo
-export HTTP_GETTER_PORT=58081
 export URI_SET_QUEUE_PORT=58082
 export DRAW_GRAPH_PORT=58083
 export PROOF_CHECKER_PORT=58084
 export SEARCH_ENGINE_PORT=58085
 export DRAW_GRAPH_DIR=/projects/helm/daemons/graphs/tools
-export HELM_UWOBO_URL=http://mowgli.cs.unibo.it:$UWOBO_PORT/
-export HTTP_GETTER_DTD_BASE_URL=http://mowgli.cs.unibo.it/dtd
-export HELM_GETTER_URL=http://mowgli.cs.unibo.it:$HTTP_GETTER_PORT/
 export SEARCH_ENGINE_HTML_DIR=/projects/helm/daemons/searchEngine/html
 
 echo HELM_CONFIGURATION_DIR=$HELM_CONFIGURATION_DIR