Boolrean and rather than bitwise and

[yaz-moved-to-github.git] / zoom / zoom-benchmark.c

diff --git a/zoom/zoom-benchmark.c b/zoom/zoom-benchmark.c
index ca6a5b4..5a0517c 100644 (file)
--- a/zoom/zoom-benchmark.c
+++ b/zoom/zoom-benchmark.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoom-benchmark.c,v 1.5 2005-09-15 10:38:03 marc Exp $
+ * $Id: zoom-benchmark.c,v 1.7 2005-09-16 07:05:46 adam Exp $
  *
  * Asynchronous multi-target client doing search and piggyback retrieval
  */
@@ -204,7 +204,7 @@ int main(int argc, char **argv)
         r[i] = ZOOM_connection_search_pqf (z[i], parameters.query);
 
     // print header of table
-    printf ("second.usec\ttarget\tprogress\tevent\teventname\t");
+    printf ("target\tsecond.usec\tprogress\tevent\teventname\t");
     printf("error\terrorname\n");
     time_init(&time);
     /* network I/O. pass number of connections and array of connections */
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
         int error = 0;
         int progress = zoom_progress[event];
 
-        if (event == ZOOM_EVENT_SEND_DATA | event == ZOOM_EVENT_RECV_DATA)
+        if (event == ZOOM_EVENT_SEND_DATA || event == ZOOM_EVENT_RECV_DATA)
             continue;
  
 
@@ -228,9 +228,9 @@ int main(int argc, char **argv)
         else
             parameters.progress[i] += 1;
 
-        printf ("%ld.%06ld\t%d\t%d\t%d\t%s\t%d\t%s\n",
-                time_sec(&time), time_usec(&time), 
-                i-1, parameters.progress[i],
+        printf ("%d\t%ld.%06ld\t%d\t%d\t%s\t%d\t%s\n",
+                i-1, time_sec(&time), time_usec(&time), 
+                parameters.progress[i],
                 event, zoom_events[event], 
                 error, errmsg);