-/* $Id: d1_absyn.c,v 1.29 2006-09-28 18:38:44 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 Index Data
Zebra 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
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <yaz/log.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <idzebra/data1.h>
#include <idzebra/recctrl.h>
#include <zebra_xpath.h>
return 0;
}
-data1_attset *data1_attset_search_id (data1_handle dh, int id)
+data1_attset *data1_attset_search_id(data1_handle dh, const Odr_oid *oid)
{
data1_attset_cache p = *data1_attset_cache_get (dh);
while (p)
{
- if (id == p->attset->reference)
+ if (p->attset->oid && !oid_oidcmp(oid, p->attset->oid))
return p->attset;
p = p->next;
}
return argc;
}
-data1_marctab *data1_absyn_getmarctab(data1_handle dh, data1_absyn *absyn)
+data1_marctab *data1_absyn_getmarctab(data1_handle dh, data1_node *root)
{
- return absyn->marc;
+ if (root->u.root.absyn)
+ return root->u.root.absyn->marc;
+ return 0;
}
-YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh,
- data1_absyn *absyn)
+data1_element *data1_absyn_getelements(data1_handle dh,
+ data1_node *root)
{
- return absyn->main_elements;
+ if (root->u.root.absyn)
+ return root->u.root.absyn->main_elements;
+ return 0;
}
static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
enum DATA1_XPATH_INDEXING default_xpath)
{
data1_sub_elements *cur_elements = NULL;
- data1_xpelement *cur_xpelement = NULL;
+ data1_xpelement **cur_xpelement = NULL;
data1_attset *attset_list = data1_empty_attset(dh);
data1_attset_child **attset_childp = &attset_list->children;
res = (data1_absyn *) nmem_malloc(data1_nmem_get(dh), sizeof(*res));
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->tagset = 0;
res->encoding = 0;
res->xpath_indexing =
res->sub_elements = NULL;
res->main_elements = NULL;
res->xp_elements = NULL;
+ cur_xpelement = &res->xp_elements;
while (f && (argc = read_absyn_line(f, &lineno, line, 512, argv, 50)))
{
struct DFA *dfa = 0;
data1_termlist **tp;
char melm_xpath[128];
- data1_xpelement *xp_old = 0;
+ data1_xpelement *xp_ele = 0;
+ data1_xpelement *last_match = 0;
- if (argc < 3)
+ if (argc != 3)
{
- yaz_log(YLOG_WARN, "%s:%d: Bad # of args to xelm", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args to %s",
+ file, lineno, cmd);
continue;
}
regexp = mk_xpath_regexp(dh, xpath_expr);
#if OPTIMIZE_MELM
- for (xp_old = res->xp_elements; xp_old; xp_old = xp_old->next)
- if (!strcmp(xp_old->regexp, regexp))
- break;
+ /* get last of existing regulars with same regexp */
+ for (xp_ele = res->xp_elements; xp_ele; xp_ele = xp_ele->next)
+ if (!strcmp(xp_ele->regexp, regexp))
+ last_match = xp_ele;
#endif
- if (!xp_old)
+ if (!last_match)
{
+ /* new regular expression . Parse + generate */
const char *regexp_ptr = regexp;
dfa = dfa_init();
continue;
}
}
- if (!cur_xpelement)
- {
- cur_xpelement = (data1_xpelement *)
- nmem_malloc(data1_nmem_get(dh), sizeof(*cur_xpelement));
- res->xp_elements = cur_xpelement;
- } else {
- cur_xpelement->next = (data1_xpelement *)
- nmem_malloc(data1_nmem_get(dh), sizeof(*cur_xpelement));
- cur_xpelement = cur_xpelement->next;
- }
+ *cur_xpelement = (data1_xpelement *)
+ nmem_malloc(data1_nmem_get(dh), sizeof(**cur_xpelement));
+ (*cur_xpelement)->next = 0;
+ (*cur_xpelement)->match_next = 0;
+ if (last_match)
+ last_match->match_next = *cur_xpelement;
#if OPTIMIZE_MELM
- cur_xpelement->regexp = regexp;
+ (*cur_xpelement)->regexp = regexp;
#endif
- cur_xpelement->next = NULL;
- cur_xpelement->xpath_expr = nmem_strdup(data1_nmem_get (dh),
- xpath_expr);
+ (*cur_xpelement)->xpath_expr = nmem_strdup(data1_nmem_get (dh),
+ xpath_expr);
if (dfa)
dfa_mkstate (dfa);
- cur_xpelement->dfa = dfa;
-
-#ifdef ENHANCED_XELM
- cur_xpelement->xpath_len =
- zebra_parse_xpath_str(xpath_expr,
- cur_xpelement->xpath, XPATH_STEP_COUNT,
- data1_nmem_get(dh));
+ (*cur_xpelement)->dfa = dfa;
- /*
- dump_xp_steps(cur_xpelement->xpath,cur_xpelement->xpath_len);
- */
+#ifdef ENHANCED_XELM
+ (*cur_xpelement)->xpath_len =
+ zebra_parse_xpath_str(
+ xpath_expr,
+ (*cur_xpelement)->xpath, XPATH_STEP_COUNT,
+ data1_nmem_get(dh));
#endif
- cur_xpelement->termlists = 0;
- tp = &cur_xpelement->termlists;
+ (*cur_xpelement)->termlists = 0;
+ tp = &(*cur_xpelement)->termlists;
/* parse termList definitions */
p = termlists;
}
*tp = all; /* append any ALL entries to the list */
}
+ cur_xpelement = &(*cur_xpelement)->next;
}
else if (!strcmp(cmd, "section"))
{
continue;
}
name = argv[1];
- if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_SCHEMA, name,
+ data1_nmem_get(dh));
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
file, lineno, name);
*systagsp = 0;
return res;
}
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab