/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 Index Data
Pazpar2 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
*/
-/* $Id: config.c,v 1.42 2007-10-31 05:29:08 quinn Exp $ */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
-#if HAVE_CONFIG_H
-#include <cconfig.h>
-#endif
-
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
#include <yaz/snprintf.h>
}
return -1;
-};
+}
int conf_service_sortkey_field_id(struct conf_service *service,
}
return -1;
-};
+}
xmlFree(xml_type);
xmlFree(xml_termlist);
xmlFree(xml_rank);
+ xmlFree(xml_setting);
md_node++;
}
else
}
else if (!strcmp((const char *) n->name, "relevance"))
{
- server->relevance_pct = pp2_charset_create_xml(n->children);
+ server->relevance_pct = pp2_charset_create_xml(n);
+ if (!server->relevance_pct)
+ return 0;
}
else if (!strcmp((const char *) n->name, "sort"))
{
- server->sort_pct = pp2_charset_create_xml(n->children);
+ server->sort_pct = pp2_charset_create_xml(n);
+ if (!server->sort_pct)
+ return 0;
}
else if (!strcmp((const char *) n->name, "mergekey"))
{
- server->mergekey_pct = pp2_charset_create_xml(n->children);
+ server->mergekey_pct = pp2_charset_create_xml(n);
+ if (!server->mergekey_pct)
+ return 0;
}
else if (!strcmp((const char *) n->name, "service"))
{
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+