- use 'query_of_text' to parse textual queries

- use 'helm_mowgli_new_schema' as database

diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index 38b92fd48717ea8ab6852b80668c03e0265f839b..0accf62ab2770dfd2066c5978523ae602248cd3e 100644 (file)
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -57,7 +57,7 @@ let callback req outchan =
     | "/execute" ->
         let query_string = req#param "query" in
         let lexbuf = Lexing.from_string query_string in
-        let query = MQueryTParser.query MQueryTLexer.query_token lexbuf in
+        let query = MQueryUtil.query_of_text lexbuf in
         let result = MQueryGenerator.execute_query query in
         let result_string = MQueryUtil.text_of_result result "\n" in
         Http_daemon.respond
@@ -102,7 +102,7 @@ printf "%s started and listening on port %d\n" daemon_name port;
 printf "current directory is %s\n" (Sys.getcwd ());
 flush stdout;
 Mqint.set_database Mqint.postgres_db;
-Mqint.init "host=mowgli.cs.unibo.it dbname=helm_mowgli user=helm";
+Mqint.init "host=mowgli.cs.unibo.it dbname=helm_mowgli_new_schema user=helm";
 Http_daemon.start' ~port callback;
 Mqint.close ();
 printf "%s is terminating, bye!\n" daemon_name