projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using the ICU wrapper from YAZ rather than its own.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
ca7490d
..
ef6f2e4
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-17,7
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
-/* $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 <string.h>
@@
-27,10
+29,6
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <libxslt/transform.h>
#include <libxslt/xsltutils.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>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
#include <yaz/snprintf.h>
@@
-178,7
+176,7
@@
int conf_service_metadata_field_id(struct conf_service *service,
}
return -1;
}
return -1;
-};
+}
int conf_service_sortkey_field_id(struct conf_service *service,
int conf_service_sortkey_field_id(struct conf_service *service,
@@
-195,7
+193,7
@@
int conf_service_sortkey_field_id(struct conf_service *service,
}
return -1;
}
return -1;
-};
+}
@@
-386,6
+384,7
@@
static struct conf_service *parse_service(xmlNode *node)
xmlFree(xml_type);
xmlFree(xml_termlist);
xmlFree(xml_rank);
xmlFree(xml_type);
xmlFree(xml_termlist);
xmlFree(xml_rank);
+ xmlFree(xml_setting);
md_node++;
}
else
md_node++;
}
else
@@
-472,15
+471,21
@@
static struct conf_server *parse_server(xmlNode *node)
}
else if (!strcmp((const char *) n->name, "relevance"))
{
}
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"))
{
}
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"))
{
}
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"))
{
}
else if (!strcmp((const char *) n->name, "service"))
{