objectName patched.

diff --git a/helm/ocaml/mathql_interpreter/attribute.ml b/helm/ocaml/mathql_interpreter/attribute.ml
deleted file mode 100644 (file)
index 1a72f1e..0000000
--- a/helm/ocaml/mathql_interpreter/attribute.ml
+++ /dev/null
@@ -1,56 +0,0 @@
-(* 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/.
- *)
-
-(*
- *
- *)
-
-open Dbconn;;
-open Utility;;
-open Intersect;;
-
-(*
- * implementazione delle funzioni dublin core
- *)
-let rec attribute_ex rop path inv = function
-    [] -> []
-  | s::tl -> let tab = fst path in
-             if inv then
-               let res =
-               let c = pgc () in
-              let q = ("select " ^ tab ^ ".uri from " ^ tab ^ " where " ^ tab ^ ".value = '" ^ s ^ "'") in
-                    pgresult_to_string_list (c#exec q)
-               in
-               append (res,(attribute_ex rop path inv tl))
-             else
-              let res =
-               let c = pgc () in
-              let q = ("select " ^ tab ^ ".value from " ^ tab ^ " where " ^ tab ^ ".uri = '" ^ s ^ "'") in
-                    pgresult_to_string_list (c#exec q)
-               in
-               append (res,(attribute_ex rop path inv tl))
-
-;;
-

diff --git a/helm/ocaml/mathql_interpreter/attribute.mli b/helm/ocaml/mathql_interpreter/attribute.mli
deleted file mode 100644 (file)
index 841db1b..0000000
--- a/helm/ocaml/mathql_interpreter/attribute.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* 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/.
- *)
-
-val attribute_ex: MathQL.refine -> MathQL.path -> bool -> MathQL.value -> MathQL.value
-

diff --git a/helm/ocaml/mathql_interpreter/property.ml b/helm/ocaml/mathql_interpreter/property.ml
index 6052c2072842ee14caecda71d660082def1a1621..071d2884c74a86147445a2a35f8e34a3b7edb888 100644 (file)
--- a/helm/ocaml/mathql_interpreter/property.ml
+++ b/helm/ocaml/mathql_interpreter/property.ml
@@ -44,7 +44,11 @@ let rec property_ex rop path inv = function
     [] -> []
   | s::tl -> let mprop = fst path in
              print_endline mprop;
-             let prop = List.hd (snd path) in
+             let l_sub_p = snd path in
+              
+            let prop = (if (l_sub_p <> []) then List.hd l_sub_p 
+                       else "") 
+            in 
              match mprop with
               
               "refObj" (* in base al valore di prop restituisco i valori del relativo campo della tabella relativa all'uri rappresentata da s *)
@@ -85,11 +89,13 @@ let rec property_ex rop path inv = function
             
             
             | _ ->        (* metadati DC  !!!! Controllare se i nomi delle tabelle cominciano con h !!!!*)
+            print_endline "DC";
             if inv then
                let res =
                let c = pgc () in
               let q = ("select " ^ mprop ^ ".uri from " ^ mprop ^ " where " ^ mprop ^ ".value = '" ^ s ^ "'") in
-                pgresult_to_string_list (c#exec q)
+                print_endline q;
+                pgresult_to_string_list (c#exec q)
                in
                  append (res,(property_ex rop path inv tl))
              else