X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fxpath.c;h=6751b9bcc5a03cfc70d0a3c5acda5c1c2ecc1109;hp=ab75d585aa0148e7c4535699f03bb5344ae014f7;hb=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1;hpb=a66b7d79383ae700f3358731eecfe2aafed0e90d diff --git a/util/xpath.c b/util/xpath.c index ab75d58..6751b9b 100644 --- a/util/xpath.c +++ b/util/xpath.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2010 Index Data + Copyright (C) Index Data Zebra 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 @@ -18,6 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -119,13 +122,13 @@ static struct xpath_predicate *get_xpath_boolean(char **pr, NMEM mem, char **look, int *literal) { struct xpath_predicate *left = 0; - + left = get_xpath_relation(pr, mem, look, literal); if (!left) return 0; - + while (*look && !*literal && - (!strcmp(*look, "and") || !strcmp(*look, "or") || + (!strcmp(*look, "and") || !strcmp(*look, "or") || !strcmp(*look, "not"))) { struct xpath_predicate *res, *right; @@ -161,13 +164,13 @@ int zebra_parse_xpath_str(const char *xpath_string, { const char *cp; char *a; - + int no = 0; - + if (!xpath_string || *xpath_string != '/') return -1; cp = xpath_string; - + while (*cp && no < max) { int i = 0; @@ -215,7 +218,7 @@ void dump_xp_predicate (struct xpath_predicate *p) if (p) { if (p->which == XPATH_PREDICATE_RELATION && p->u.relation.name[0]) { - fprintf (stderr, "%s,%s,%s", + fprintf (stderr, "%s,%s,%s", p->u.relation.name, p->u.relation.op, p->u.relation.value);