From 02a075a57f4e40ff34b7ae1351ab77c32d0d427b Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Tue, 18 Mar 2003 16:02:23 +0000 Subject: [PATCH] * New release of the client-side interface. * Closes the following bug: if an ambiguous query (with more than one ambiguous term) was issued twice and all the aliases were cleaned between the two queries, disambiguation was not asked to the user for each ambiguous term but the first one. --- helm/searchEngine/html/aliaslist.html | 24 ++++++++++++------- helm/searchEngine/html/boole.html | 13 +++++++++- helm/searchEngine/html/editor.html | 10 ++++---- helm/searchEngine/html/expnamedsubst.html | 10 ++++---- helm/searchEngine/html/expr.html | 5 ++-- helm/searchEngine/html/genid.html | 4 ++-- helm/searchEngine/html/loc_obj.html | 15 ++++++++++-- helm/searchEngine/html/set.html | 23 +++++++++++++++++- helm/searchEngine/html/templateambigpdq3.html | 1 + helm/searchEngine/html/val.html | 15 +++++++++++- 10 files changed, 93 insertions(+), 27 deletions(-) diff --git a/helm/searchEngine/html/aliaslist.html b/helm/searchEngine/html/aliaslist.html index 60c38cf72..ac87fa57f 100644 --- a/helm/searchEngine/html/aliaslist.html +++ b/helm/searchEngine/html/aliaslist.html @@ -30,15 +30,23 @@ function invia() function rimuovialias() { //alert(document.aliaslist.elenco.value); - if (document.aliaslist.elenco.value!=""){ - for (num=Number(document.aliaslist.elenco.value);num-1;i--) + { + if (document.aliaslist.elenco.options[i].selected==true) + { + for (num=i;num \ No newline at end of file diff --git a/helm/searchEngine/html/expr.html b/helm/searchEngine/html/expr.html index bc34e72fe..3e302b8b2 100644 --- a/helm/searchEngine/html/expr.html +++ b/helm/searchEngine/html/expr.html @@ -25,8 +25,9 @@ with (document.form1) { stadd=document.form1.id_or_uri.value; //alert(stadd.substring(0,5)); if (stadd.substring(0,5)=="cic:/") - {if (!parent.uricheck(stadd)){stadd="";}} - else if (!parent.idcheck(stadd)){stadd="";} + {if (!top.uricheck(stadd)){stadd="";}} + else if (!top.idcheck(stadd)){stadd="";} + //alert(stadd); } if (stadd!="") {parent.mcq=parent.mcq.replace("[Expr]",stadd); //top.qw.document.write(parent.mcq); diff --git a/helm/searchEngine/html/genid.html b/helm/searchEngine/html/genid.html index 8883ca369..1ca94c4cf 100644 --- a/helm/searchEngine/html/genid.html +++ b/helm/searchEngine/html/genid.html @@ -4,8 +4,8 @@ sel=2;stadd=""; function choice() { - if (sel==0){stadd=document.form1.gen0.value;if (!parent.idcheck(document.form1.gen0.value)){stadd=""}} - if (sel==1){stadd=document.form1.gen1.value;if (!parent.uricheck(document.form1.gen1.value)){stadd=""} + if (sel==0){stadd=document.form1.gen0.value;if (!top.idcheck(document.form1.gen0.value)){stadd=""}} + if (sel==1){stadd=document.form1.gen1.value;if (!top.uricheck(document.form1.gen1.value)){stadd=""} if (stadd.substring(stadd.length-3,stadd.length)=="con"){stadd="";alert("You may not enter a Conuri.")}} if (sel==1 && stadd!="") {stadd=stadd+" [exp_named_subst]";} if (stadd!="") {parent.mcq=parent.mcq.replace("[Genid]",stadd); diff --git a/helm/searchEngine/html/loc_obj.html b/helm/searchEngine/html/loc_obj.html index 1a87db149..3647cddf5 100644 --- a/helm/searchEngine/html/loc_obj.html +++ b/helm/searchEngine/html/loc_obj.html @@ -1,10 +1,20 @@ @@ -12,7 +22,8 @@ function invia() diff --git a/helm/searchEngine/html/set.html b/helm/searchEngine/html/set.html index 3154d937a..292c76861 100644 --- a/helm/searchEngine/html/set.html +++ b/helm/searchEngine/html/set.html @@ -25,7 +25,28 @@ function listvvars() } function help() { - alert ("spiegazione del bottone selezionato"); +with (document.form1) { + if (selopt[0].checked) + alert ("Turns a list of strings which cannot have attributes (the [val]) in a list of strings which can have them, but initially has none (a [set])."); + if (selopt[1].checked) + alert ("Taken a list of posix regular expressions, 'pattern [val]' searches the HELM library for all the URIs which match with at least one of those and returns a [set] representing them."); + if (selopt[2].checked) + alert ("A [svar] represents a list of URIs with attributes."); + if (selopt[3].checked) + alert ("A [rvar] is a single URI with attributes."); + if (selopt[4].checked) + alert ("Parenthesis are employed to force precedence between operators."); + if (selopt[5].checked) + alert ("The [path] you must enter represents a relation; this production returns a [set] composed by the union of all the URIs which match the chosen relation in the [val] you will enter afterwards, without attributes. If you select 'inverse', you'll obtain a list of all the URIs for which the [val] matches the chosen relation, 'sub' and 'super' modify the result depending on the chosen relation and the last input box allows you to add attributes to the result."); + if (selopt[6].checked) + alert ("This production returns a [set] composed by all the URIs in the given [set] which match the condition in the given [boole]."); + if (selopt[7].checked) + alert ("'Union' returns a [set] which is the union of the two given [set]; should an URI be present in each [set] with different attributes, it will be included in the result only once with all the attributes.\n'Intersect' returns a [set] which contains the cartesian product of the URIs listed in each given [set].\n'Diff' returns a [set] which contains the URIs found in the first given [set] but not in the second. Attributes are ignored."); + if (selopt[8].checked) + alert ("Allows you to assign a value to a [svar]"); + if (selopt[9].checked) + alert ("Allows you to assign a value to a [vvar]"); + } } function choice() { diff --git a/helm/searchEngine/html/templateambigpdq3.html b/helm/searchEngine/html/templateambigpdq3.html index e11cdb8c7..6a6a17b96 100644 --- a/helm/searchEngine/html/templateambigpdq3.html +++ b/helm/searchEngine/html/templateambigpdq3.html @@ -6,6 +6,7 @@ for (i=0; i diff --git a/helm/searchEngine/html/val.html b/helm/searchEngine/html/val.html index 0e9aae5fe..bdd2044d0 100644 --- a/helm/searchEngine/html/val.html +++ b/helm/searchEngine/html/val.html @@ -24,7 +24,20 @@ function listvvars2() } function help() { - alert ("spiegazione del bottone selezionato"); + with (document.form1) { + if (selopt[0].checked) + alert ("No help available."); + if (selopt[1].checked) + alert ("Turns a list of strings which can have attributes ( the [set] ) in a list of strings which cannot have them ( a [val] )."); + if (selopt[2].checked) + alert ("Returns the attribute of the given [vvar] in the given [rvar]."); + if (selopt[3].checked) + alert ("No help available."); + if (selopt[4].checked) + alert ("Parenthesis are employed to force precedence between operators."); + if (selopt[5].checked) + alert ("The [path] you must enter represents a relation; this production returns a [val] composed by the union of all the URIs which match the chosen relation in the [val] you will enter afterwards. If you select 'inverse', you'll obtain a list of all the URIs for which the [val] matches the chosen relation, 'sub' and 'super' modify the result depending on the chosen relation."); + } } function choice() { -- 2.39.2