yaz-client: no extra blanks for searchResult-1 display

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 351594e..4cf2207 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -284,7 +284,6 @@ int send_apdu(Z_APDU *a)
     buf = odr_getbuf(out, &len, 0);
     if (ber_file)
         odr_dumpBER(ber_file, buf, len);
-    /* printf ("sending APDU of size %d\n", len); */
     do_hex_dump(buf, len);
     if (cs_put(conn, buf, len) < 0)
     {
@@ -1662,16 +1661,16 @@ static void display_term(Z_Term *term)
     switch (term->which)
     {
     case Z_Term_general:
-        printf("    %.*s", term->u.general->len, term->u.general->buf);
+        printf("%.*s", term->u.general->len, term->u.general->buf);
         break;
     case Z_Term_characterString:
-        printf("    %s", term->u.characterString);
+        printf("%s", term->u.characterString);
         break;
     case Z_Term_numeric:
-        printf("    " ODR_INT_PRINTF, *term->u.numeric);
+        printf(ODR_INT_PRINTF, *term->u.numeric);
         break;
     case Z_Term_null:
-        printf("    null");
+        printf("null");
         break;
     }
 }
@@ -1711,6 +1710,7 @@ static void display_facet(Z_FacetField *facet)
             for (term_index = 0 ; term_index < facet->num_terms; term_index++)
             {
                 Z_FacetTerm *facetTerm = facet->terms[term_index];
+                printf("    ");
                 display_term(facetTerm->term);
                 printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
             }
@@ -4349,9 +4349,8 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
     }
     if (res->numberOfRecords)
         printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
-    if (res->facetList) {
+    if (res->facetList)
         display_facets(res->facetList);
-    }
     for (i = 0; i<res->num_records; i++)
         handle_srw_record(res->records + i);
 }