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

Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
---

9bca108ddbc555efaffb85dda76581eaeed44b4e
diff --combined debian/changelog
index d8299ee,5c585f8..c1701b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +yaz (5.0.0-1indexdata) unstable; urgency=low
 +
 +  * Version 5.
 +
 + -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 09:26:11 +0200
 +
+ yaz (4.2.66-1indexdata) unstable; urgency=low
+ 
+   * Upstream.
+ 
+  -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 15:07:49 +0200
+ 
  yaz (4.2.65-1indexdata) unstable; urgency=low
  
    * Upstream.
diff --combined src/rpn2solr.c
index c7dff45,5047d4b..4a2c5e4
--- a/src/rpn2solr.c
+++ b/src/rpn2solr.c
@@@ -69,15 -69,15 +69,15 @@@ static const char *lookup_relation_inde
                  {
                      /* Unsure on whether this is the relation attribute constants? */
                  case Z_ProximityOperator_Prox_lessThan:
-                     return 0;
+                     return "<";
                  case Z_ProximityOperator_Prox_lessThanOrEqual:
-                     return 0;
+                     return "le";
                  case Z_ProximityOperator_Prox_equal:
                      return ":";
                  case Z_ProximityOperator_Prox_greaterThanOrEqual:
-                     return 0;
+                     return "ge";
                  case Z_ProximityOperator_Prox_greaterThan:
-                     return 0;
+                     return ">";
                  case Z_ProximityOperator_Prox_notEqual:
                      return 0;
                  case 100:
@@@ -233,6 -233,7 +233,6 @@@ static int rpn2solr_simple(solr_transfo
          Odr_int trunc = get_truncation(apt);
  
          wrbuf_rewind(w);
 -        
          ret = rpn2solr_attr(ct, apt->attributes, w, solr_attr);
  
          if (trunc == 0 || trunc == 1 || trunc == 100 || trunc == 104)