Update for YAZ 3s new OID system

[idzebra-moved-to-github.git] / data1 / d1_map.c

diff --git a/data1/d1_map.c b/data1/d1_map.c
index c021cb4..997b9cb 100644 (file)
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,6 +1,6 @@
-/* $Id: d1_map.c,v 1.4 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_map.c,v 1.16 2007-04-16 08:44:31 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,21 +15,20 @@ 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 Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <yaz/oid.h>
 #include <yaz/log.h>
+#include <yaz/oid_db.h>
 #include <yaz/readconf.h>
 #include <yaz/tpath.h>
 #include <d1_absyn.h>
-#include <d1_map.h>
 
 data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 {
@@ -43,13 +42,10 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
     int local_numeric = 0;
 
     if (!(f = data1_path_fopen(dh, file, "r")))
-    {
-       yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
        return 0;
-    }
 
     res->name = 0;
-    res->target_absyn_ref = VAL_NONE;
+    res->oid = 0;
     res->map = 0;
     mapp = &res->map;
     res->next = 0;
@@ -59,14 +55,15 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # args for targetref",
+               yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetref",
                        file, lineno);
                continue;
            }
-           if ((res->target_absyn_ref = oid_getvalbyname(argv[1]))
-               == VAL_NONE)
+            res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                              CLASS_RECSYN, argv[1], mem);
+           if (!res->oid)
            {
-               yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+               yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
                        file, lineno, argv[1]);
                continue;
            }
@@ -75,7 +72,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # args for targetname",
+               yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetname",
                        file, lineno);
                continue;
            }
@@ -89,7 +86,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # args for name", file, lineno);
+               yaz_log(YLOG_WARN, "%s:%d: Bad # args for name", file, lineno);
                continue;
            }
            res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
@@ -102,7 +99,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 
            if (argc < 3)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # of args for map",
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args for map",
                        file, lineno);
                continue;
            }
@@ -129,7 +126,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
                if ((np = sscanf(path, "(%d,%511[^)]):%511[^/]", &type, valstr,
                    parm)) < 2)
                {
-                   yaz_log(LOG_WARN, "%s:%d: Syntax error in map "
+                   yaz_log(YLOG_WARN, "%s:%d: Syntax error in map "
                            "directive: %s", file, lineno, argv[2]);
                    fclose(f);
                    return 0;
@@ -158,7 +155,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
            mapp = &(*mapp)->next;
        }
        else 
-           yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+           yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
                    file, lineno, argv[0]);
 
     fclose(f);
@@ -330,26 +327,28 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 
     res->which = DATA1N_root;
     res->u.root.type = map->target_absyn_name;
-    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name)))
+    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name,
+                                              DATA1_XPATH_INDEXING_ENABLE)))
     {
-       yaz_log(LOG_WARN, "%s: Failed to load target absyn '%s'",
+       yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
                map->name, map->target_absyn_name);
     }
-    if (data1_is_xmlmode(dh))
-    {
-        n = n->child;
-        if (!n)
-            return 0;
-        res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
-    }
-    else
-        res1 = res;
-
+    n = n->child;
+    if (!n)
+        return 0;
+    res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
+    while (n && n->which != DATA1N_tag)
+        n = n->next;
     if (map_children(dh, n, map, res1, m) < 0)
-    {
-       data1_free_tree(dh, res);
        return 0;
-    }
     return res;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+