X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frpn2solr.c;h=4a2c5e42c4e2286d2d44069e915badd662441105;hb=a7585fd1220c684189091e7fba2c5d6cf436031e;hp=7fe0797a518bceaed376e1ba300bd782415ac696;hpb=883245e48ad6e5735ab73884e18dc6cb5c297c86;p=yaz-moved-to-github.git

diff --git a/src/rpn2solr.c b/src/rpn2solr.c
index 7fe0797..4a2c5e4 100644
--- a/src/rpn2solr.c
+++ b/src/rpn2solr.c
@@ -233,7 +233,6 @@ static int rpn2solr_simple(solr_transform_t ct,
         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)
@@ -386,23 +385,22 @@ static int rpn2solr_structure(solr_transform_t ct,
     {
         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) {
@@ -410,7 +408,7 @@ static int rpn2solr_structure(solr_transform_t ct,
             wrbuf_destroy(w_right);
             return r;
         }
-            
+
         switch(op->which)
         {
         case  Z_Operator_and:
@@ -450,8 +448,8 @@ int solr_transform_rpn2solr_stream(solr_transform_t ct,
 {
     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);