From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Sep 2013 11:15:43 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~42
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=1f5e4f24c6e51d741e15317348bc7aef05fcc7ab

Merge branch 'master' into sru_2_0

Conflicts:
	src/rpn2solr.c
---

1f5e4f24c6e51d741e15317348bc7aef05fcc7ab
diff --cc src/rpn2solr.c
index 085de95,c72b11a..c7dff45
--- a/src/rpn2solr.c
+++ b/src/rpn2solr.c
@@@ -210,10 -231,10 +231,9 @@@ static int rpn2solr_simple(solr_transfo
          const char *sterm = 0;
          size_t lterm = 0;
          Odr_int trunc = get_truncation(apt);
-         char *close_range = 0;
  
          wrbuf_rewind(w);
-         ret = rpn2solr_attr(ct, apt->attributes, w, &close_range);
 -        
+         ret = rpn2solr_attr(ct, apt->attributes, w, solr_attr);
  
          if (trunc == 0 || trunc == 1 || trunc == 100 || trunc == 104)
              ;