X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=982573be6539b9687e0d17e967cd8721003aefd1;hp=3fe7f217e8fb34e2370aa80be7276d61ca9e4927;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=12c6db025bffd23e760ceb31120468cf363256df diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 3fe7f21..982573b 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,6 +1,6 @@ -/* $Id: recgrs.c,v 1.92 2004-10-12 18:21:35 quinn Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: recgrs.c,v 1.98 2005-01-15 19:38:32 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -25,7 +25,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #ifndef WIN32 #include -#include #endif #include @@ -180,26 +179,26 @@ int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p) if (p->which == XPATH_PREDICATE_RELATION) { if (p->u.relation.name[0]) { if (*p->u.relation.name != '@') { - yaz_log(LOG_WARN, + yaz_log(YLOG_WARN, " Only attributes (@) are supported in xelm xpath predicates"); - yaz_log(LOG_WARN, "predicate %s ignored", p->u.relation.name); + yaz_log(YLOG_WARN, "predicate %s ignored", p->u.relation.name); return (1); } attname = p->u.relation.name + 1; res = 0; /* looking for the attribute with a specified name */ for (attr = n->u.tag.attributes; attr; attr = attr->next) { - yaz_log(LOG_DEBUG," - attribute %s <-> %s", attname, attr->name ); + yaz_log(YLOG_DEBUG," - attribute %s <-> %s", attname, attr->name ); if (!strcmp(attr->name, attname)) { if (p->u.relation.op[0]) { if (*p->u.relation.op != '=') { - yaz_log(LOG_WARN, + yaz_log(YLOG_WARN, "Only '=' relation is supported (%s)",p->u.relation.op); - yaz_log(LOG_WARN, "predicate %s ignored", p->u.relation.name); + yaz_log(YLOG_WARN, "predicate %s ignored", p->u.relation.name); res = 1; break; } else { - yaz_log(LOG_DEBUG," - value %s <-> %s", + yaz_log(YLOG_DEBUG," - value %s <-> %s", p->u.relation.value, attr->value ); if (!strcmp(attr->value, p->u.relation.value)) { res = 1; break; @@ -211,7 +210,7 @@ int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p) } } } - yaz_log(LOG_DEBUG, "return %d", res); + yaz_log(YLOG_DEBUG, "return %d", res); return res; } else { return 1; @@ -226,7 +225,7 @@ int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p) return (d1_check_xpath_predicate(n, p->u.boolean.left) || d1_check_xpath_predicate(n, p->u.boolean.right)); } else { - yaz_log(LOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op); + yaz_log(YLOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op); return 1; } } @@ -265,7 +264,7 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) int ok = 0; sprintf (pexpr, "%s\n", tagpath); - yaz_log(LOG_DEBUG,"Checking tagpath %s",tagpath); + yaz_log(YLOG_DEBUG,"Checking tagpath %s",tagpath); while (xpe) { struct DFA_state **dfaar = xpe->dfa->states; @@ -293,9 +292,9 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) } while (i >= 0); } if (ok) - yaz_log(LOG_DEBUG," xpath match %s",xpe->xpath_expr); + yaz_log(YLOG_DEBUG," xpath match %s",xpe->xpath_expr); else - yaz_log(LOG_DEBUG," xpath no match %s",xpe->xpath_expr); + yaz_log(YLOG_DEBUG," xpath no match %s",xpe->xpath_expr); pexpr--; if (ok) { @@ -312,11 +311,11 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) backwards trough xpath location steps ... */ for (i=xpe->xpath_len - 1; i>0; i--) { - yaz_log(LOG_DEBUG,"Checking step %d: %s on tag %s", + yaz_log(YLOG_DEBUG,"Checking step %d: %s on tag %s", i,xp[i].part,nn->u.tag.tag); if (!d1_check_xpath_predicate(nn, xp[i].predicate)) { - yaz_log(LOG_DEBUG," Predicates didn't match"); + yaz_log(YLOG_DEBUG," Predicates didn't match"); ok = 0; break; } @@ -336,7 +335,7 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) xfree(pexpr); if (ok) { - yaz_log(LOG_DEBUG,"Got it"); + yaz_log(YLOG_DEBUG,"Got it"); return xpe->termlists; } else { return NULL; @@ -400,7 +399,7 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, data1_termlist *tl; int xpdone = 0; - yaz_log(LOG_DEBUG, "index_xpath level=%d use=%d", level, use); + yaz_log(YLOG_DEBUG, "index_xpath level=%d use=%d", level, use); if ((!n->root->u.root.absyn) || (n->root->u.root.absyn->enable_xpath_indexing)) { termlist_only = 0; @@ -900,7 +899,8 @@ int zebra_grs_extract(void *clientData, struct recExtractCtrl *p, /* * Return: -1: Nothing done. 0: Ok. >0: Bib-1 diagnostic. */ -static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) +static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c, + char **addinfo, ODR o) { data1_esetname *eset; Z_Espec1 *espec = 0; @@ -914,10 +914,11 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) if (!(eset = data1_getesetbyname(dh, n->u.root.absyn, c->u.simple->u.generic))) { - yaz_log(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic); + yaz_log(YLOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic); + *addinfo = odr_strdup(o, c->u.simple->u.generic); return 25; /* invalid esetname */ } - yaz_log(LOG_DEBUG, "Esetname '%s' in simple compspec", + yaz_log(YLOG_DEBUG, "Esetname '%s' in simple compspec", c->u.simple->u.generic); espec = eset->spec; break; @@ -934,23 +935,24 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) data1_getesetbyname(dh, n->u.root.absyn, p->u.elementSetName))) { - yaz_log(LOG_LOG, "Unknown esetname '%s'", + yaz_log(YLOG_DEBUG, "Unknown esetname '%s'", p->u.elementSetName); + *addinfo = odr_strdup(o, p->u.elementSetName); return 25; /* invalid esetname */ } - yaz_log(LOG_DEBUG, "Esetname '%s' in complex compspec", + yaz_log(YLOG_DEBUG, "Esetname '%s' in complex compspec", p->u.elementSetName); espec = eset->spec; break; case Z_ElementSpec_externalSpec: if (p->u.externalSpec->which == Z_External_espec1) { - yaz_log(LOG_DEBUG, "Got Espec-1"); + yaz_log(YLOG_DEBUG, "Got Espec-1"); espec = p->u.externalSpec-> u.espec1; } else { - yaz_log(LOG_LOG, "Unknown external espec."); + yaz_log(YLOG_LOG, "Unknown external espec."); return 25; /* bad. what is proper diagnostic? */ } break; @@ -962,12 +964,12 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) } if (espec) { - yaz_log(LOG_DEBUG, "Element: Espec-1 match"); + yaz_log(YLOG_DEBUG, "Element: Espec-1 match"); return data1_doespec1(dh, n, espec); } else { - yaz_log(LOG_DEBUG, "Element: all match"); + yaz_log(YLOG_DEBUG, "Element: all match"); return -1; } } @@ -1046,7 +1048,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, gri.dh = p->dh; gri.clientData = clientData; - yaz_log(LOG_DEBUG, "grs_retrieve"); + yaz_log(YLOG_DEBUG, "grs_retrieve"); node = (*grs_read)(&gri); if (!node) { @@ -1056,15 +1058,12 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, } data1_concat_text(p->dh, mem, node); - /* ensure our data1 tree is UTF-8 */ - data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node)); - #if 0 data1_pr_tree (p->dh, node, stdout); #endif top = data1_get_root_tag (p->dh, node); - yaz_log(LOG_DEBUG, "grs_retrieve: size"); + yaz_log(YLOG_DEBUG, "grs_retrieve: size"); tagname = data1_systag_lookup(node->u.root.absyn, "size", "size"); if (tagname && (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) @@ -1079,7 +1078,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, if (tagname && p->score >= 0 && (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) { - yaz_log(LOG_DEBUG, "grs_retrieve: %s", tagname); + yaz_log(YLOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_num; dnew->u.data.data = dnew->lbuf; sprintf(dnew->u.data.data, "%d", p->score); @@ -1091,7 +1090,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, if (tagname && p->localno > 0 && (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) { - yaz_log(LOG_DEBUG, "grs_retrieve: %s", tagname); + yaz_log(YLOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_text; dnew->u.data.data = dnew->lbuf; @@ -1105,7 +1104,6 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, #if 0 data1_pr_tree (p->dh, node, stdout); #endif -#if YAZ_VERSIONL >= 0x010903L if (p->comp && p->comp->which == Z_RecordComp_complex && p->comp->u.complex->generic && p->comp->u.complex->generic->which == Z_Schema_oid && @@ -1115,22 +1113,12 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, if (oe) requested_schema = oe->value; } -#else - if (p->comp && p->comp->which == Z_RecordComp_complex && - p->comp->u.complex->generic && p->comp->u.complex->generic->schema) - { - oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema); - if (oe) - requested_schema = oe->value; - } -#endif - /* If schema has been specified, map if possible, then check that * we got the right one */ if (requested_schema != VAL_NONE) { - yaz_log(LOG_DEBUG, "grs_retrieve: schema mapping"); + yaz_log(YLOG_DEBUG, "grs_retrieve: schema mapping"); for (map = node->u.root.absyn->maptabs; map; map = map->next) { if (map->target_absyn_ref == requested_schema) @@ -1158,7 +1146,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, * the overlap of schema and formatting which is inherent in the MARC * family) */ - yaz_log(LOG_DEBUG, "grs_retrieve: syntax mapping"); + yaz_log(YLOG_DEBUG, "grs_retrieve: syntax mapping"); if (node->u.root.absyn) for (map = node->u.root.absyn->maptabs; map; map = map->next) { @@ -1174,7 +1162,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, break; } } - yaz_log(LOG_DEBUG, "grs_retrieve: schemaIdentifier"); + yaz_log(YLOG_DEBUG, "grs_retrieve: schemaIdentifier"); if (node->u.root.absyn && node->u.root.absyn->reference != VAL_NONE && p->input_format == VAL_GRS1) @@ -1212,8 +1200,9 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, } } - yaz_log(LOG_DEBUG, "grs_retrieve: element spec"); - if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0) + yaz_log(YLOG_DEBUG, "grs_retrieve: element spec"); + if (p->comp && (res = process_comp(p->dh, node, p->comp, &p->addinfo, + p->odr)) > 0) { p->diagnostic = res; if (onode) @@ -1228,18 +1217,18 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, #if 0 data1_pr_tree (p->dh, node, stdout); #endif - yaz_log(LOG_DEBUG, "grs_retrieve: transfer syntax mapping"); + yaz_log(YLOG_DEBUG, "grs_retrieve: transfer syntax mapping"); switch (p->output_format = (p->input_format != VAL_NONE ? p->input_format : VAL_SUTRS)) { case VAL_TEXT_XML: - #if 0 data1_pr_tree (p->dh, node, stdout); #endif - - if (p->encoding) - data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); + /* default output encoding for XML is UTF-8 */ + data1_iconv (p->dh, mem, node, + p->encoding ? p->encoding : "UTF-8", + data1_get_encoding(p->dh, node)); if (!(p->rec_buf = data1_nodetoidsgml(p->dh, node, selected, &p->rec_len))) @@ -1252,6 +1241,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, } break; case VAL_GRS1: + data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node)); dummy = 0; if (!(p->rec_buf = data1_nodetogr(p->dh, node, selected, p->odr, &dummy))) @@ -1260,6 +1250,9 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, p->rec_len = (size_t) (-1); break; case VAL_EXPLAIN: + /* ensure our data1 tree is UTF-8 */ + data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node)); + if (!(p->rec_buf = data1_nodetoexplain(p->dh, node, selected, p->odr))) p->diagnostic = 238; @@ -1267,6 +1260,8 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, p->rec_len = (size_t) (-1); break; case VAL_SUMMARY: + /* ensure our data1 tree is UTF-8 */ + data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node)); if (!(p->rec_buf = data1_nodetosummary(p->dh, node, selected, p->odr))) p->diagnostic = 238; @@ -1274,8 +1269,9 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, p->rec_len = (size_t) (-1); break; case VAL_SUTRS: - if (p->encoding) - data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, + data1_get_encoding(p->dh, node)); if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, &p->rec_len))) p->diagnostic = 238; @@ -1287,6 +1283,9 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, } break; case VAL_SOIF: + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, + data1_get_encoding(p->dh, node)); if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected, &p->rec_len))) p->diagnostic = 238; @@ -1312,8 +1311,9 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, p->diagnostic = 238; break; } - if (p->encoding) - data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, + data1_get_encoding(p->dh, node)); if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, selected, &p->rec_len))) p->diagnostic = 238;