X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frpn2solr.c;h=70b2f6c642a4054a9b52d10b58070d01a032122b;hp=de485ab13a19733f50f25518a7725effabdc1c4a;hb=12ab7a040623d875c3e324e6a1df20652087b551;hpb=24a717fb09063be70ff56dc82e9f03e7673254e0 diff --git a/src/rpn2solr.c b/src/rpn2solr.c index de485ab..70b2f6c 100644 --- a/src/rpn2solr.c +++ b/src/rpn2solr.c @@ -1,13 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ - /** * \file * \brief Implements RPN to SOLR conversion - * */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -183,7 +184,10 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes) if (truncation <= 3) return ((int) truncation & flag); } - /* Complex: Shouldn't happen */ + else if (ae->which == Z_AttributeValue_complex) { + //yaz_log(YLOG_DEBUG, "Z_Attribute_complex"); + /* Complex: Shouldn't happen */ + } } } /* No truncation or unsupported */ @@ -191,11 +195,11 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes) }; static int checkForLeftTruncation(Z_AttributeList *attributes) { - return checkForTruncation(1, attributes); + return checkForTruncation(2, attributes); } static int checkForRightTruncation(Z_AttributeList *attributes) { - return checkForTruncation(2, attributes); + return checkForTruncation(1, attributes); }; static int rpn2solr_simple(solr_transform_t ct, @@ -241,6 +245,7 @@ static int rpn2solr_simple(solr_transform_t ct, { size_t i; int must_quote = 0; + for (i = 0 ; i < lterm; i++) if (sterm[i] == ' ') must_quote = 1; @@ -249,7 +254,13 @@ static int rpn2solr_simple(solr_transform_t ct, /* Bug 2878: Check and add Truncation */ if (checkForLeftTruncation(apt->attributes)) wrbuf_puts(w, "*"); - wrbuf_write(w, sterm, lterm); + for (i = 0 ; i < lterm; i++) { + /* BUG 4415: Escape special characters in string terms */ + if (strchr("+-&|!(){}[]^\"~*?:\\", sterm[i])) { + wrbuf_putc(w, '\\'); + } + wrbuf_putc(w, sterm[i]); + } /* Bug 2878: Check and add Truncation */ if (checkForRightTruncation(apt->attributes)) wrbuf_puts(w, "*");