X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsolrtransform.c;h=2d8743b1752ec2c2ebb4529a21b8c806e5d2d92c;hb=70167dec477969519b27873537a7d9d7d7e686c1;hp=7e545196b25ba9a1829ffa43ea3ffe47f6a562d5;hpb=77c5a4fca8b516fd39b8ba213daed17a465a6b2a;p=yaz-moved-to-github.git diff --git a/src/solrtransform.c b/src/solrtransform.c index 7e54519..2d8743b 100644 --- a/src/solrtransform.c +++ b/src/solrtransform.c @@ -522,8 +522,7 @@ static int solr_pr_prox(solr_transform_t ct, struct solr_node *mods, void *client_data) { int exclusion = 0; - int distance; /* to be filled in later depending on unit */ - int distance_defined = 0; + int distance = -1; int ordered = 0; int proxrel = 2; /* less than or equal */ int unit = 2; /* word */ @@ -536,7 +535,6 @@ static int solr_pr_prox(solr_transform_t ct, struct solr_node *mods, if (!strcmp(name, "distance")) { distance = strtol(term, (char**) 0, 0); - distance_defined = 1; if (!strcmp(relation, "=")) proxrel = 3; else if (!strcmp(relation, ">")) @@ -586,7 +584,7 @@ static int solr_pr_prox(solr_transform_t ct, struct solr_node *mods, mods = mods->u.st.modifiers; } - if (!distance_defined) + if (distance == -1) distance = (unit == 2) ? 1 : 0; solr_pr_int(exclusion, pr, client_data);