INSTALL update, CONFIGS simplification, SCL install in Web

98b9348b · Gérard Huet · 5e1d6ea2 · 98b9348b · 98b9348b · 98b9348b
Commit 98b9348b authored May 12, 2017 by Gérard Huet
23 changed files
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -9,7 +9,7 @@
 ############################################################################

 This is just a reminder for quick installation.
-The complete installation procedure is described in file SETUP/INSTALL.
+A more complete installation procedure is described in file SETUP/INSTALL.

 0) Install Objective Caml 4.02 distribution 
 (available from http://ocaml.org).
@@ -17,16 +17,19 @@ Then install the Camplp4 processor in its 4.02 distribution
 (available from https://github.com/ocaml/camlp4). 

 1) Install the Heritage_resources package:
-git@gitlab.inria.fr:huet/Heritage_Resources.git
+git clone git@gitlab.inria.fr:huet/Heritage_Resources.git

-2) Create your configuration file.
+2) Create your configuration file my_config.txt

   Look at the SETUP/CONFIGS directory to find examples.
   SETUP/config_help.txt explains all the fields.
 Then make a symbolic link to your configuration file in SETUP dir:

-   ln -s config.you.txt config
-   The "config" link has to be located in the SETUP directory.
+   ln -s my_config.txt config
+   The "config" link has to be located in the SETUP directory,
+   the path of my_config.txt is arbitrary, either outside the Platform area,
+   or possibly inside the CONFIGS directory if you plan to update regularly,
+   and signaling it to the developers in order to include it in the Git distrib

 3) Launch configuration in main dir
   

--- a/ML/.depend
+++ b/ML/.depend
@@ -47,6 +47,8 @@ sanskrit.cmx : transduction.cmx skt_lexer.cmx padapatha.cmx encode.cmx \
    canon.cmx sanskrit.cmi
 skt_lexer.cmo : encode.cmo
 skt_lexer.cmx : encode.cmx
+test_stamp.cmo : version.cmo paths.cmo ../ZEN/gen.cmo control.cmo
+test_stamp.cmx : version.cmx paths.cmx ../ZEN/gen.cmx control.cmx
 paths.cmo :
 paths.cmx :
 index.cmo : web.cmo ../ZEN/trie.cmo ../ZEN/list2.cmo ../ZEN/gen.cmo \

--- a/ML/parser.ml
+++ b/ML/parser.ml
@@ -17,7 +17,7 @@ a specific solution. It basically replays reading until this specific solution *
 open Encode;
 open Canon;
 open Html;
-open Web; (* ps pl abort truncation etc. *)
+open Web; (* ps pl abort truncation etc. [remote_server_host] *)
 open Cgi; (* get *)
 open Checkpoints;
 open Uoh_interface; (* Interface with UoH dependency parser *)
@@ -30,7 +30,7 @@ value prelude () = do
  ; page_begin parser_meta_title 
  ; pl (body_begin Chamois_back)
  ; if scl_toggle then (* external call SCL (experimental) *)
-       pl (javascript (Paths.scl_url ^ javascript_tooltip))
+       pl (javascript (scl_url ^ javascript_tooltip))
    else ()
  ; pl parser_title
  ; open_page_with_margin 15
@@ -54,7 +54,7 @@ module Lex = Lexer.Lexer Prel Lexer_control
 ;
 module Ext = UOH Lex 
 ; 
-value rpc = Paths.remote_server_host 
+value rpc = remote_server_host 
 and remote = ref False (* local invocation of cgi by default *) 
 ;
 open Skt_morph;

--- a/ML/reader.ml
+++ b/ML/reader.ml
@@ -27,7 +27,7 @@
 open Encode; (* [switch_code] *)
 open Canon;
 open Html; 
-open Web; (* ps pl abort etc. *)
+open Web; (* ps pl abort etc. [remote_server_host] *)
 open Cgi; (* [get decode_url] *)
 open Phases; (* [Phases] *)
 open Rank; (* [Prel Lex segment_all iterate] *) 
