sortedby implemented and new uri result format

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

diff --git a/helm/ocaml/mathql_interpreter/pattern.ml b/helm/ocaml/mathql_interpreter/pattern.ml
index 2445e1c760fdae5096914631b5a2f70c2d0a6597..c9dde8b6ab39f4e50f77bef332d7ede617a090c3 100644 (file)
--- a/helm/ocaml/mathql_interpreter/pattern.ml
+++ b/helm/ocaml/mathql_interpreter/pattern.ml
@@ -1,14 +1,43 @@
+(* 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 PATTERN
+ *)
 
 open Dbconn;;
 open Utility;;
 open Eval;;
 
-let pattern_ex apreamble apattern ext afragid =
+let pattern_ex apreamble apattern afragid =
  let c = pgc () in
-  let r1 = c#exec "select att0 from class where att2='Object'" in
-   let res =
-    c#exec ("select att0 from t" ^ (pgresult_to_string r1) ^
-            " where att0 " ^ (pattern_match apreamble apattern ext afragid))
-   in
-    [["retVal"]] @ List.map (fun l -> [l]) (pgresult_to_string_list res)
+  let r1 = helm_class_id "MathResource" in
+   let qq = "select att0 from t" ^ r1 ^ " where att0 " ^ (pattern_match apreamble apattern afragid) in
+   (*let _ = print_endline qq in*)
+    let res =
+     c#exec (qq)
+    in
+     [["retVal"]] @ List.map (fun l -> [l]) (pgresult_to_string_list res)
 ;;