Merge of the new_mathql branch with the main branch:

[helm.git] / helm / gTopLevel / gTopLevel.ml

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index c980f723bf8d45fc264c3ff9918cd416b06edcc2..83d959ca38f77f4ed8b76ca31a24611a50971eba 100644 (file)
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -33,6 +33,18 @@
 (*                                                                            *)
 (******************************************************************************)
 
+
+(* CSC: quick fix: a function from [uri#xpointer(path)] to [uri#path] *)
+let wrong_xpointer_format_from_wrong_xpointer_format' uri =
+ try
+  let index_sharp =  String.index uri '#' in
+  let index_rest = index_sharp + 10 in
+   let baseuri = String.sub uri 0 index_sharp in
+   let rest = String.sub uri index_rest (String.length uri - index_rest - 1) in
+    baseuri ^ "#" ^ rest
+ with Not_found -> uri
+;;
+
 (* GLOBAL CONSTANTS *)
 
 let helmns = Gdome.domString "http://www.cs.unibo.it/helm";;
@@ -47,9 +59,15 @@ let htmlfooter =
  "</html>"
 ;;
 
+(*
 let prooffile = "/home/tassi/miohelm/tmp/currentproof";;
+*)
+let prooffile = "/public/sacerdot/currentproof";;
 (*CSC: the getter should handle the innertypes, not the FS *)
+(*
 let innertypesfile = "/home/tassi/miohelm/tmp/innertypes";;
+*)
+let innertypesfile = "/public/sacerdot/innertypes";;
 
 (* GLOBAL REFERENCES (USED BY CALLBACKS) *)
 
@@ -1108,6 +1126,14 @@ let user_uri_choice uris =
   String.sub uri 4 (String.length uri - 4)
 ;;
 
+(* CSC: IMPERATIVE AND NOT VERY CLEAN, TO GET THE LAST ISSUED QUERY *)
+let get_last_query = 
+ let query = ref "" in
+  MQueryGenerator.set_confirm_query
+   (function q -> query := MQueryUtil.text_of_query q ; true) ;
+  function result -> !query ^ " <h1>Result:</h1> " ^ MQueryUtil.text_of_result result "<br>"
+;;
+
 let locate rendering_window () =
  let inputt = (rendering_window#inputt : GEdit.text) in
  let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
@@ -1118,7 +1144,12 @@ let locate rendering_window () =
        [] -> ()
      | head :: tail ->
         inputt#delete_text 0 inputlen ;
-        let MathQL.MQRefs uris, html = MQueryGenerator.locate head in
+        let result = MQueryGenerator.locate head in
+       let uris =
+         List.map
+          (function uri,_ -> wrong_xpointer_format_from_wrong_xpointer_format' uri)
+          result in
+       let html = (" <h1>Locate Query: </h1><pre>" ^ get_last_query result ^ "</pre>") in
          output_html outputhtml html ;
          let uri' = user_uri_choice uris in
           ignore ((inputt#insert_text uri') ~pos:0)
@@ -1144,9 +1175,16 @@ let backward rendering_window () =
        None -> ()
      | Some metano ->
         let (_, ey ,ty) = List.find (function (m,_,_) -> m=metano) metasenv in
-         let MathQL.MQRefs uris, html =
-          MQueryGenerator.backward metasenv ey ty level
-         in
+         let result = MQueryGenerator.backward metasenv ey ty level in
+         let uris =
+          List.map
+           (function uri,_ -> wrong_xpointer_format_from_wrong_xpointer_format' uri)
+           result in
+         let html =
+         " <h1>Backward Query: </h1>" ^
+         " <h2>Levels: </h2> " ^
+          MQueryGenerator.string_of_levels (MQueryGenerator.levels_of_term metasenv ey ty) "<br>" ^
+          " <pre>" ^ get_last_query result ^ "</pre>" in
           output_html outputhtml html ;
           let uri' = user_uri_choice uris in
            inputt#delete_text 0 inputlen ;
@@ -1549,10 +1587,15 @@ let _ =
  CicCooking.init () ;
  if !usedb then
   begin
-   MQueryGenerator.init () ;
+   Mqint.init "host=mowgli.cs.unibo.it dbname=helm user=helm" ;
    CicTextualParser0.set_locate_object
     (function id ->
-      let MathQL.MQRefs uris, html = MQueryGenerator.locate id in
+      let result = MQueryGenerator.locate id in
+      let uris =
+       List.map
+        (function uri,_ -> wrong_xpointer_format_from_wrong_xpointer_format' uri)
+        result in
+      let html = (" <h1>Locate Query: </h1><pre>" ^ get_last_query result ^ "</pre>") in
        begin
         match !rendering_window with
            None -> assert false
@@ -1606,5 +1649,5 @@ let _ =
   end ;
  ignore (GtkMain.Main.init ()) ;
  initialize_everything () ;
- if !usedb then MQueryGenerator.close ();
+ if !usedb then Mqint.close ();
 ;;