X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fretrieval.c;h=6b64b9280c606a1b96df47e7dbdd44fab479c03b;hb=e4ef95b2ccfe88d7049543664f00e5fda957dd0c;hp=eecea4c1cef4d7c92d89b22a701ef6b6b741c7b4;hpb=ca44977409b92a8b1c7bfbc913a6422edc41d1d5;p=yaz-moved-to-github.git diff --git a/src/retrieval.c b/src/retrieval.c index eecea4c..6b64b92 100644 --- a/src/retrieval.c +++ b/src/retrieval.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 2005-2006, Index Data ApS + * Copyright (C) 2005-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: retrieval.c,v 1.13 2006-12-12 10:41:38 marc Exp $ + * $Id: retrieval.c,v 1.16 2007-02-04 02:24:56 quinn Exp $ */ /** * \file retrieval.c @@ -166,8 +166,9 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) el->record_conv = 0; /* OK to have no 'backend' sub content */ for (ptr = ptr->children; ptr; ptr = ptr->next) { - if (ptr->type == XML_ELEMENT_NODE - && 0 != strcmp((const char *) ptr->name, "backend")){ + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (strcmp((const char *) ptr->name, "backend")){ wrbuf_printf(p->wr_error, "Element : expected" " zero or one element , got <%s>", (const char *) ptr->name); @@ -234,10 +235,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) return 0; } -int yaz_retrieval_configure(yaz_retrieval_t p, const void *ptr_v) +int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr) { - const xmlNode *ptr = ptr_v; - yaz_retrieval_reset(p); if (ptr && ptr->type == XML_ELEMENT_NODE &&