Merge branch 'yaz-621-optimized'

diff --combined src/rpn2solr.c
index c72b11a,7fe0797..5047d4b
--- 1/src/rpn2solr.c
--- 2/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:
@@@ -386,22 -386,23 +386,22 @@@ static int rpn2solr_structure(solr_tran
      {
          Z_Operator *op = q->u.complex->roperator;
          int r;
 +        struct solr_attr solr_attr_left, solr_attr_right;
 +        WRBUF w_left = wrbuf_alloc();
 +        WRBUF w_right = wrbuf_alloc();
  
          if (nested)
              pr("(", client_data);
  
 -        struct solr_attr solr_attr_left;
          solr_attr_init(&solr_attr_left);
 -        WRBUF w_left = wrbuf_alloc();
 -        r = rpn2solr_structure(ct, pr, client_data, q->u.complex->s1, 1, w_left, &solr_attr_left); 
 +        r = rpn2solr_structure(ct, pr, client_data, q->u.complex->s1, 1, w_left, &solr_attr_left);
  
  
          if (r) {
              wrbuf_destroy(w_left);
              return r;
 -        }       
 -        struct solr_attr solr_attr_right;
 +        }
          solr_attr_init(&solr_attr_right);
 -        WRBUF w_right = wrbuf_alloc();
  
          r = rpn2solr_structure(ct, pr, client_data, q->u.complex->s2, 1, w_right, &solr_attr_right);
          if (r) {
@@@ -409,7 -410,7 +409,7 @@@
              wrbuf_destroy(w_right);
              return r;
          }
 -            
 +
          switch(op->which)
          {
          case  Z_Operator_and:
@@@ -449,8 -450,8 +449,8 @@@ int solr_transform_rpn2solr_stream(solr
  {
      int r;
      WRBUF w = wrbuf_alloc();
 -    solr_transform_set_error(ct, 0, 0);
      struct solr_attr solr_attr;
 +    solr_transform_set_error(ct, 0, 0);
      solr_attr_init(&solr_attr);
      r = rpn2solr_structure(ct, pr, client_data, q->RPNStructure, 0, w, &solr_attr);
      solr_write_structure(pr, client_data, &solr_attr);