Commit 5f7b366d authored by Idir Lankri's avatar Idir Lankri

Restore the previous architecture of CGI interface

interface.ml produces the executable interface as before.
parent 3224f19a
......@@ -254,8 +254,6 @@ reset_caches.cmx : web.cmx morphology.cmi ../ZEN/gen.cmx ../ZEN/deco.cmx \
params.cmi :
params.cmo : params.cmi
params.cmx : params.cmi
interface_cgi.cmo : interface.cmi
interface_cgi.cmx : interface.cmx
html.cmo : paths.cmo ../ZEN/gen.cmo
html.cmx : paths.cmx ../ZEN/gen.cmx
web.cmo : SCLpaths.cmo paths.cmo html.cmo date.cmo
......
......@@ -47,7 +47,7 @@ load_morphs.ml lexer.mli lexer.ml rank.ml scl_parser.ml \
reader.ml parser.ml constraints.mli constraints.ml multilingual.ml \
paraphrase.mli paraphrase.ml bank_lexer.ml regression.ml \
checkpoints.ml graph_segmenter.ml automaton.ml interface.mli interface.ml \
user_aid.ml reset_caches.ml params.mli params.ml interface_cgi.ml
user_aid.ml reset_caches.ml params.mli params.ml
# WEB package - HTML, HTTP, CGI utilities for Web interface
WEB=html.ml web.ml css.ml cgi.ml morpho_html.ml chapters.ml morpho_scl.ml \
......@@ -203,7 +203,7 @@ chapters.cmx morpho_html.cmx cgi.cmx segmenter.cmx morpho_scl.cmx \
load_morphs.cmx lexer.cmx constraints.cmx rank.cmx bank_lexer.cmx \
scl_parser.cmx checkpoints.cmx reader.cmx -o reader
interface: interface_cgi.cmx
interface: interface.cmx
$(LINK) str.cmxa unix.cmxa list2.cmx gen.cmx paths.cmx version.cmx date.cmx \
control.cmx word.cmx canon.cmx zen_lexer.cmx phonetics.cmx transduction.cmx \
encode.cmx skt_lexer.cmx padapatha.cmx sanskrit.cmx deco.cmx lexmap.cmx \
......@@ -212,7 +212,7 @@ load_transducers.cmx pada.cmx phases.cmx dispatcher.cmx order.cmx \
chapters.cmx morpho_html.cmx bank_lexer.cmx cgi.cmx load_morphs.cmx \
int_sandhi.cmx nouns.cmx share.cmx minimap.cmx mini.cmx nums.cmxa \
graph_segmenter.cmx checkpoints.cmx automaton.cmx params.cmx \
save_corpus_params.cmx interface.cmx interface_cgi.cmx -o interface
save_corpus_params.cmx interface.cmx -o interface
user_aid: user_aid.cmx
$(LINK) str.cmxa list2.cmx gen.cmx paths.cmx version.cmx date.cmx \
......
......@@ -14,6 +14,8 @@
call the standard displaying of all, or of preferred solutions consistent
with the current checkpoints. An undo button allows backtracking. *)
module Interface = struct
open Graph_segmenter; (* [Segment cur_chunk set_cur_offset graph visual] *)
open Phases; (* [Phases] *)
open Phases; (* [phase is_cache generative] *)
......@@ -25,7 +27,7 @@ open Cgi;
module Prel = struct (* Interface's lexer prelude *)
value prelude () = do
{ maybe_http_header ()
{ pl http_header
; page_begin graph_meta_title
; pl (body_begin Chamois_back)
; pl interface_title
......@@ -671,3 +673,8 @@ value safe_engine () =
| _ -> abor Control.fatal_err_mess "Unexpected anomaly - broken session"
]
;
end (* Interface *)
;
Interface.safe_engine () (* Should always produce a compliant xhtml page *)
;
......@@ -12,4 +12,6 @@
represented in a shared graph with their offset with respect to the input
sentence. *)
module Interface : sig
value safe_engine : unit -> unit;
end;
Interface.safe_engine () (* Should always produce a compliant xhtml page *)
;
......@@ -255,7 +255,7 @@ ML/rank.ml ML/scl_parser.ml ML/reader.ml ML/parser.ml ML/constraints.mli \
ML/constraints.ml ML/multilingual.ml ML/paraphrase.mli ML/paraphrase.ml \
ML/bank_lexer.ml ML/regression.ml ML/checkpoints.ml \
ML/graph_segmenter.ml ML/interface.mli ML/interface.ml ML/user_aid.ml \
ML/reset_caches.ml ML/params.mli ML/params.ml ML/interface_cgi.ml
ML/reset_caches.ml ML/params.mli ML/params.ml
# WEB package - HTML, HTTP, CGI ad-hoc utilities for Web interface
WEB=ML/html.ml ML/web.ml ML/css.ml ML/cgi.ml ML/morpho_html.ml ML/chapters.ml \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment