+/* This file is part of the Zebra server.
+ Copyright (C) 1995-2008 Index Data
-/* $Id: mod_dom.c,v 1.30 2007-03-07 14:18:35 marc Exp $
- Copyright (C) 1995-2007
- Index Data ApS
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
- This file is part of the Zebra server.
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
- 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
- Software Foundation; either version 2, or (at your option) any later
- version.
-
- Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <idzebra/util.h>
#include <idzebra/recctrl.h>
+#include <yaz/oid_db.h>
/* DOM filter style indexing */
#define ZEBRA_DOM_NS "http://indexdata.com/zebra-2.0"
int type;
union {
struct {
+ xmlTextReaderPtr reader;
+ int split_level;
+ } xmlreader;
+ struct {
const char *input_charset;
yaz_marc_t handle;
yaz_iconv_t iconv;
} marc;
- struct {
- xmlTextReaderPtr reader;
- int split_level;
- } xmlreader;
} u;
struct filter_input *next;
};
return ZEBRA_FAIL;
}
}
+ if (!tinfo->input_list)
+ {
+ struct filter_input *p
+ = new_input(tinfo, DOM_INPUT_XMLREADER);
+ p->u.xmlreader.split_level = 0;
+ p->u.xmlreader.reader = 0;
+ }
return ZEBRA_OK;
}
/* DOM filter style indexing */
static int attr_content_xml(struct _xmlAttr *attr, const char *name,
- xmlChar **dst_content)
+ const char **dst_content)
{
if (0 == XML_STRCMP(attr->name, name) && attr->children
&& attr->children->type == XML_TEXT_NODE)
{
- *dst_content = (attr->children->content);
+ *dst_content = (const char *) (attr->children->content);
return 1;
}
return 0;
struct recExtractCtrl *extctr,
RecWord* recword,
xmlNodePtr node,
- xmlChar * index_p)
+ const char *index_p)
{
if (tinfo->record_info_invoked == 1)
{
xmlChar *text = xmlNodeGetContent(node);
size_t text_len = strlen((const char *)text);
-
+
/* if there is no text, we do not need to proceed */
if (text_len)
{
- xmlChar *look = index_p;
- xmlChar *bval;
- xmlChar *eval;
+ const char *look = index_p;
+ const char *bval;
+ const char *eval;
xmlChar index[256];
xmlChar type[256];
}
/* actually indexing the text given */
- dom_log(YLOG_DEBUG, tinfo, 0,
- "INDEX '%s:%s' '%s'",
- index ? (const char *) index : "null",
- type ? (const char *) type : "null",
- text ? (const char *) text : "null");
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)
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 */
- if (*look && ' ' == *look && *(look+1))
+ if (*look && ' ' == *look)
{
look++;
}
static void set_record_info(struct filter_info *tinfo,
struct recExtractCtrl *extctr,
xmlNodePtr node,
- xmlChar * id_p,
- xmlChar * rank_p,
- xmlChar * type_p)
+ const char * id_p,
+ const char * rank_p,
+ const char * type_p)
{
-
/* writing debug info out */
- if (extctr->flagShowRecords)
- dom_log(YLOG_LOG, tinfo, 0,
+ if (extctr && extctr->flagShowRecords)
+ dom_log(YLOG_LOG, tinfo, node,
"RECORD id=%s rank=%s type=%s",
id_p ? (const char *) id_p : "(null)",
rank_p ? (const char *) rank_p : "(null)",
type_p ? (const char *) type_p : "(null)");
- if (id_p)
+ if (id_p && *id_p)
sscanf((const char *)id_p, "%255s", extctr->match_criteria);
- if (rank_p)
+ if (rank_p && *rank_p)
extctr->staticrank = atozint((const char *)rank_p);
- /* if (!strcmp("update", type_str)) */
- /* index_node(tinfo, ctrl, ptr, recword); */
- /* else if (!strcmp("delete", type_str)) */
- /* dom_log(YLOG_WARN, tinfo, ptr, "dom filter delete: to be implemented"); */
- /* else */
- /* dom_log(YLOG_WARN, tinfo, ptr, "dom filter: unknown record type '%s'", */
- /* type_str); */
+ if (type_p && *type_p)
+ {
+ enum zebra_recctrl_action_t action = action_update;
+ if (!strcmp(type_p, "insert"))
+ action = action_insert;
+ else if (!strcmp(type_p, "delete"))
+ action = action_delete;
+ else if (!strcmp(type_p, "replace"))
+ action = action_replace;
+ else if (!strcmp(type_p, "update"))
+ action = action_update;
+ else
+ dom_log(YLOG_WARN, tinfo, node, "bad @type value: %s", type_p);
+ extctr->action = action;
+ }
+
if (tinfo->record_info_invoked == 1)
{
/* warn about multiple only once */
{
if (0 == XML_STRCMP(node->name, "index"))
{
- xmlChar *index_p = 0;
+ const char *index_p = 0;
struct _xmlAttr *attr;
for (attr = node->properties; attr; attr = attr->next)
{
if (attr_content_xml(attr, "name", &index_p))
{
- index_value_of(tinfo, extctr, recword,node, index_p);
+ index_value_of(tinfo, extctr, recword, node, index_p);
}
else
{
}
else if (0 == XML_STRCMP(node->name, "record"))
{
- xmlChar *id_p = 0;
- xmlChar *rank_p = 0;
- xmlChar *type_p = 0;
+ const char *id_p = 0;
+ const char *rank_p = 0;
+ const char *type_p = 0;
struct _xmlAttr *attr;
for (attr = node->properties; attr; attr = attr->next)
"bad attribute @%s, expected @id|@rank|@type",
attr->name);
}
-
- if (type_p && 0 != strcmp("update", (const char *)type_p))
- {
- dom_log(YLOG_WARN, tinfo, node,
- "attribute @%s, only implemented '@type='update'",
- attr->name);
- }
}
set_record_info(tinfo, extctr, node, id_p, rank_p, type_p);
}
}
}
+static int attr_content_pi(const char **c_ptr, const char *name,
+ char *value, size_t value_max)
+{
+ size_t name_len = strlen(name);
+ const char *look = *c_ptr;
+ int ret = 0;
+
+ *value = '\0';
+ while (*look && ' ' == *look)
+ look++;
+ if (strlen(look) > name_len)
+ {
+ if (look[name_len] == '=' && !memcmp(look, name, name_len))
+ {
+ size_t i = 0;
+ look += name_len+1;
+ while (*look && ' ' != *look)
+ {
+ if (i < value_max-1)
+ value[i++] = *look;
+ look++;
+ }
+ value[i] = '\0';
+ ret = 1;
+ }
+ }
+ while (*look && ' ' == *look)
+ look++;
+ *c_ptr = look;
+ return ret;
+}
/* DOM filter style indexing */
static void process_xml_pi_node(struct filter_info *tinfo,
struct recExtractCtrl *extctr,
xmlNodePtr node,
- xmlChar **index_pp)
+ const char **index_pp)
{
/* if right PI name, continue parsing PI */
if (0 == strcmp(zebra_pi_name, (const char *)node->name))
{
xmlChar *pi_p = node->content;
- xmlChar *look = pi_p;
+ const char *look = (const char *) node->content;
- xmlChar *bval;
- xmlChar *eval;
-
/* parsing PI record instructions */
if (0 == strncmp((const char *)look, "record", 6))
{
- xmlChar id[256];
- xmlChar rank[256];
- xmlChar type[256];
-
+ char id[256];
+ char rank[256];
+ char type[256];
+
*id = '\0';
*rank = '\0';
*type = '\0';
-
look += 6;
-
- /* eat whitespace */
- while (*look && ' ' == *look && *(look+1))
- look++;
-
- /* parse possible id */
- if (*look && 0 == strncmp((const char *)look, "id=", 3))
- {
- look += 3;
- bval = look;
- while (*look && ' ' != *look)
- look++;
- eval = look;
- strncpy((char *)id, (const char *)bval, eval - bval);
- id[eval - bval] = '\0';
- }
-
- /* eat whitespace */
- while (*look && ' ' == *look && *(look+1))
- look++;
-
- /* parse possible rank */
- if (*look && 0 == strncmp((const char *)look, "rank=", 5))
- {
- look += 6;
- bval = look;
- while (*look && ' ' != *look)
- look++;
- eval = look;
- strncpy((char *)rank, (const char *)bval, eval - bval);
- rank[eval - bval] = '\0';
- }
-
- /* eat whitespace */
- while (*look && ' ' == *look && *(look+1))
- look++;
-
- if (look && '\0' != *look)
- {
- dom_log(YLOG_WARN, tinfo, node,
- "content '%s', can not parse '%s'",
- pi_p, look);
- }
- else
- set_record_info(tinfo, extctr, node, id, rank, 0);
-
+ while (*look)
+ if (attr_content_pi(&look, "id", id, sizeof(id)))
+ ;
+ else if (attr_content_pi(&look, "rank", rank, sizeof(rank)))
+ ;
+ else if (attr_content_pi(&look, "type", type, sizeof(type)))
+ {
+ dom_log(YLOG_WARN, tinfo, node,
+ "content '%s', can not parse '%s'",
+ pi_p, look);
+ break;
+ }
+ set_record_info(tinfo, extctr, node, id, rank, type);
}
/* parsing index instruction */
else if (0 == strncmp((const char *)look, "index", 5))
look += 5;
/* eat whitespace */
- while (*look && ' ' == *look && *(look+1))
+ while (*look && ' ' == *look)
look++;
/* export index instructions to outside */
xmlNodePtr node)
{
/* remember indexing instruction from PI to next element node */
- xmlChar *index_p = 0;
+ const char *index_p = 0;
/* check if we are an element node in the special zebra namespace
and either set record data or index value-of node content*/
params[0] = 0;
set_param_str(params, "schema", zebra_dom_ns, tinfo->odr_record);
+ if (p && p->flagShowRecords)
+ {
+ xmlChar *buf_out;
+ int len_out;
+#if 0
+ FILE *outf = fopen("extract.xml", "w");
+ xmlDocDumpMemory(doc, &buf_out, &len_out);
+ fwrite(buf_out, 1, len_out, outf);
+#endif
+ yaz_log(YLOG_LOG, "Extract Doc: %.*s", len_out, buf_out);
+#if 0
+ fclose(outf);
+#endif
+ }
+
/* input conversion */
perform_convert(tinfo, p, input->convert, params, &doc, 0);
+
if (tinfo->store)
{
/* store conversion */
else
xmlDocDumpMemory(store_doc ? store_doc : doc, &buf_out, &len_out);
- (*p->setStoreData)(p, buf_out, len_out);
+ if (p->setStoreData)
+ (*p->setStoreData)(p, buf_out, len_out);
xmlFree(buf_out);
if (store_doc)
xmlChar *buf_out = 0;
int len_out = 0;
xmlDocDumpMemory(doc, &buf_out, &len_out);
- yaz_log(YLOG_LOG, "%s: XMLREADER depth: %i\n%.*s",
+ yaz_log(YLOG_LOG, "%s: XMLREADER level: %i\n%.*s",
tinfo->fname ? tinfo->fname : "(none)",
depth, len_out, buf_out);
xmlFree(buf_out);
{
xmlDocPtr rdoc;
xmlNode *root_ptr;
- yaz_marc_write_xml(input->u.marc.handle, &root_ptr, 0, 0, 0);
+ yaz_marc_write_xml(input->u.marc.handle, &root_ptr,
+ "http://www.loc.gov/MARC21/slim", 0, 0);
rdoc = xmlNewDoc((const xmlChar*) "1.0");
xmlDocSetRootElement(rdoc, root_ptr);
return convert_extract_doc(tinfo, input, p, rdoc);
if (!input)
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:
{
p->diagnostic =
YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+ p->addinfo = odr_strdup(p->odr, esn);
return 0;
}
{
p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
}
- else if (p->input_format == VAL_NONE || p->input_format == VAL_TEXT_XML)
+ else if (!p->input_format
+ || !oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
{
xmlChar *buf_out;
int len_out;
else
xmlDocDumpMemory(doc, &buf_out, &len_out);
- p->output_format = VAL_TEXT_XML;
+ p->output_format = yaz_oid_recsyn_xml;
p->rec_len = len_out;
p->rec_buf = odr_malloc(p->odr, p->rec_len);
memcpy(p->rec_buf, buf_out, p->rec_len);
xmlFree(buf_out);
}
- else if (p->output_format == VAL_SUTRS)
+ else if (!oid_oidcmp(p->output_format, yaz_oid_recsyn_sutrs))
{
xmlChar *buf_out;
int len_out;
else
xmlDocDumpMemory(doc, &buf_out, &len_out);
- p->output_format = VAL_SUTRS;
+ p->output_format = yaz_oid_recsyn_sutrs;
p->rec_len = len_out;
p->rec_buf = odr_malloc(p->odr, p->rec_len);
memcpy(p->rec_buf, buf_out, p->rec_len);
projects / idzebra-moved-to-github.git / blobdiff