1. param.name=value parameters added to the getpage method

2. index.html modified to use all the param.name parameters

diff --git a/helm/searchEngine/html/index.html b/helm/searchEngine/html/index.html
index 5d6dbf387bb37bcc6e857e4fb7ba6f79fd484e27..7fd3824c185a5e221f81f1f820af02a335b699c8 100644 (file)
--- a/helm/searchEngine/html/index.html
+++ b/helm/searchEngine/html/index.html
@@ -43,13 +43,57 @@ function initialize()
        numeroazioniannullate=0;
        }
 
-// @processorURL@ will be substituted by the searchEngine using
-// the correct value
+// @variable@ will be substituted by the searchEngine with the param.variable
+// argument value
 var processorURL="@processorURL@";
+var getterURL="@getterURL@";
+var thkeys="@thkeys@";
+var proofcheckerURL="@proofcheckerURL@";
+var draw_graphURL="@draw_graphURL@";
+var uri_set_queueURL="@uri_set_queueURL@";
+var UNICODEvsSYMBOL="@UNICODEvsSYMBOL@";
+var keys="@keys@";
+var thkeys="@thkeys@";
+var embedkeys="@embedkeys@";
+var doctype_public="@doctype-public@";
+var encoding="@encoding@";
+var thencoding="@thencoding@";
+var media_type="@media-type@";
+var thmedia_type="@thmedia-type@";
+var interfaceURL="@interfaceURL@";
+var thinterfaceURL="@thinterfaceURL@";
+var CICURI="@CICURI@";
+var naturalLanguage="@naturalLanguage@";
+var annotations="@annotations@";
+var topurl="@topurl@";
 
 function ask_uwobo(url)
        {
-         return (top.topurl+"/ask_uwobo?url="+escape(processorURL + "apply?xmluri=" + escape(url) + "&keys=T1%2CT2%2CL%2CE&param.processorURL="+escape(processorURL)+"&param.getterURL=http%3A//mowgli.cs.unibo.it%3A58081/&param.proofcheckerURL=http%3A//mowgli.cs.unibo.it%3A58084/&param.draw_graphURL=http%3A//mowgli.cs.unibo.it%3A58083/&param.uri_set_queueURL=http%3A//mowgli.cs.unibo.it%3A58082/&param.UNICODEvsSYMBOL=unicode&param.keys=d_c%2CC1%2CHC2%2CL&param.thkeys=T1%2CT2%2CL%2CE&param.embedkeys=d_c%2CTC1%2CHC2%2CL&param.doctype-public=-//W3C//DTD%20XHTML%201.0%20Transitional//EN&param.encoding=iso-8859-1&param.thencoding=iso-8859-1&param.media-type=text/html&param.thmedia-type=text/html&param.interfaceURL=http%3A//helm.cs.unibo.it/helm/html/cic/index.html&param.thinterfaceURL=http%3A//helm.cs.unibo.it/helm/html/theory/index.html&param.CICURI=dummy:query_result&param.naturalLanguage=yes&param.annotations=no&param.topurl=http://helm.cs.unibo.it/helm&prop.method=html"));
+         return (top.topurl+"/ask_uwobo?url="+
+                 escape(processorURL + "apply?" +
+                         "xmluri=" + escape(url) +
+                         "&keys=" + escape(thkeys) +
+                         "&param.processorURL=" + escape(processorURL) +
+                         "&param.getterURL=" + escape(getterURL) +
+                         "&param.proofcheckerURL=" + escape(proofcheckerURL) +
+                         "&param.draw_graphURL=" + escape(draw_graphURL) +
+                         "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
+                         "&param.UNICODEvsSYMBOL=" + escape(UNICODEvsSYMBOL) +
+                         "&param.keys=" + escape(keys) +
+                         "&param.thkeys=" + escape(thkeys) +
+                         "&param.embedkeys=" + escape(embedkeys) +
+                         "&param.doctype-public=" + escape(doctype_public) +
+                         "&param.encoding=" + escape(encoding) +
+                         "&param.thencoding=" + escape(thencoding) +
+                         "&param.media-type=" + escape(media_type) +
+                         "&param.thmedia-type=" + escape(thmedia_type) +
+                         "&param.interfaceURL=" + escape(interfaceURL) +
+                         "&param.thinterfaceURL=" + escape(thinterfaceURL) +
+                         "&param.CICURI=" + escape(CICURI) +
+                         "&param.naturalLanguage=" + escape(naturalLanguage) +
+                         "&param.annotations=" + escape(annotations) +
+                         "&param.topurl=" + escape(topurl) +
+                         "&prop.method=html"));
        }
 function help(w) // quando invocata, visualizza l' help relativo ad un oggetto. Di solito è legata ad un evento onFocus o onMouseOver.  
        {

diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index abf9eaa36d1d0b26fbeebe473b7c6ebb8670c011..77280d77a32aa63f3df6973a95f71fbc017007c8 100644 (file)
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -29,7 +29,7 @@ Http_common.debug := true;;
 (* Http_common.debug := true;; *)
 
   (** accepted HTTP servers for ask_uwobo method forwarding *)
-let valid_servers = [ "mowgli.cs.unibo.it:58080" ] ;;
+let valid_servers = [ "mowgli.cs.unibo.it:58080" ; "localhost:58080" ] ;;
 
 open Printf;;
 
@@ -98,14 +98,12 @@ let fold_file f init fname =
 let iter_file f = fold_file (fun _ line -> f line) ()
 
 let (title_tag_RE, choices_tag_RE, msg_tag_RE, id_to_uris_RE, id_RE,
-    interpretations_RE, interpretations_labels_RE, results_RE, new_aliases_RE,
-    processorURL_RE)
+    interpretations_RE, interpretations_labels_RE, results_RE, new_aliases_RE)
   =
   (Pcre.regexp "@TITLE@", Pcre.regexp "@CHOICES@", Pcre.regexp "@MSG@",
   Pcre.regexp "@ID_TO_URIS@", Pcre.regexp "@ID@",
   Pcre.regexp "@INTERPRETATIONS@", Pcre.regexp "@INTERPRETATIONS_LABELS@",
-  Pcre.regexp "@RESULTS@", Pcre.regexp "@NEW_ALIASES@",
-  Pcre.regexp "@processorURL@")
+  Pcre.regexp "@RESULTS@", Pcre.regexp "@NEW_ALIASES@")
 let server_and_port_url_RE = Pcre.regexp "^http://([^/]+)/.*$"
 
 let port =
@@ -166,7 +164,18 @@ let callback (req: Http_types.request) outchan =
                 (fun line ->
                   output_string outchan
                     ((apply_substs
-                      [processorURL_RE, req#param "processorURL"] line) ^
+                       (List.map
+                         (function (key,value) ->
+                           let key' =
+                            (Pcre.extract ~pat:"param\\.(.*)" key).(1)
+                           in
+                            Pcre.regexp ("@" ^ key' ^ "@"), value
+                         )
+                         (List.filter
+                           (fun (key,_) as p-> Pcre.pmatch ~pat:"^param\\." key)
+                           req#params)
+                       )
+                       line) ^
                     "\n"))
                 fname
             end else