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
Add support for section/chapter indexing. Add safari filter.
[idzebra-moved-to-github.git]
/
recctrl
/
regxread.c
diff --git
a/recctrl/regxread.c
b/recctrl/regxread.c
index
67f6510
..
f6f74c8
100644
(file)
--- a/
recctrl/regxread.c
+++ b/
recctrl/regxread.c
@@
-1,4
+1,4
@@
-/* $Id: regxread.c,v 1.53 2004-09-27 10:44:50 adam Exp $
+/* $Id: regxread.c,v 1.55 2004-11-19 10:27:13 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-29,7
+29,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/tpath.h>
#include <zebrautl.h>
#include <dfa.h>
#include <yaz/tpath.h>
#include <zebrautl.h>
#include <dfa.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
#if HAVE_TCL_H
#include <tcl.h>
#if HAVE_TCL_H
#include <tcl.h>
@@
-412,7
+412,7
@@
static int readParseToken (const char **cpp, int *len)
cmd[i] = '\0';
if (i == 0)
{
cmd[i] = '\0';
if (i == 0)
{
- logf (LOG_WARN, "bad character %d %c", *cp, *cp);
+ yaz_log (YLOG_WARN, "bad character %d %c", *cp, *cp);
cp++;
while (*cp && *cp != ' ' && *cp != '\t' &&
*cp != '\n' && *cp != '\r')
cp++;
while (*cp && *cp != ' ' && *cp != '\t' &&
*cp != '\n' && *cp != '\r')
@@
-433,7
+433,7
@@
static int readParseToken (const char **cpp, int *len)
return REGX_INIT;
else
{
return REGX_INIT;
else
{
- logf (LOG_WARN, "bad command %s", cmd);
+ yaz_log (YLOG_WARN, "bad command %s", cmd);
return 0;
}
}
return 0;
}
}
@@
-471,7
+471,7
@@
static int actionListMk (struct lexSpec *spec, const char *s,
{
xfree (*ap);
*ap = NULL;
{
xfree (*ap);
*ap = NULL;
- logf (LOG_WARN, "regular expression error '%.*s'", s-s0, s0);
+ yaz_log (YLOG_WARN, "regular expression error '%.*s'", s-s0, s0);
return -1;
}
if (debug_dfa_tran)
return -1;
}
if (debug_dfa_tran)
@@
-480,10
+480,10
@@
static int actionListMk (struct lexSpec *spec, const char *s,
s++;
break;
case REGX_BEGIN:
s++;
break;
case REGX_BEGIN:
- logf (LOG_WARN, "cannot use BEGIN here");
+ yaz_log (YLOG_WARN, "cannot use BEGIN here");
continue;
case REGX_INIT:
continue;
case REGX_INIT:
- logf (LOG_WARN, "cannot use INIT here");
+ yaz_log (YLOG_WARN, "cannot use INIT here");
continue;
case REGX_END:
*ap = (struct lexRuleAction *) xmalloc (sizeof(**ap));
continue;
case REGX_END:
*ap = (struct lexRuleAction *) xmalloc (sizeof(**ap));
@@
-509,7
+509,7
@@
int readOneSpec (struct lexSpec *spec, const char *s)
tok = readParseToken (&s, &len);
if (tok != REGX_CODE)
{
tok = readParseToken (&s, &len);
if (tok != REGX_CODE)
{
- logf (LOG_WARN, "missing name after CONTEXT keyword");
+ yaz_log (YLOG_WARN, "missing name after CONTEXT keyword");
return 0;
}
if (len > 31)
return 0;
}
if (len > 31)
@@
-540,17
+540,17
@@
int readOneSpec (struct lexSpec *spec, const char *s)
break;
case REGX_PATTERN:
#if REGX_DEBUG
break;
case REGX_PATTERN:
#if REGX_DEBUG
- logf (LOG_LOG, "rule %d %s", spec->context->ruleNo, s);
+ yaz_log (YLOG_LOG, "rule %d %s", spec->context->ruleNo, s);
#endif
r = dfa_parse (spec->context->dfa, &s);
if (r)
{
#endif
r = dfa_parse (spec->context->dfa, &s);
if (r)
{
- logf (LOG_WARN, "regular expression error. r=%d", r);
+ yaz_log (YLOG_WARN, "regular expression error. r=%d", r);
return -1;
}
if (*s != '/')
{
return -1;
}
if (*s != '/')
{
- logf (LOG_WARN, "expects / at end of pattern. got %c", *s);
+ yaz_log (YLOG_WARN, "expects / at end of pattern. got %c", *s);
return -1;
}
s++;
return -1;
}
s++;
@@
-585,13
+585,13
@@
int readFileSpec (struct lexSpec *spec)
}
if (!spec_inf)
{
}
if (!spec_inf)
{
- logf (LOG_ERRNO|LOG_WARN, "cannot read spec file %s", spec->name);
+ yaz_log (YLOG_ERRNO|YLOG_WARN, "cannot read spec file %s", spec->name);
return -1;
}
return -1;
}
- logf (LOG_LOG, "reading regx filter %s", fname);
+ yaz_log (YLOG_LOG, "reading regx filter %s", fname);
#if HAVE_TCL_H
if (spec->tcl_interp)
#if HAVE_TCL_H
if (spec->tcl_interp)
- logf (LOG_LOG, "Tcl enabled");
+ yaz_log (YLOG_LOG, "Tcl enabled");
#endif
#if 0
#endif
#if 0
@@
-675,16
+675,16
@@
static void execData (struct lexSpec *spec,
return ;
#if REGX_DEBUG
if (elen > 80)
return ;
#if REGX_DEBUG
if (elen > 80)
- logf (LOG_LOG, "data(%d bytes) %.40s ... %.*s", elen,
+ yaz_log (YLOG_LOG, "data(%d bytes) %.40s ... %.*s", elen,
ebuf, 40, ebuf + elen-40);
else if (elen == 1 && ebuf[0] == '\n')
{
ebuf, 40, ebuf + elen-40);
else if (elen == 1 && ebuf[0] == '\n')
{
- logf (LOG_LOG, "data(new line)");
+ yaz_log (YLOG_LOG, "data(new line)");
}
else if (elen > 0)
}
else if (elen > 0)
- logf (LOG_LOG, "data(%d bytes) %.*s", elen, elen, ebuf);
+ yaz_log (YLOG_LOG, "data(%d bytes) %.*s", elen, elen, ebuf);
else
else
- logf (LOG_LOG, "data(%d bytes)", elen);
+ yaz_log (YLOG_LOG, "data(%d bytes)", elen);
#endif
if (spec->d1_level <= 1)
#endif
if (spec->d1_level <= 1)
@@
-803,7
+803,7
@@
static void variantBegin (struct lexSpec *spec,
if (spec->d1_level == 0)
{
if (spec->d1_level == 0)
{
- logf (LOG_WARN, "in variant begin. No record type defined");
+ yaz_log (YLOG_WARN, "in variant begin. No record type defined");
return ;
}
if (class_len >= DATA1_MAX_SYMBOL)
return ;
}
if (class_len >= DATA1_MAX_SYMBOL)
@@
-817,13
+817,13
@@
static void variantBegin (struct lexSpec *spec,
ttype[type_len] = '\0';
#if REGX_DEBUG
ttype[type_len] = '\0';
#if REGX_DEBUG
- logf (LOG_LOG, "variant begin(%s,%s,%d)", tclass, ttype,
+ yaz_log (YLOG_LOG, "variant begin(%s,%s,%d)", tclass, ttype,
spec->d1_level);
#endif
if (!(tp =
spec->d1_level);
#endif
if (!(tp =
- data1_getvartypebyct(spec->dh, parent->root->u.root.absyn->varset,
- tclass, ttype)))
+ data1_getvartypeby_absyn(spec->dh, parent->root->u.root.absyn,
+ tclass, ttype)))
return;
if (parent->which != DATA1N_variant)
return;
if (parent->which != DATA1N_variant)
@@
-842,7
+842,7
@@
static void variantBegin (struct lexSpec *spec,
}
#if REGX_DEBUG
}
#if REGX_DEBUG
- logf (LOG_LOG, "variant node(%d)", spec->d1_level);
+ yaz_log (YLOG_LOG, "variant node(%d)", spec->d1_level);
#endif
parent = spec->d1_stack[spec->d1_level-1];
res = data1_mk_node2 (spec->dh, spec->m, DATA1N_variant, parent);
#endif
parent = spec->d1_stack[spec->d1_level-1];
res = data1_mk_node2 (spec->dh, spec->m, DATA1N_variant, parent);
@@
-879,7
+879,7
@@
static void tagBegin (struct lexSpec *spec,
{
if (spec->d1_level == 0)
{
{
if (spec->d1_level == 0)
{
- logf (LOG_WARN, "in element begin. No record type defined");
+ yaz_log (YLOG_WARN, "in element begin. No record type defined");
return ;
}
tagStrip (&tag, &len);
return ;
}
tagStrip (&tag, &len);
@@
-887,7
+887,7
@@
static void tagBegin (struct lexSpec *spec,
tagDataRelease (spec);
#if REGX_DEBUG
tagDataRelease (spec);
#if REGX_DEBUG
- logf (LOG_LOG, "begin tag(%.*s, %d)", len, tag, spec->d1_level);
+ yaz_log (YLOG_LOG, "begin tag(%.*s, %d)", len, tag, spec->d1_level);
#endif
spec->d1_stack[spec->d1_level] = data1_mk_tag_n (
#endif
spec->d1_stack[spec->d1_level] = data1_mk_tag_n (
@@
-913,7
+913,7
@@
static void tagEnd (struct lexSpec *spec, int min_level,
break;
}
#if REGX_DEBUG
break;
}
#if REGX_DEBUG
- logf (LOG_LOG, "end tag(%d)", spec->d1_level);
+ yaz_log (YLOG_LOG, "end tag(%d)", spec->d1_level);
#endif
}
#endif
}
@@
-1085,7
+1085,7
@@
static int cmd_tcl_begin (ClientData clientData, Tcl_Interp *interp,
data1_node *res;
#if REGX_DEBUG
data1_node *res;
#if REGX_DEBUG
- logf (LOG_LOG, "begin record %s", absynName);
+ yaz_log (YLOG_LOG, "begin record %s", absynName);
#endif
res = data1_mk_root (spec->dh, spec->m, absynName);
#endif
res = data1_mk_root (spec->dh, spec->m, absynName);
@@
-1113,7
+1113,7
@@
static int cmd_tcl_begin (ClientData clientData, Tcl_Interp *interp,
{
struct lexContext *lc = spec->context;
#if REGX_DEBUG
{
struct lexContext *lc = spec->context;
#if REGX_DEBUG
- logf (LOG_LOG, "begin context %s",argv[2]);
+ yaz_log (YLOG_LOG, "begin context %s",argv[2]);
#endif
while (lc && strcmp (argv[2], lc->name))
lc = lc->next;
#endif
while (lc && strcmp (argv[2], lc->name))
lc = lc->next;
@@
-1122,7
+1122,7
@@
static int cmd_tcl_begin (ClientData clientData, Tcl_Interp *interp,
spec->context_stack[++(spec->context_stack_top)] = lc;
}
else
spec->context_stack[++(spec->context_stack_top)] = lc;
}
else
- logf (LOG_WARN, "unknown context %s", argv[2]);
+ yaz_log (YLOG_WARN, "unknown context %s", argv[2]);
}
else
return TCL_ERROR;
}
else
return TCL_ERROR;
@@
-1144,7
+1144,7
@@
static int cmd_tcl_end (ClientData clientData, Tcl_Interp *interp,
(spec->d1_level)--;
}
#if REGX_DEBUG
(spec->d1_level)--;
}
#if REGX_DEBUG
- logf (LOG_LOG, "end record");
+ yaz_log (YLOG_LOG, "end record");
#endif
spec->stop_flag = 1;
}
#endif
spec->stop_flag = 1;
}
@@
-1165,7
+1165,7
@@
static int cmd_tcl_end (ClientData clientData, Tcl_Interp *interp,
if (spec->d1_level <= 1)
{
#if REGX_DEBUG
if (spec->d1_level <= 1)
{
#if REGX_DEBUG
- logf (LOG_LOG, "end element end records");
+ yaz_log (YLOG_LOG, "end element end records");
#endif
spec->stop_flag = 1;
}
#endif
spec->stop_flag = 1;
}
@@
-1173,7
+1173,7
@@
static int cmd_tcl_end (ClientData clientData, Tcl_Interp *interp,
else if (!strcmp (argv[1], "context"))
{
#if REGX_DEBUG
else if (!strcmp (argv[1], "context"))
{
#if REGX_DEBUG
- logf (LOG_LOG, "end context");
+ yaz_log (YLOG_LOG, "end context");
#endif
if (spec->context_stack_top)
(spec->context_stack_top)--;
#endif
if (spec->context_stack_top)
(spec->context_stack_top)--;
@@
-1295,7
+1295,7
@@
static void execTcl (struct lexSpec *spec, struct regxCode *code)
if (ret != TCL_OK)
{
const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);
if (ret != TCL_OK)
{
const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);
- logf(LOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s",
+ yaz_log(YLOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s",
spec->tcl_interp->errorLine,
spec->tcl_interp->result,
err ? err : "[NO ERRORINFO]");
spec->tcl_interp->errorLine,
spec->tcl_interp->result,
err ? err : "[NO ERRORINFO]");
@@
-1326,7
+1326,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
- logf (LOG_WARN, "missing keyword after 'begin'");
+ yaz_log (YLOG_WARN, "missing keyword after 'begin'");
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
@@
-1345,7
+1345,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
memcpy (absynName, cmd_str, cmd_len);
absynName[cmd_len] = '\0';
#if REGX_DEBUG
memcpy (absynName, cmd_str, cmd_len);
absynName[cmd_len] = '\0';
#if REGX_DEBUG
- logf (LOG_LOG, "begin record %s", absynName);
+ yaz_log (YLOG_LOG, "begin record %s", absynName);
#endif
res = data1_mk_root (spec->dh, spec->m, absynName);
#endif
res = data1_mk_root (spec->dh, spec->m, absynName);
@@
-1408,21
+1408,21
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
r = execTok (spec, &s, &cmd_str, &cmd_len);
p = regxStrz (cmd_str, cmd_len, ptmp);
#if REGX_DEBUG
r = execTok (spec, &s, &cmd_str, &cmd_len);
p = regxStrz (cmd_str, cmd_len, ptmp);
#if REGX_DEBUG
- logf (LOG_LOG, "begin context %s", p);
+ yaz_log (YLOG_LOG, "begin context %s", p);
#endif
while (lc && strcmp (p, lc->name))
lc = lc->next;
if (lc)
spec->context_stack[++(spec->context_stack_top)] = lc;
else
#endif
while (lc && strcmp (p, lc->name))
lc = lc->next;
if (lc)
spec->context_stack[++(spec->context_stack_top)] = lc;
else
- logf (LOG_WARN, "unknown context %s", p);
+ yaz_log (YLOG_WARN, "unknown context %s", p);
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
{
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
{
- logf (LOG_WARN, "bad keyword '%s' after begin", p);
+ yaz_log (YLOG_WARN, "bad keyword '%s' after begin", p);
}
}
else if (!strcmp (p, "end"))
}
}
else if (!strcmp (p, "end"))
@@
-1430,7
+1430,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
- logf (LOG_WARN, "missing keyword after 'end'");
+ yaz_log (YLOG_WARN, "missing keyword after 'end'");
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
@@
-1443,7
+1443,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
#if REGX_DEBUG
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
#if REGX_DEBUG
- logf (LOG_LOG, "end record");
+ yaz_log (YLOG_LOG, "end record");
#endif
spec->stop_flag = 1;
}
#endif
spec->stop_flag = 1;
}
@@
-1465,7
+1465,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
if (spec->d1_level <= 1)
{
#if REGX_DEBUG
if (spec->d1_level <= 1)
{
#if REGX_DEBUG
- logf (LOG_LOG, "end element end records");
+ yaz_log (YLOG_LOG, "end element end records");
#endif
spec->stop_flag = 1;
}
#endif
spec->stop_flag = 1;
}
@@
-1474,14
+1474,14
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
else if (!strcmp (p, "context"))
{
#if REGX_DEBUG
else if (!strcmp (p, "context"))
{
#if REGX_DEBUG
- logf (LOG_LOG, "end context");
+ yaz_log (YLOG_LOG, "end context");
#endif
if (spec->context_stack_top)
(spec->context_stack_top)--;
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
#endif
if (spec->context_stack_top)
(spec->context_stack_top)--;
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
- logf (LOG_WARN, "bad keyword '%s' after end", p);
+ yaz_log (YLOG_WARN, "bad keyword '%s' after end", p);
}
else if (!strcmp (p, "data"))
{
}
else if (!strcmp (p, "data"))
{
@@
-1509,12
+1509,12
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
break;
}
else
break;
}
else
- logf (LOG_WARN, "bad data option: %.*s",
+ yaz_log (YLOG_WARN, "bad data option: %.*s",
cmd_len, cmd_str);
}
if (r != 2)
{
cmd_len, cmd_str);
}
if (r != 2)
{
- logf (LOG_WARN, "missing data item after data");
+ yaz_log (YLOG_WARN, "missing data item after data");
continue;
}
if (element_str)
continue;
}
if (element_str)
@@
-1537,7
+1537,7
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
r = execTok (spec, &s, &cmd_str, &cmd_len);
if (r < 2)
{
- logf (LOG_WARN, "missing number after -offset");
+ yaz_log (YLOG_WARN, "missing number after -offset");
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
continue;
}
p = regxStrz (cmd_str, cmd_len, ptmp);
@@
-1548,12
+1548,12
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
offset = 0;
if (r < 2)
{
offset = 0;
if (r < 2)
{
- logf (LOG_WARN, "missing index after unread command");
+ yaz_log (YLOG_WARN, "missing index after unread command");
continue;
}
if (cmd_len != 1 || *cmd_str < '0' || *cmd_str > '9')
{
continue;
}
if (cmd_len != 1 || *cmd_str < '0' || *cmd_str > '9')
{
- logf (LOG_WARN, "bad index after unread command");
+ yaz_log (YLOG_WARN, "bad index after unread command");
continue;
}
else
continue;
}
else
@@
-1578,20
+1578,20
@@
static void execCode (struct lexSpec *spec, struct regxCode *code)
if (lc)
spec->context_stack[spec->context_stack_top] = lc;
else
if (lc)
spec->context_stack[spec->context_stack_top] = lc;
else
- logf (LOG_WARN, "unknown context %s", p);
+ yaz_log (YLOG_WARN, "unknown context %s", p);
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
{
}
r = execTok (spec, &s, &cmd_str, &cmd_len);
}
else
{
- logf (LOG_WARN, "unknown code command '%.*s'", cmd_len, cmd_str);
+ yaz_log (YLOG_WARN, "unknown code command '%.*s'", cmd_len, cmd_str);
r = execTok (spec, &s, &cmd_str, &cmd_len);
continue;
}
if (r > 1)
{
r = execTok (spec, &s, &cmd_str, &cmd_len);
continue;
}
if (r > 1)
{
- logf (LOG_WARN, "ignoring token %.*s", cmd_len, cmd_str);
+ yaz_log (YLOG_WARN, "ignoring token %.*s", cmd_len, cmd_str);
do {
r = execTok (spec, &s, &cmd_str, &cmd_len);
} while (r > 1);
do {
r = execTok (spec, &s, &cmd_str, &cmd_len);
} while (r > 1);
@@
-1629,7
+1629,7
@@
static int execAction (struct lexSpec *spec, struct lexRuleAction *ap,
arg_no++;
arg_start[arg_no] = F_WIN_EOF;
arg_end[arg_no] = F_WIN_EOF;
arg_no++;
arg_start[arg_no] = F_WIN_EOF;
arg_end[arg_no] = F_WIN_EOF;
- yaz_log(LOG_DEBUG, "Pattern match rest of record");
+ yaz_log(YLOG_DEBUG, "Pattern match rest of record");
*pptr = F_WIN_EOF;
}
else
*pptr = F_WIN_EOF;
}
else
@@
-1681,7
+1681,7
@@
static int execRule (struct lexSpec *spec, struct lexContext *context,
int ruleNo, int start_ptr, int *pptr)
{
#if REGX_DEBUG
int ruleNo, int start_ptr, int *pptr)
{
#if REGX_DEBUG
- logf (LOG_LOG, "exec rule %d", ruleNo);
+ yaz_log (YLOG_LOG, "exec rule %d", ruleNo);
#endif
return execAction (spec, context->fastRule[ruleNo]->actionList,
start_ptr, pptr);
#endif
return execAction (spec, context->fastRule[ruleNo]->actionList,
start_ptr, pptr);
@@
-1759,7
+1759,7
@@
data1_node *lexNode (struct lexSpec *spec, int *ptr)
if (spec->f_win_ef && *ptr != F_WIN_EOF)
{
#if REGX_DEBUG
if (spec->f_win_ef && *ptr != F_WIN_EOF)
{
#if REGX_DEBUG
- logf (LOG_LOG, "regx: endf ptr=%d", *ptr);
+ yaz_log (YLOG_LOG, "regx: endf ptr=%d", *ptr);
#endif
(*spec->f_win_ef)(spec->f_win_fh, *ptr);
}
#endif
(*spec->f_win_ef)(spec->f_win_fh, *ptr);
}
@@
-1824,7
+1824,7
@@
static data1_node *lexRoot (struct lexSpec *spec, off_t offset,
}
if (!lt)
{
}
if (!lt)
{
- logf (LOG_WARN, "cannot find context %s", context_name);
+ yaz_log (YLOG_WARN, "cannot find context %s", context_name);
return NULL;
}
spec->context_stack[spec->context_stack_top] = lt;
return NULL;
}
spec->context_stack[spec->context_stack_top] = lt;
@@
-1880,7
+1880,7
@@
data1_node *grs_read_regx (struct grs_read_info *p)
struct lexSpec **curLexSpec = &specs->spec;
#if REGX_DEBUG
struct lexSpec **curLexSpec = &specs->spec;
#if REGX_DEBUG
- logf (LOG_LOG, "grs_read_regx");
+ yaz_log (YLOG_LOG, "grs_read_regx");
#endif
if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
{
#endif
if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
{
@@
-1937,7
+1937,7
@@
data1_node *grs_read_tcl (struct grs_read_info *p)
struct lexSpec **curLexSpec = &specs->spec;
#if REGX_DEBUG
struct lexSpec **curLexSpec = &specs->spec;
#if REGX_DEBUG
- logf (LOG_LOG, "grs_read_tcl");
+ yaz_log (YLOG_LOG, "grs_read_tcl");
#endif
if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
{
#endif
if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
{