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
Omit backslash from REGEX_CHARS. Only use for ICU search
[idzebra-moved-to-github.git]
/
index
/
mod_dom.c
diff --git
a/index/mod_dom.c
b/index/mod_dom.c
index
864529a
..
babee87
100644
(file)
--- a/
index/mod_dom.c
+++ b/
index/mod_dom.c
@@
-1,4
+1,4
@@
-/* $Id: mod_dom.c,v 1.39 2007-08-31 07:02:24 adam Exp $
+/* $Id: mod_dom.c,v 1.42 2007-12-13 19:59:21 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-780,7
+780,7
@@
static void index_value_of(struct filter_info *tinfo,
recword->index_name = (const char *)index;
if (type && *type)
recword->index_name = (const char *)index;
if (type && *type)
- recword->index_type = *type;
+ recword->index_type = (const char *) type;
/* writing debug out */
if (extctr->flagShowRecords)
/* writing debug out */
if (extctr->flagShowRecords)
@@
-790,10
+790,6
@@
static void index_value_of(struct filter_info *tinfo,
type ? (const char *) type : "null",
text ? (const char *) text : "null");
type ? (const char *) type : "null",
text ? (const char *) text : "null");
- /* actually indexing the text given */
- recword->index_name = (const char *)index;
- if (type && *type)
- recword->index_type = *type;
(extctr->tokenAdd)(recword);
/* eat whitespaces */
(extctr->tokenAdd)(recword);
/* eat whitespaces */
@@
-845,7
+841,6
@@
static void set_record_info(struct filter_info *tinfo,
else
dom_log(YLOG_WARN, tinfo, node, "bad @type value: %s", type_p);
extctr->action = action;
else
dom_log(YLOG_WARN, tinfo, node, "bad @type value: %s", type_p);
extctr->action = action;
- yaz_log(YLOG_LOG, "In mod_dom.c: setting action to %d", action);
}
if (tinfo->record_info_invoked == 1)
}
if (tinfo->record_info_invoked == 1)
@@
-1306,10
+1301,13
@@
static int filter_extract(void *clientData, struct recExtractCtrl *p)
return RECCTRL_EXTRACT_ERROR_GENERIC;
odr_reset(tinfo->odr_record);
return RECCTRL_EXTRACT_ERROR_GENERIC;
odr_reset(tinfo->odr_record);
+
+ if (p->setStoreData == 0)
+ return extract_xml_full(tinfo, input, p);
switch(input->type)
{
case DOM_INPUT_XMLREADER:
switch(input->type)
{
case DOM_INPUT_XMLREADER:
- if (input->u.xmlreader.split_level == 0 || p->setStoreData == 0)
+ if (input->u.xmlreader.split_level == 0)
return extract_xml_full(tinfo, input, p);
else
return extract_xml_split(tinfo, input, p);
return extract_xml_full(tinfo, input, p);
else
return extract_xml_split(tinfo, input, p);