Modified Files:

1) grammar.txt xmathql.dtd: moved sortby in grammar comments

diff --git a/helm/mathql/grammar.txt b/helm/mathql/grammar.txt
index 4f2ff8c76af8543080b0ed5b08b9cceb7006f249..25e4b8e1eb3cb62c3730f2592c675ec6e0448e91 100644 (file)
--- a/helm/mathql/grammar.txt
+++ b/helm/mathql/grammar.txt
@@ -7,8 +7,6 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
        |  <list> UNION <list>                  (* unione *)
        |  <list> INTERSECT <list>              (* intersezione *)
        |  <list> DIFF <list>                   (* differenza *)
-       |  <list> SORTEDBY <order> <function>   (* unione lista ordinata secondo
-                                                  ordine e valore funzione *)
        |  SELECT <rvar> IN <list> WHERE <bool> (* selezione *)
        |  EXISTS <rvar> IN <list> WHERE <bool> (* esistenziale *)
        |  USE <list> POSITION <svar>           (* unione lista backward *)
@@ -73,9 +71,6 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
              |  SUPER                         (* proprieta' e super-proprieta'
                                                   di *)
 
-<order>    := DESC                             (* ordinamento decrescente *)
-          |  ASC                              (* ordinamento crescente *) 
-
 <rvar> := <not-reserved-identifier>            (* variabile per risorse *)
 <svar> := $ <not-reserved-identifier>          (* variabile per stringhe *)
 
@@ -118,3 +113,17 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
 
   "body"     parte compresa fra le occorrenze di ":/" e "#1" escluse
   "fragment" parte successiva all'occorrenza "#1"
+- FUTURO: operatore di ordinamento sul risultato finale della query.
+  <query> SORTEDBY <order> <function>   (* unione lista ordinata secondo
+                                           ordine e valore funzione *)
+  <order>    := DESC                           (* ordinamento decrescente *)
+            |  ASC                            (* ordinamento crescente *)     
+  DTD:
+  <!ENTITY % order '(ascendant|descendant)'>
+  <!ELEMENT Query %queryexpr;>
+  <!ELEMENT SortBy (Query, SortField)>
+  <!ELEMENT SortField %functexpr;>
+  <!ATTLIST SortField 
+            order %order; #IMPLIED>
+- RILASSAMENTO degli operatori UNION e INTERSECT. Operatori fuzzy con 
+  introduzione di pesi associati ai risultati.
\ No newline at end of file

diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index a5bd242e7b108bd98d09e8386aba45db3527edcf..7b4f71045949c6dd43e82227e2a295caba74ee45 100644 (file)
--- a/helm/mathql/xmathql.dtd
+++ b/helm/mathql/xmathql.dtd
@@ -50,13 +50,11 @@
 <!ENTITY % position '(Conclusion|Hypothesis|Body|MainConclusion|
                         MainHypothesis)'>
 
-<!ENTITY % order '(ascendant|descendant)'>
-
 <!ENTITY % bool '(True|False)'>
 
 <!-- MathQL query expression declaration -->
 
-<!ENTITY % queryexpr '(Union|Intersect|Diff|SortBy|Select|Exists|Use|UsedBy|
+<!ENTITY % queryexpr '(Union|Intersect|Diff|Select|Exists|Use|UsedBy|
                    ConstructorsOf|Pattern|InTheory|TheoryRefTo|TypeOf|
                    SuperTypeOf|SubTypeOf|Group)'>
 
@@ -83,8 +81,6 @@
 
 <!ELEMENT Diff (%queryexpr;, %queryexpr;)>
 
-<!ELEMENT SortBy (%queryexpr;, SortField)>
-
 <!ELEMENT Select (In, Where)>
 
 <!ELEMENT Exists (In, Where)>
@@ -123,10 +119,6 @@
 
 <!-- MathQL query sub-expressions -->
 
-<!ELEMENT SortField %functexpr;>
-<!ATTLIST SortField 
-          order %order; #IMPLIED>
-
 <!ELEMENT In %queryexpr;>
 
 <!ELEMENT Where %boolexpr;>