@@ -42,7 +42,7 @@ module Ext = UOH Lex (* [print_ext print_nn] *)
 (* Nyaaya is a deprecated mode for analysing nyaaya compounds. *)
 type mode = [ Tag | Parse | Analyse | Nyaaya ]
 ;
-value rpc = Paths.remote_server_host  
+value rpc = remote_server_host  
 and remote = ref False (* local invocation of cgi by default *)
 ;
 value call_parser text sol = 

--- a/ML/uoh_interface.ml
+++ b/ML/uoh_interface.ml
@@ -10,7 +10,7 @@
 (* Interface with UoH dependency parser *)

 open Html; 
-open Web; (* ps pl etc. *)
+open Web; (* ps pl etc. [scl_url] *)
 open Morphology; (* inflected lemma morphology *)
 open Phases.Phases; (* phase etc. *)
 open Dispatcher; 
@@ -83,13 +83,13 @@ value print_callback_solution counter solution =
        "?filename=./tmp_in") (* call-back to svg interface UoH *) 
  ; ps pid
  ; ps "&amp;outscript="
-  ; ps Paths.default_output_font
+  ; ps default_output_font
  ; ps "&amp;rel=''"
  ; ps "&amp;sentnum="
  ; ps segmentations
  ; ps "&amp;save=no\""
  ; ps "&amp;translate=no\""
-  ; ps (" onmouseover=\"Tip('<img src=" ^ Paths.scl_url ^ "DEMO/tmp_in")
+  ; ps (" onmouseover=\"Tip('<img src=" ^ scl_url ^ "DEMO/tmp_in")
  ; ps pid
  ; ps "/"
  ; ps segmentations
@@ -113,26 +113,20 @@ value print_callback =
 value print_ext_solutions cho = 
  List.iter (print_ext_output cho) 
 ;
