X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frpn2solr.c;fp=src%2Frpn2solr.c;h=221e64bdfde80377bd59910f9a07838b27ed0949;hp=076e3a9f83043309f38862573e2234e13812cdde;hb=3177bd5bc45eb8d42f0c6ffd3dbe97c1c0f4054f;hpb=744a00b201a04b308f22fad1ece422b97d2cdd50 diff --git a/src/rpn2solr.c b/src/rpn2solr.c index 076e3a9..221e64b 100644 --- a/src/rpn2solr.c +++ b/src/rpn2solr.c @@ -159,12 +159,12 @@ static int rpn2solr_attr(solr_transform_t ct, solr_attr->close = "]"; } else if (!strcmp(relation, "ge")) { - solr_attr->is_range = 3; + solr_attr->is_range = 4; solr_attr->begin = "["; solr_attr->close = " TO *]"; } else if (!strcmp(relation, ">")) { - solr_attr->is_range = 4; + solr_attr->is_range = 5; solr_attr->begin = "{"; solr_attr->close = " TO *]"; } @@ -353,9 +353,9 @@ static int solr_write_and_or_range(void (*pr)(const char *buf, void *client_data solr_attr_right->is_range && !strcmp(solr_attr_left->index, solr_attr_right->index)) { - if (solr_attr_left->is_range >= 3 && solr_attr_right->is_range <= 2) + if (solr_attr_left->is_range > 3 && solr_attr_right->is_range < 3) return solr_write_range(pr, client_data, solr_attr_left, solr_attr_right); - else if (solr_attr_left->is_range <= 2 && solr_attr_right->is_range >= 2) + else if (solr_attr_left->is_range < 3 && solr_attr_right->is_range > 3) return solr_write_range(pr, client_data, solr_attr_right, solr_attr_left); } solr_write_structure(pr, client_data, solr_attr_left);