X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcclxmlconfig.c;h=7d205bbfca09ac17efa3cc916c97355259b32a3c;hb=3498164f9058a807e5e25de88ecce61b97df2d14;hp=321073b1862113dc9d45e3ed2cf87268421d9913;hpb=bc1bdc891836da144db8108bc062d30dbb922f8b;p=yaz-moved-to-github.git diff --git a/src/cclxmlconfig.c b/src/cclxmlconfig.c index 321073b..7d205bb 100644 --- a/src/cclxmlconfig.c +++ b/src/cclxmlconfig.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS - * All rights reserved. - * - * $Id: cclxmlconfig.c,v 1.1 2007-01-08 13:20:58 adam Exp $ +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data + * See the file LICENSE for details. */ /** \file cclxmlconfig.c @@ -17,7 +15,7 @@ #if YAZ_HAVE_XML2 -static int ccl_xml_config_attr(CCL_bibset bibset, const char *default_set, +static int ccl_xml_config_attr(const char *default_set, WRBUF wrbuf, const xmlNode *ptr, const char **addinfo) @@ -91,7 +89,7 @@ static int ccl_xml_config_qual(CCL_bibset bibset, const char *default_set, { if (!xmlStrcmp(a_ptr->name, BAD_CAST "attr")) { - int r = ccl_xml_config_attr(bibset, default_set, wrbuf, + int r = ccl_xml_config_attr(default_set, wrbuf, a_ptr, addinfo); if (r) return r; @@ -193,18 +191,14 @@ int ccl_xml_config(CCL_bibset bibset, const xmlNode *ptr, const char **addinfo) } return 0; } -#else -int ccl_xml_config(CCL_bibset bibset, const xmlNode *ptr, const char **addinfo) -{ - *addinfo = "CCL XML configuration not supported. Libxml2 is disabled"; - return -1; -} #endif /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +