projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable shared objects by default
[idzebra-moved-to-github.git]
/
data1
/
d1_absyn.c
diff --git
a/data1/d1_absyn.c
b/data1/d1_absyn.c
index
c7f8ba7
..
f2a48ec
100644
(file)
--- a/
data1/d1_absyn.c
+++ b/
data1/d1_absyn.c
@@
-1,5
+1,5
@@
-/* $Id: d1_absyn.c,v 1.6 2003-02-04 12:06:46 pop Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: d1_absyn.c,v 1.11 2004-08-24 14:29:09 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-58,7
+58,7
@@
data1_absyn *data1_absyn_search (data1_handle dh, const char *name)
while (p)
{
while (p)
{
- if (!strcmp (name, p->name))
+ if (!yaz_matchstr (name, p->name))
return p->absyn;
p = p->next;
}
return p->absyn;
p = p->next;
}
@@
-76,12
+76,15
@@
void data1_absyn_destroy (data1_handle dh)
while (p)
{
data1_absyn *abs = p->absyn;
while (p)
{
data1_absyn *abs = p->absyn;
- data1_xpelement *xpe = abs->xp_elements;
- while (xpe) {
- logf (LOG_DEBUG,"Destroy xp element %s",xpe->xpath_expr);
- if (xpe->dfa) { dfa_delete (&xpe->dfa); }
- xpe = xpe->next;
- }
+ if (abs)
+ {
+ data1_xpelement *xpe = abs->xp_elements;
+ while (xpe) {
+ logf (LOG_DEBUG,"Destroy xp element %s",xpe->xpath_expr);
+ if (xpe->dfa) { dfa_delete (&xpe->dfa); }
+ xpe = xpe->next;
+ }
+ }
p = p->next;
}
}
p = p->next;
}
}
@@
-130,7
+133,7
@@
data1_attset *data1_attset_search_name (data1_handle dh, const char *name)
while (p)
{
while (p)
{
- if (!strcmp (name, p->name))
+ if (!yaz_matchstr (name, p->name))
return p->attset;
p = p->next;
}
return p->attset;
p = p->next;
}
@@
-359,28
+362,57
@@
const char * mk_xpath_regexp (data1_handle dh, char *expr)
pop, 2002-12-13
*/
static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
pop, 2002-12-13
*/
static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
- char *p, const char *file, int lineno,
+ char *cp, const char *file, int lineno,
const char *element_name, data1_absyn *res,
int xpelement)
{
data1_termlist **tp = *tpp;
const char *element_name, data1_absyn *res,
int xpelement)
{
data1_termlist **tp = *tpp;
- do
+ while(1)
{
char attname[512], structure[512];
char *source;
{
char attname[512], structure[512];
char *source;
- int r;
-
- if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
- structure)))
+ int r, i;
+ int level = 0;
+ structure[0] = '\0';
+ for (i = 0; cp[i] && i<sizeof(attname)-1; i++)
+ if (strchr(":,", cp[i]))
+ break;
+ else
+ attname[i] = cp[i];
+ if (i == 0)
{
{
- yaz_log(LOG_WARN,
- "%s:%d: Syntax error in termlistspec '%s'",
- file, lineno, p);
- return -1;
+ if (*cp)
+ yaz_log(LOG_WARN,
+ "%s:%d: Syntax error in termlistspec '%s'",
+ file, lineno, cp);
+ break;
}
}
+ attname[i] = '\0';
+ r = 1;
+ cp += i;
+ if (*cp == ':')
+ cp++;
+
+ for (i = 0; cp[i] && i<sizeof(structure)-1; i++)
+ if (level == 0 && strchr(",", cp[i]))
+ break;
+ else
+ {
+ structure[i] = cp[i];
+ if (cp[i] == '(')
+ level++;
+ else if (cp[i] == ')')
+ level--;
+ }
+ structure[i] = '\0';
+ if (i)
+ r = 2;
+ cp += i;
+ if (*cp)
+ cp++; /* skip , */
*tp = (data1_termlist *)
*tp = (data1_termlist *)
- nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+ nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
(*tp)->next = 0;
if (!xpelement) {
(*tp)->next = 0;
if (!xpelement) {
@@
-413,7
+445,7
@@
static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
nmem_strdup (data1_nmem_get (dh), structure);
tp = &(*tp)->next;
}
nmem_strdup (data1_nmem_get (dh), structure);
tp = &(*tp)->next;
}
- while ((p = strchr(p, ',')) && *(++p));
+
*tpp = tp;
return 0;
}
*tpp = tp;
return 0;
}
@@
-665,7
+697,6
@@
data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
int i;
char *p, *xpath_expr, *termlists;
const char *regexp;
int i;
char *p, *xpath_expr, *termlists;
const char *regexp;
- int type, value;
struct DFA *dfa = dfa = dfa_init();
data1_termlist **tp;
struct DFA *dfa = dfa = dfa_init();
data1_termlist **tp;
@@
-702,10
+733,11
@@
data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
cur_xpelement->dfa = dfa;
#ifdef ENHANCED_XELM
cur_xpelement->dfa = dfa;
#ifdef ENHANCED_XELM
- cur_xpelement->xpath_len = parse_xpath_str(xpath_expr,
- cur_xpelement->xpath,
- data1_nmem_get(dh));
-
+ cur_xpelement->xpath_len =
+ zebra_parse_xpath_str(xpath_expr,
+ cur_xpelement->xpath, XPATH_STEP_COUNT,
+ data1_nmem_get(dh));
+
/*
dump_xp_steps(cur_xpelement->xpath,cur_xpelement->xpath_len);
*/
/*
dump_xp_steps(cur_xpelement->xpath,cur_xpelement->xpath_len);
*/
@@
-958,7
+990,6
@@
data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
}
else if (!strcmp(cmd, "systag"))
{
}
else if (!strcmp(cmd, "systag"))
{
- struct data1_systag *st;
if (argc != 3)
{
yaz_log(LOG_WARN, "%s:%d: Bad # or args for systag",
if (argc != 3)
{
yaz_log(LOG_WARN, "%s:%d: Bad # or args for systag",