added extra "id" parameter for input_or_locate_uri callback

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index 988eb7e143e9a86ba563095a7dac0f4294976904..0d0b7c4d171afe54dd25b143cbce86194ca8965c 100644 (file)
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -196,9 +196,9 @@ let check_window uris =
 
 exception NoChoice;;
 
-let
- interactive_user_uri_choice ~(selection_mode:[`MULTIPLE|`SINGLE]) ?(ok="Ok")
-  ?(enable_button_for_non_vars=false) ~title ~msg uris
+let interactive_user_uri_choice
+ ~(selection_mode:[ `SINGLE | `MULTIPLE ])
+ ?(ok="Ok") ?(enable_button_for_non_vars=false) ~title ~msg uris
 =
  let only_constant_choices =
    lazy
@@ -1055,7 +1055,7 @@ module DisambiguateCallbacks =
     interactive_user_uri_choice ~selection_mode ?ok
      ?enable_button_for_non_vars ~title ~msg
   let interactive_interpretation_choice = interactive_interpretation_choice
-  let input_or_locate_uri = input_or_locate_uri
+  let input_or_locate_uri ~title ?id = input_or_locate_uri ~title
  end
 ;;
 

diff --git a/helm/gTopLevel/oldDisambiguate.ml b/helm/gTopLevel/oldDisambiguate.ml
index 82d0f36f5ddc519b029ba4b6e46f5ff5b76c2eda..a47830a3ffc60bca7049332ad53a66a8b2ae30cc 100644 (file)
--- a/helm/gTopLevel/oldDisambiguate.ml
+++ b/helm/gTopLevel/oldDisambiguate.ml
@@ -47,7 +47,7 @@ module type Callbacks =
       title:string -> msg:string -> id:string -> string list -> string list
     val interactive_interpretation_choice :
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> UriManager.uri
+    val input_or_locate_uri : title:string -> ?id:string -> UriManager.uri
   end
 ;;
 
@@ -78,7 +78,7 @@ module Make(C:Callbacks) =
          [] ->
           [UriManager.string_of_uri
            (C.input_or_locate_uri
-             ~title:("URI matching \"" ^ id ^ "\" unknown."))]
+             ~title:("URI matching \"" ^ id ^ "\" unknown.") ~id)]
        | [uri] -> [uri]
        | _ ->
          C.interactive_user_uri_choice

diff --git a/helm/gTopLevel/oldDisambiguate.mli b/helm/gTopLevel/oldDisambiguate.mli
index d9cc5840da990a2ee7f127eed90ba597f2d84486..8c8bb293fbc27b017d5f0c881d7e977e403f72b9 100644 (file)
--- a/helm/gTopLevel/oldDisambiguate.mli
+++ b/helm/gTopLevel/oldDisambiguate.mli
@@ -45,7 +45,7 @@ module type Callbacks =
       title:string -> msg:string -> id:string -> string list -> string list
     val interactive_interpretation_choice :
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> UriManager.uri
+    val input_or_locate_uri : title:string -> ?id:string -> UriManager.uri
   end
 
 type domain_and_interpretation =

diff --git a/helm/ocaml/cic_disambiguation/disambiguate.ml b/helm/ocaml/cic_disambiguation/disambiguate.ml
index 139a6417a3c33c6f6f4fb4328794ac4802a5195c..92b081c4841b00833727309e69b9787bbc41ed3e 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguate.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguate.ml
@@ -407,7 +407,7 @@ module Make (C: Callbacks) =
        match uris with
         | [] ->
            [UriManager.string_of_uri (C.input_or_locate_uri
-            ~title:("URI matching \"" ^ id ^ "\" unknown."))]
+            ~title:("URI matching \"" ^ id ^ "\" unknown.") ~id)]
         | [uri] -> [uri]
         | _ ->
             C.interactive_user_uri_choice ~selection_mode:`MULTIPLE

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 9ab85396987da8c754797b5f9fffcfb81da4760f..358f2d49ec99ea62d790bd0b74daa076b0d891ef 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -59,7 +59,7 @@ module type Callbacks =
       title:string -> msg:string -> id:string -> string list -> string list
     val interactive_interpretation_choice :
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> UriManager.uri
+    val input_or_locate_uri : title:string -> ?id:string -> UriManager.uri
   end
 
 let string_of_domain_item = function

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
index 58458d1ffa5d008618755828d766ae2ed454bbb1..2849a858ca88230e9b686b5165988a47ae2abd27 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -40,14 +40,19 @@ and environment = codomain_item Environment.t
 
 module type Callbacks =
   sig
+
     val interactive_user_uri_choice :
       selection_mode:[`SINGLE | `MULTIPLE] ->
       ?ok:string ->
       ?enable_button_for_non_vars:bool ->
       title:string -> msg:string -> id:string -> string list -> string list
+
     val interactive_interpretation_choice :
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> UriManager.uri
+
+    (** @param title gtk window title for user prompting
+     * @param id unbound identifier which originated this callback invocation *)
+    val input_or_locate_uri : title:string -> ?id:string -> UriManager.uri
   end
 
 val string_of_domain_item: domain_item -> string