-/* $Id: d1_absyn.c,v 1.26 2006-06-08 10:33:19 adam Exp $
+/* $Id: d1_absyn.c,v 1.29 2006-09-28 18:38:44 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
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>
data1_xpelement *xpe = abs->xp_elements;
while (xpe) {
yaz_log (YLOG_DEBUG,"Destroy xp element %s",xpe->xpath_expr);
- if (xpe->dfa) { dfa_delete (&xpe->dfa); }
+ if (xpe->dfa)
+ dfa_delete (&xpe->dfa);
xpe = xpe->next;
- }
+ }
}
p = p->next;
}
}
}
-data1_absyn *data1_absyn_add (data1_handle dh, const char *name)
+static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
+ enum DATA1_XPATH_INDEXING en);
+
+static data1_absyn *data1_absyn_add(data1_handle dh, const char *name,
+ enum DATA1_XPATH_INDEXING en)
{
char fname[512];
NMEM mem = data1_nmem_get (dh);
data1_absyn_cache p = (data1_absyn_cache)nmem_malloc (mem, sizeof(*p));
data1_absyn_cache *pp = data1_absyn_cache_get (dh);
- sprintf(fname, "%s.abs", name);
- p->absyn = data1_read_absyn (dh, fname, 0);
- p->name = nmem_strdup (mem, name);
+ sprintf(fname, "%.500s.abs", name);
+ p->absyn = data1_read_absyn(dh, fname, en);
+ p->name = nmem_strdup(mem, name);
p->next = *pp;
*pp = p;
return p->absyn;
}
-data1_absyn *data1_get_absyn (data1_handle dh, const char *name)
+data1_absyn *data1_get_absyn (data1_handle dh, const char *name,
+ enum DATA1_XPATH_INDEXING en)
{
data1_absyn *absyn;
if (!(absyn = data1_absyn_search (dh, name)))
- absyn = data1_absyn_add (dh, name);
+ absyn = data1_absyn_add (dh, name, en);
return absyn;
}
data1_attset *data1_attset_add (data1_handle dh, const char *name)
{
- char fname[512], aname[512];
NMEM mem = data1_nmem_get (dh);
data1_attset *attset;
-
- strcpy (aname, name);
- sprintf(fname, "%s.att", name);
- attset = data1_read_attset (dh, fname);
- if (!attset)
- {
- char *cp;
- attset = data1_read_attset (dh, name);
- if (attset && (cp = strrchr (aname, '.')))
- *cp = '\0';
- }
+
+ attset = data1_read_attset (dh, name);
if (!attset)
yaz_log (YLOG_WARN|YLOG_ERRNO, "Couldn't load attribute set %s", name);
else
nmem_malloc (mem, sizeof(*p));
data1_attset_cache *pp = data1_attset_cache_get (dh);
- attset->name = p->name = nmem_strdup (mem, aname);
+ attset->name = p->name = nmem_strdup(mem, name);
p->attset = attset;
p->next = *pp;
*pp = p;
/* we have multiple versions of data1_getelementbyname */
#define DATA1_GETELEMENTBYTAGNAME_VERSION 1
-#if DATA1_GETELEMENTBYTAGNAME_VERSION==0
-/* straight linear search */
-data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs,
- data1_element *parent,
- const char *tagname)
-{
- data1_element *r;
-
- /* It's now possible to have a data1 tree with no abstract syntax */
- if ( !abs )
- return 0;
-
- if (!parent)
- r = abs->main_elements;
- else
- r = parent->children;
-
- for (; r; r = r->next)
- {
- data1_name *n;
-
- for (n = r->tag->names; n; n = n->next)
- if (!data1_matchstr(tagname, n->name))
- return r;
- }
- return 0;
-}
-#endif
-
-#if DATA1_GETELEMENTBYTAGNAME_VERSION==1
-/* using hash search */
data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs,
data1_element *parent,
const char *tagname)
else
r = parent->children;
+#if DATA1_GETELEMENTBYTAGNAME_VERSION==1
+ /* using hash search */
if (!r)
return 0;
ht = r->hash;
if (!ht)
{
+ /* build hash table (the first time) */
ht = r->hash = data1_hash_open(29, data1_nmem_get(dh));
for (; r; r = r->next)
{
}
}
return data1_hash_lookup(ht, tagname);
-}
+#else
+ /* using linear search */
+ for (; r; r = r->next)
+ {
+ data1_name *n;
+
+ for (n = r->tag->names; n; n = n->next)
+ if (!data1_matchstr(tagname, n->name))
+ return r;
+ }
+ return 0;
#endif
+}
data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn,
const char *name)
return absyn->main_elements;
}
-data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
- int file_must_exist)
+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;
int argc;
char *argv[50], line[512];
- if (!(f = data1_path_fopen(dh, file, "r")))
- {
- if (file_must_exist)
- return 0;
- }
+ f = data1_path_fopen(dh, file, "r");
res = (data1_absyn *) nmem_malloc(data1_nmem_get(dh), sizeof(*res));
res->name = 0;
res->reference = VAL_NONE;
res->tagset = 0;
res->encoding = 0;
- res->enable_xpath_indexing = (f ? 0 : 1);
+ res->xpath_indexing =
+ (f ? DATA1_XPATH_INDEXING_DISABLE : default_xpath);
res->systags = 0;
systagsp = &res->systags;
tagset_childp = &res->tagset;
int i;
char *p, *xpath_expr, *termlists;
const char *regexp;
- struct DFA *dfa = dfa = dfa_init();
+ struct DFA *dfa = 0;
data1_termlist **tp;
char melm_xpath[128];
+ data1_xpelement *xp_old = 0;
if (argc < 3)
{
}
termlists = argv[2];
regexp = mk_xpath_regexp(dh, xpath_expr);
- i = dfa_parse (dfa, ®exp);
- if (i || *regexp) {
- yaz_log(YLOG_WARN, "%s:%d: Bad xpath to xelm", file, lineno);
- dfa_delete (&dfa);
- continue;
- }
-
+
+#if OPTIMIZE_MELM
+ for (xp_old = res->xp_elements; xp_old; xp_old = xp_old->next)
+ if (!strcmp(xp_old->regexp, regexp))
+ break;
+#endif
+ if (!xp_old)
+ {
+ const char *regexp_ptr = regexp;
+
+ dfa = dfa_init();
+ i = dfa_parse (dfa, ®exp_ptr);
+ if (i || *regexp_ptr) {
+ yaz_log(YLOG_WARN, "%s:%d: Bad xpath to xelm", file, lineno);
+ dfa_delete (&dfa);
+ continue;
+ }
+ }
if (!cur_xpelement)
{
cur_xpelement = (data1_xpelement *)
nmem_malloc(data1_nmem_get(dh), sizeof(*cur_xpelement));
cur_xpelement = cur_xpelement->next;
}
+#if OPTIMIZE_MELM
+ cur_xpelement->regexp = regexp;
+#endif
cur_xpelement->next = NULL;
cur_xpelement->xpath_expr = nmem_strdup(data1_nmem_get (dh),
xpath_expr);
- dfa_mkstate (dfa);
- cur_xpelement->dfa = dfa;
+ if (dfa)
+ dfa_mkstate (dfa);
+ cur_xpelement->dfa = dfa;
#ifdef ENHANCED_XELM
cur_xpelement->xpath_len =
continue;
}
if (!strcmp(argv[1], "enable"))
- res->enable_xpath_indexing = 1;
+ res->xpath_indexing = DATA1_XPATH_INDEXING_ENABLE;
else if (!strcmp (argv[1], "disable"))
- res->enable_xpath_indexing = 0;
+ res->xpath_indexing = DATA1_XPATH_INDEXING_DISABLE;
else
{
yaz_log(YLOG_WARN, "%s:%d: Expecting disable/enable "
projects / idzebra-moved-to-github.git / blobdiff