sortedby implemented and new uri result format

[helm.git] / helm / ocaml / mathql_interpreter / select.ml

diff --git a/helm/ocaml/mathql_interpreter/select.ml b/helm/ocaml/mathql_interpreter/select.ml
index 6f60a3e313949c7a5a944f7ac005ff88749bb709..191ffde342d68c9853a6380166188c95fb7962ea 100644 (file)
--- a/helm/ocaml/mathql_interpreter/select.ml
+++ b/helm/ocaml/mathql_interpreter/select.ml
@@ -1,3 +1,27 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
 
 (*
  * implementazione del comando SELECT
@@ -15,10 +39,7 @@ let stringeval s l =
     MQCons s ->
      s
  |  MQFunc (f, rvar) ->
-     (
-      match f with
-         MQName -> func_name (List.assoc rvar l)
-     )
+     apply_func f (List.assoc rvar l)
  |  MQRVar rvar ->
      List.assoc rvar l
  |  MQSVar svar ->
@@ -74,7 +95,7 @@ let rec replace avar newval l =
  |  _              -> l (* i casi non compresi sono MQTrue e MQFalse *)
 ;;
 
-let rec print_booltree b =
+(*let rec print_booltree b =
  match b with
     MQAnd (b1, b2) ->
      let i = print_booltree b1 in
@@ -98,7 +119,27 @@ let rec print_booltree b =
      |  MQFunc (f, rvar) ->
         (
           match f with
-           MQName -> "NAME " ^ rvar
+           MQName         -> "NAME " ^ rvar
+        |  MQTheory       -> "THEORY" ^ rvar
+        |  MQTitle        -> "TITLE" ^ rvar
+        |  MQContributor  -> "contributor" ^ rvar
+        |  MQCreator      -> "creator" ^ rvar
+        |  MQPublisher    -> "publisher" ^ rvar
+        |  MQSubject      -> "subject" ^ rvar
+        |  MQDescription  -> "description" ^ rvar
+        |  MQDate         -> "date" ^ rvar
+        |  MQType         -> "type" ^ rvar
+        |  MQFormat       -> "format" ^ rvar
+        |  MQIdentifier   -> "identifier" ^ rvar
+        |  MQLanguage     -> "language" ^ rvar
+        |  MQRelation     -> "relation" ^ rvar
+        |  MQSource       -> "source" ^ rvar
+        |  MQCoverage     -> "coverage" ^ rvar
+        |  MQRights       -> "rights" ^ rvar
+        |  MQInstitution  -> "institution" ^ rvar
+        |  MQContact      -> "contact" ^ rvar
+        |  MQFirstVersion -> "firstversion" ^ rvar
+        |  MQModified     -> "modified" ^ rvar
         )
      |  MQRVar rvar ->
          rvar
@@ -115,6 +156,26 @@ let rec print_booltree b =
         (
           match f with
            MQName -> "NAME " ^ rvar 
+        |  MQTheory       -> "THEORY" ^ rvar
+        |  MQTitle        -> "TITLE" ^ rvar
+        |  MQContributor  -> "contributor" ^ rvar
+        |  MQCreator      -> "creator" ^ rvar
+        |  MQPublisher    -> "publisher" ^ rvar
+        |  MQSubject      -> "subject" ^ rvar
+        |  MQDescription  -> "description" ^ rvar
+        |  MQDate         -> "date" ^ rvar
+        |  MQType         -> "type" ^ rvar
+        |  MQFormat       -> "format" ^ rvar
+        |  MQIdentifier   -> "identifier" ^ rvar
+        |  MQLanguage     -> "language" ^ rvar
+        |  MQRelation     -> "relation" ^ rvar
+        |  MQSource       -> "source" ^ rvar
+        |  MQCoverage     -> "coverage" ^ rvar
+        |  MQRights       -> "rights" ^ rvar
+        |  MQInstitution  -> "institution" ^ rvar
+        |  MQContact      -> "contact" ^ rvar
+        |  MQFirstVersion -> "firstversion" ^ rvar
+        |  MQModified     -> "modified" ^ rvar
         )
      |  MQRVar rvar ->
          rvar
@@ -127,7 +188,7 @@ let rec print_booltree b =
      in
       print_string (s1v ^ " = " ^ s2v)
 ;;
-
+*)
 (*
  * implementazione del comando SELECT
  *)