-value scl_dir = Paths.scl_install_dir ^ "SHMT/prog/"
-and offline name = Paths.offline_dir ^ name (* problematic file output *)
-;
-value offline_file = offline "1.txt" (* owner [_www] Apache=httpd *)
-and tmp_in = offline "tmp_in"
-;
 (* External call-back to Amba Kulkarni's parser (from [Reader.print_ext] *)
 value amba_invoke pid = (* Experimental - assumes amrita configuration *)
  "mkdir -p " ^ tmp_in ^ pid ^ "; " ^ 
  scl_dir ^ "Heritage_morph_interface/Heritage2anusaaraka_morph.sh <" ^ 
  offline_file ^ " > " ^ tmp_in ^ pid ^ "/in" ^ pid ^ ".out; " ^
  scl_dir ^ "kAraka/shabdabodha.sh YES " ^ tmp_in ^ pid ^ " in" ^ 
-  pid ^ ".out" ^ " in" ^ pid ^ ".kAraka " ^ Paths.default_output_font ^  
+  pid ^ ".out" ^ " in" ^ pid ^ ".kAraka " ^ default_output_font ^  
  " Full Prose NOECHO ND 2> " ^ offline ("err" ^ pid) ^ ";"
 ;

 (* Prints all segmentations in [offline_file]  
   and prepares invocation of UoH's CSL parser for dependency graph display *)
 value print_ext solutions =
-  let cmd = "mkdir -p " ^ Paths.offline_dir in
+  let cmd = "mkdir -p " ^ offline_dir in
  let _ = Sys.command cmd in (* call it *)
  let cho = open_out offline_file in do
  { print_ext_solutions cho solutions

--- a/ML/user_aid.ml
+++ b/ML/user_aid.ml
@@ -10,7 +10,7 @@
 (* Sanskrit Reader summarizing interface. User aid with unrecognized segs. *)

 open Html;
-open Web; (* ps pl abort etc. *)
+open Web; (* ps pl abort etc. [remote_server_host] *)
 open Cgi;
 open Phases;
 open Checkpoints; (* [phase_encode] *) 
@@ -26,7 +26,7 @@ module Prel = struct (* Interface's lexer prelude *)
 ;
 end (* Prel *)
 ;
-value rpc = Paths.remote_server_host 
+value rpc = remote_server_host 
 and remote = ref False (* local invocation of cgi by default *)
 ;
 value string_point (offset,len_chunk) (k,(phase,rword),select) =

--- a/ML/version.ml
+++ b/ML/version.ml
@@ -8,4 +8,4 @@
 (**************************************************************************)

 (* Generated by make version - see main Makefile *)
-value version="2.99" and version_date="2017-05-11";
+value version="2.99" and version_date="2017-05-12";
--- a/ML/web.ml
+++ b/ML/web.ml
@@ -74,10 +74,7 @@ and var_dir           = top_site_dir "VAR" (* Parser dynamic regression suites *
 (* This file is accessible only from Station clients in [var_dir] *)
 value regression_file_name = "regression" (* regression analysis stuff *)
 ;
-(* This toogle controls accessibility of University of Hyderabad tools *)
-value scl_toggle = (* should be separate parameter in profile *)
-  not (Paths.scl_url="") (* set to True if SCL tools are installed *) 
-;
+
 value data name = data_dir ^ name
 and dico_page name = dico_dir ^ name
 and public_data name = public_data_dir ^ name
@@ -327,16 +324,6 @@ and favicon            = image "favicon.ico"
 and hare_jpg = image "hare.jpg" (* http://www.bvml.org/grfx/chadar.jpg *)
 and geo_gif  = image "geopattern.gif" (* http://www.unc.edu/%7Ecernst/geopattern1.gif *)
 ;   
-value interaction_modes_default mode = 
-  [ (" Summary ","g",mode="g") 
-  ; (" Tagging ","t",mode="t") 
-  ; (" Parsing ","p",mode="p") 
-  ] @ if scl_toggle then (* Needs the SCL tools *)
-  [ (" Analysis ","o",mode="o") ] else []
-;
-value interaction_modes = 
-  interaction_modes_default "g" (* default summary mode *)
-;
 (* was in html *)
 value reader_meta_title = title "Sanskrit Reader Companion"
 and parser_meta_title = title "Sanskrit Reader Assistant"
@@ -640,6 +627,42 @@ value http_header = "Content-Type: text/html\n"
 ;
 value javascript_tooltip ="wz_tooltip.js"
 ;
+(* This could be any absolute server where Platform is installed *)
+(* Maybe should be put back in config? but versioning problem... *)
+value remote_server_host = "http://sanskrit.inria.fr/" 
+;
+(* SCL configuration begin *)
+value scl_url = "" (* Used to be set in Paths - needs SCL configure *)
+and scl_install_dir = ""
+and offline_dir = "" (* eg "/private/tmp/SKT_TEMP/" for vomit *) 
+;
+(* This toogle controls accessibility of University of Hyderabad tools *)
+value scl_toggle = (* should be [exists scl_profile] *)
+  not (scl_url="") (* True if SCL tools are installed *) 
+;
+value default_output_font = "ROMAN" (* could be "DEV" *)
+;
+value scl_dir = scl_install_dir ^ "SHMT/prog/"
+and offline name = offline_dir ^ name (* problematic file output *)
+;
+value offline_file = offline "1.txt" (* owner [_www] Apache=httpd *)
+and tmp_in = offline "tmp_in"
+  ;
+value default_output_font = "ROMAN" (* could be "DEV" *)
+;
+
+(* SCL configuration end *)
+value interaction_modes_default mode = 
+  [ (" Summary ","g",mode="g") 
+  ; (" Tagging ","t",mode="t") 
+  ; (" Parsing ","p",mode="p") 
+  ] @ if scl_toggle then (* Needs the SCL tools *)
+  [ (" Analysis ","o",mode="o") ] else []
+;
+value interaction_modes = 
+  interaction_modes_default "g" (* default summary mode *)
+;
+
 (* NB Interface and Parser have their own prelude. *)
 (* [reader_prelude] is invoked by Parser through Rank and by [Mk_reader_page] *)
 value reader_prelude title = do 
@@ -647,7 +670,7 @@ value reader_prelude title = do
  ; page_begin reader_meta_title 
  ; pl (body_begin Chamois_back)
  ; if scl_toggle then (* external call SCL (experimental) *)
-       pl (javascript (Paths.scl_url ^ javascript_tooltip))
+       pl (javascript (scl_url ^ javascript_tooltip))
    else ()
  ; pl title 
  ; open_page_with_margin 15

--- a/SETUP/CONFIGS/config.UoHServer.txt
+++ b/SETUP/CONFIGS/config.UoHServer.txt
-PLATFORM='Station'
-TRANSLIT='WX'
-LEXICON='SH'
-DISPLAY='deva'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ernet.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/home/anusaaraka/public_html/Heritage/# UoHServer'
-SKTDIRURL='/~anusaaraka/Heritage/# UoHServer'
-CGIBINURL='/~anusaaraka/Heritage/# UoHServer'
-CGIDIR='/home/anusaaraka/public_html/Heritage/# UoHServer'
-CGIEXT='.cgi# UoHServer'
-MOUSEACTION='CLICK'
-SCLURL='http://sanskrit.uohyd.ernet.in/scl/SHMT/'
-SCLINSTALLDIR='/home/anusaaraka/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site UoH'
-ZEN='http://yquem.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/SKT_TEMP/'
-
--- a/SETUP/CONFIGS/config.amba.txt
+++ b/SETUP/CONFIGS/config.amba.txt
-PLATFORM='Station'
-TRANSLIT='WX'
-LEXICON='SH'
-DISPLAY='deva'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/var/www/html/SKT/# amba'
-SKTDIRURL='/SKT/# amba'
-SKTRESOURCES='/home/ambaji/SKT/Heritage_Resources/'
-CGIBINURL='/cgi-bin/SKT/# amba'
-CGIDIR='/usr/lib/cgi-bin/SKT/# amba'
-CGIEXT='# amba'
-MOUSEACTION='CLICK'
-SCLURL='http://localhost/scl/SHMT/'
-SCLINSTALLDIR='/home/ambaji/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site UoH'
-ZEN='http://gallium.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/SKT_TEMP/'
--- a/SETUP/CONFIGS/config.amrita.txt
+++ b/SETUP/CONFIGS/config.amrita.txt
-PLATFORM='Station'
-TRANSLIT='VH'
-LEXICON='SH'
-DISPLAY='roma'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/Library/WebServer/Documents/SKT/'
-SKTDIRURL='/SKT/'
-SKTRESOURCES='/Users/huet/Sanskrit/Heritage_Resources/'
-CGIBINURL='/cgi-bin/SKT/'
-CGIDIR='/Library/WebServer/CGI-Executables/SKT/'
-CGIEXT='.cgi'
-MOUSEACTION='CLICK'
-SCLURL='http://localhost/SCL/SHMT/'
-SCLINSTALLDIR=''
-OUTPUTFONT='ROMAN'
-COUNTER='Mirror site Amrita'
-ZEN='http://gallium.inria.fr/~huet/ZEN/'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/private/tmp/SKT_TEMP/'
--- a/SETUP/CONFIGS/config.arjun.txt
+++ b/SETUP/CONFIGS/config.arjun.txt
-PLATFORM='Station'
-TRANSLIT='WX'
-LEXICON='SH'
-DISPLAY='deva'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/home/arjun/public_html/Heritage/# arjun'
-SKTDIRURL='/~arjun/Heritage/# arjun'
-CGIBINURL='/~arjun/Heritage/# arjun'
-CGIDIR='/home/arjun/public_html/Heritage/# arjun'
-CGIEXT='.cgi# arjun'
-MOUSEACTION='CLICK'
-SCLURL='http://localhost/scl/SHMT/'
-SCLINSTALLDIR='/home/arjun/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site Arjun'
-ZEN='http://yquem.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/SKT_TEMP/'
--- a/SETUP/CONFIGS/config.pawan.txt
+++ b/SETUP/CONFIGS/config.pawan.txt
-PLATFORM='Station'
-TRANSLIT='VH'
-LEXICON='MW'
-DISPLAY='roma'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/Library/WebServer/Documents/SKT/'
-SKTDIRURL='/SKT/'
-CGIBINURL='/cgi-bin/SKT/'
-CGIDIR='/Library/WebServer/CGI-Executables/SKT/'
-CGIEXT=''
-MOUSEACTION='CLICK'
-SCLURL='http://localhost/SCL/SHMT/'
-SCLINSTALLDIR='/Users/pgoyal/Documents/Toolkits/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site Pawan'
-ZEN='http://yquem.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/private/tmp/SKT_TEMP/'
--- a/SETUP/CONFIGS/config.peter.txt
+++ b/SETUP/CONFIGS/config.peter.txt
-PLATFORM='Station'
-TRANSLIT='SL'
-LEXICON='SH'
-DISPLAY='roma'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ernet.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/Library/WebServer/Documents/SKT/'
-SKTDIRURL='/SKT/'
-CGIBINURL='/cgi-bin/SKT/'
-CGIDIR='/Library/WebServer/CGI-Executables/SKT/'
-CGIEXT=‘.cgi’
-MOUSEACTION='OVER'
-SCLURL='http://localhost/SCL/SHMT/'
-SCLINSTALLDIR='/Users/pscharf/Sanskrit/SCL/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site Sanskrit Library'
-ZEN='http://gallium.inria.fr/~huet/ZEN/'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/private/tmp/OFFLINE/'
--- a/SETUP/CONFIGS/config.sanskrit.txt
+++ b/SETUP/CONFIGS/config.sanskrit.txt
-PLATFORM='Server'
-TRANSLIT='VH'
-LEXICON='SH'
-DISPLAY='roma'
-SERVERHOST='sanskrit.inria.fr# sanskrit'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/var/www/sanskrit.rocq.inria.fr/'
-SKTDIRURL='http://sanskrit.inria.fr/# sanskrit'
-SKTRESOURCES='/home/huet/Sanskrit/Heritage_Resources/'
-CGIBINURL='/cgi-bin/SKT/# quincy/sanskrit compatible amrita'
-CGIDIR='/var/www/cgi-bin/SKT/# sanskrit'
-CGIEXT=''
-MOUSEACTION='CLICK'
-SCLURL=''
-SCLINSTALLDIR=''
-OUTPUTFONT='VH'
-COUNTER='<img src="/cgi-bin/Count.cgi?df=sanskrit.dat&amp;ft=4" alt="counter"/><br/>'
-ZEN='http://gallium.inria.fr/~huet/ZEN/'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/SKT_TEMP/'
--- a/SETUP/CONFIGS/config.ubuntu.txt
+++ b/SETUP/CONFIGS/config.ubuntu.txt
-PLATFORM='Station'
-TRANSLIT='VH'
-LEXICON='MW'
-DISPLAY='roma'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ernet.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/var/www/html/sanskrit/'
-SKTDIRURL='/html/sanskrit/'
-CGIBINURL='/cgi-bin/SKT/'
-CGIDIR='/usr/lib/cgi-bin/SKT/'
-CGIEXT=''
-SCLURL=''
-SCLINSTALLDIR=''
-OUTPUTFONT='VH'
-COUNTER='Mirror site Figeac'
-ZEN='http://yquem.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/OFFLINE/'
--- a/SETUP/CONFIGS/config_amba_server_area.txt
+++ b/SETUP/CONFIGS/config_amba_server_area.txt
-PLATFORM='Station'
-TRANSLIT='WX'
-LEXICON='SH'
-DISPLAY='deva'
-SERVERHOST='127.0.0.1'
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
-SERVERPUBLICDIR='/var/www/html/SKT/# amba'
-SKTDIRURL='/SKT/# amba'
-CGIBINURL='/cgi-bin/SKT/# amba'
-CGIDIR='/usr/lib/cgi-bin/SKT/# amba'
-CGIEXT='# amba'
-MOUSEACTION='CLICK'
-SCLURL='http://localhost/scl/SHMT/'
-SCLINSTALLDIR='/home/ambaji/scl/'
-OUTPUTFONT='DEV'
-COUNTER='Mirror site UoH'
-ZEN='http://yquem.inria.fr/~huet/ZEN/index.html'
-RESOURCES='DATA/XML/'
-PORTAL='portal.html'
-TEMPAREA='/tmp/SKT_TEMP/'
--- a/SETUP/INSTALL
+++ b/SETUP/INSTALL
@@ -91,11 +91,7 @@ or 'deva' for devanagarii.
 SERVERHOST should be the domain name (or IP address) of the target HTTP server.
 For instance, use SERVERHOST='127.0.0.1' for localhost service
 (SERVERHOST='localhost' should work too). 
-REMOTESERVERHOST should be the domain name (or IP address) of the target HTTP 
-server as seen from Internet (whereas SERVERHOST may be 127.0.0.1 for localhost).
-EXTERNALSERVERHOST should be the domain name (or IP address) of an external 
-Web service invoked for experiments (ignore)
-EXTERNALINVOCATION is the cgi invocation of the external Web service (ignore)
+
 SERVERPUBLICDIR should be the absolute path on the server file system of the data
 to be used by its cgi-bin executables - it should be allowed as readable from 
 all. The fields of the configuration file relevant to the Apache server
@@ -104,34 +100,38 @@ for Apache's configuration file, called httpd.conf. The directory where
 HTML documents are found is named DocumentRoot. A good practice is
 to declare SERVERPUBLICDIR as a subdirectory of DocumentRoot (created in
 super-user mode). Thus, if DocumentRoot is /var/www/html, as in many Linux
-installations, declare SERVERPUBLICDIR as /var/www/html/SktEngine. 
+installations, declare SERVERPUBLICDIR as /var/www/html/Heritage_Platform. 
+
+# IMPORTANT: in SERVERPUBLICDIR as well as CGIDIR below, you must plan on
+# creating the directories in the Apache area /var/www, in supervisor mode

 SKTDIRURL should be its local url on the server - typically a relative address 
-in the httpd area such as /SktEngine/
+in the httpd area such as /Heritage_Platform/
 or possibly a readable sub-directory of user's xxx public_html directory  
-such as /~xxx/skt/.
+such as /~xxx/Heritage_Platform/.
+
 CGIDIR should be the absolute path on the server file system of its CGI 
 executables, typically on Linux /var/www/cgi-bin/ (or some other directory 
 indicated as possibly containing cgis in Apache's configuration file).
-CGIEXT is the extension of cgi executables, if needed.

-Parameter MOUSEACTION controls the morphology printing of the
+CGIBINURL is the corresponding URL, such as '/cgi-bin/Heritage_Platform/'
+
+CGIEXT is the extension of cgi executables,
+if needed by the Apache configuration.
+
+MOUSEACTION controls the morphology printing of the
 interface segments. It may be 'CLICK' or 'OVER'.

-Parameters SCLURL, SCLINSTALLDIR, OUTPUTFONT and TEMPAREA should be ignored, 
-they concern experimental integration of University 
-of Hyderabad software.
-OUTPUTFONT is the default font used in the printing of dependency graphs by this 
-software: 'ROMAN' for romanized font, 'DEV' for devanagarii.
+CAPTION is the localisation message on the site entry page.

-COUNTER is the localisation message on the site entry page.
-ZEN should be left at the standard url for Zen downloading.
-RESOURCES is the local path to the distribution directory for morphological resources.
-PORTAL should be left to portal.html.
+SKTRESOURCES is the local path to the distribution directory where
+the Heritage_Resources linguistic data have been installed.

-When the config file is ready, store it in directory SETUP/CONFIGS as config.xxx.txt 
-with xxx the name of your site, and in directory SETUP execute the command
+When the config file is ready, store it in directory SETUP/CONFIGS as
+xxx_config.txt with xxx the name of your site, and in directory SETUP
+execute the command
 ln -s CONFIGS/config.xxx.txt config
+
 Then execute in directory Main the command
 ./configure 

@@ -155,19 +155,19 @@ Then it compiles the various Web services of the platform.

 3. Installation

-If Apache is not currently running on your station, you should initialise
+If Apache is not currently running on your station, you should start
 it with "sudo httpd -k start", and consider putting this command
 in the scheduling initialisation file of your operating system (crontable).

-At this point, make sure that the directory $(SERVERPUBLICDIR) exists on the
-server.
+At this point, make sure that the directories SERVERPUBLICDIR and CGIDIR
+exists on the server, or create them in supervisor mode. 

 Then execute:
        sudo make install
 This installs the executables and their data on the server. 

 This concludes the installation of the SKT Platform. 
-Try the web site by browsing http://$(SERVERHOST)/$(SKTDIRURL)
+Try the web site by browsing http://SERVERHOST/SKTDIRURL

 N.B. You may run into security problems preventing you from running the CGI
 services. This may be due to security concerns, with an overly cautious

--- a/SETUP/MMakefile
+++ b/SETUP/MMakefile
@@ -130,7 +130,9 @@ SERVERHOST=#SERVERHOST
 # SERVERHOST=sanskrit.inria.fr# quincy sanskrit [official site]
 # SERVERHOST=pauillac.inria.fr# pauillac 
 # SERVERHOST=213.41.153.152# dhruva gerardh.net1.nerim.net [legacy]
-REMOTESERVERHOST=#REMOTESERVERHOST
+
+# For remote invocation of cgi services (eg Sanskrit Library)
+REMOTESERVERHOST=http://sanskrit.inria.fr/# remote host Inria

 # The SKT public http directory on the server
 SERVERPUBLICDIR=#SERVERPUBLICDIR
@@ -186,7 +188,7 @@ MOUSEACTION=#MOUSEACTION
 # SERVERPAGE=/var/www/html/sanskrit/index.html # quincy [Linux, virtual server]
 # SERVERPAGE=/var/www/html/index.html # dhruva [Linux, direct server]

-# Customisation of SCL platform interface
+# Customisation of SCL platform interface - under rehaul
 SCLURL=#SCLURL
 SCLINSTALLDIR=#SCLINSTALLDIR
 OUTPUTFONT=#OUTPUTFONT
@@ -274,13 +276,12 @@ FAQPAGES=$(FAQPAGE_FR) $(FAQPAGE_EN)
 MANUAL=SITE/manual.html
 ROBOTS=SITE/robots.txt # currently disabled to allow Google access
 GOLD=SITE/gold.html
-# Goldendict data banks - now distributed from sanskrit.inria.fr
-GOLDENDICT=SITE/Heritage_du_sanskrit_san-fra.tar.gz SITE/Declension-heritage_du_sanskrit_san-eng.tar.gz SITE/Grammar-heritage_du_sanskrit_san-eng.tar.gz SITE/mw-heritage_du_sanskrit_san-eng.tar.gz

-# OBS XMLPAGE=SITE/xml.html # at installation time moved to DATA/XML
+# Goldendict data banks are now distributed from sanskrit.inria.fr
+#GOLDENDICT=SITE/Heritage_du_sanskrit_san-fra.tar.gz SITE/Declension-heritage_du_sanskrit_san-eng.tar.gz SITE/Grammar-heritage_du_sanskrit_san-eng.tar.gz SITE/mw-heritage_du_sanskrit_san-eng.tar.gz
+
 WEBSOURCES=SITE/portal.html SITE/faq.html SITE/abrevs.pdf $(GOLD) SITE/goldendict.html $(MANUAL) # $(ROBOTS) 
-#ZENSITESOURCE=SITE/ZEN/index.html 
-ALLWEBSOURCES=$(SITESOURCE) $(WEBSOURCES) # $(XMLPAGE) $(ZENSITESOURCE) 
+ALLWEBSOURCES=$(SITESOURCE) $(WEBSOURCES) 
 # Sources of morphology documents
 XMLDATA=$(DATA)/XML
 DATASOURCE=$(DATA)/titn.tex $(DATA)/titpn.tex $(DATA)/titr.tex $(DATA)/titp.tex \
@@ -409,11 +410,7 @@ echo 'and cgi_conj = "$(CGICONJ)"'; \
 echo 'and cgi_sandhier = "$(CGISANDHI)"'; \
 echo 'and cgi_graph = "$(CGIGRAPH)"'; \
 echo 'and cgi_user_aid = "$(CGIUSER)"'; \
-echo 'and mouse_action = "$(MOUSEACTION)"'; \
-echo 'and scl_url = "$(SCLURL)"'; \
-echo 'and default_output_font = "$(OUTPUTFONT)"'; \
-echo 'and offline_dir = "$(TEMPAREA)"'; \
-echo 'and scl_install_dir = "$(SCLINSTALLDIR)";') > ML/paths.ml
+echo 'and mouse_action = "$(MOUSEACTION)";') > ML/paths.ml
 	$(MAKE) version

 version:
@@ -483,7 +480,7 @@ abrevs:
 releasedata: $(DICO) $(DATA) abrevs 
 	cp $(WEBSOURCES) $(SERVERPUBLICDIR)
 	cp $(SITEPAGES) $(SERVERPUBLICDIR) # site main pages made by configure
-#	cp $(GOLDENDICT) $(SERVERPUBLICDIR) # Goldendict version separated
+#	cp $(GOLDENDICT) $(SERVERPUBLICDIR) # Goldendict version now separated
 	if [ "$(LEXICON)" == "SH" ]; then cp $(SITEPAGE_FR) $(SERVERPUBLICDIR)index.html; else cp $(SITEPAGE_EN) $(SERVERPUBLICDIR)index.html; fi # default language from lexicon parameter
 	cp -R $(DICO) $(SERVERPUBLICDIR) # hypertext Heritage dictionary
 # so that cgis invocations in DICO pages are relocated consistently with config:
@@ -509,7 +506,6 @@ releasebook:
 releasexml: # Sanskrit morphology in xml copied from Resources to Server
 	mkdir -p $(SERVERPUBLICDIR)$(DATA)/XML
 	cp $(XML_MORPHOLOGY) $(SERVERPUBLICDIR)$(DATA)/XML
-#OBS	cp $(XMLPAGE) $(SERVERPUBLICDIR)$(DATA)/XML/index.html

 releasepdf: pdfmorphology # very big - useless
 	cp $(PDF_MORPHOLOGY) $(SERVERPUBLICDIR)$(DATA)
@@ -564,7 +560,7 @@ platform_unload: SktPlatform.$(VERSION).tar.gz
 	gunzip SktPlatform.$(VERSION).tar.gz
 	tar xvf SktPlatform.$(VERSION).tar 

-software_doc: # needs ocamlweb installed
+software_doc: # needs to have ocamlweb installed
 	cd ML && $(MAKE) doc

 ########################

--- a/SETUP/config_help.txt
+++ b/SETUP/config_help.txt
@@ -17,29 +17,20 @@ DISPLAY='roma'
 # URL of host server -- '127.0.0.1' for localhost
 SERVERHOST='127.0.0.1'

-# Remote server
-REMOTESERVERHOST='http://sanskrit.inria.fr/# remote host INRIA'
-
-# External server of UoH software 
-EXTERNALSERVERHOST='http://sanskrit.uohyd.ac.in/#external host UoH'
-
-# Experimental for UoH software - leave blank if not concerned 
-EXTERNALINVOCATION='/cgi-bin/scl/SHMT/test_xml.cgi?encoding=WX;out_encoding=Devanagari;text=#external host UoH'
+# IMPORTANT: in SERVERPUBLICDIR as well as CGIDIR below, you must plan on
+# creating the directories in the Apache area /var/www, in supervisor mode