X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=1cd8151952ebcca9f370e0f43991aef3b603a3ee;hb=a7b235097c10590dde6dfa1859590d4c4e930366;hp=612da4140310675cd41ffaad35635d7a555f8039;hpb=5f2823e584b4b138886c985bc1490b35aa6cdd4c;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 612da41..1cd8151 100644
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.9  1995-06-06 08:15:19  quinn
+ * Revision 1.12  1995-06-15 07:44:57  quinn
+ * Moving to v3.
+ *
+ * Revision 1.11  1995/06/14  15:26:40  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.10  1995/06/06  14:56:58  quinn
+ * Better diagnostics.
+ *
+ * Revision 1.9  1995/06/06  08:15:19  quinn
  * Cosmetic.
  *
  * Revision 1.8  1995/06/05  10:52:22  quinn
@@ -65,8 +74,6 @@
 #endif
 #endif
 
-#include "../version.h"
-
 #define C_PROMPT "Z> "
 
 static ODR out, in, print;              /* encoding and decoding streams */
@@ -292,13 +299,27 @@ void display_record(Z_DatabaseRecord *p)
 static void display_diagrec(Z_DiagRec *p)
 {
     oident *ent;
+#ifdef Z_95
+    Z_DefaultDiagFormat *r;
+#else
+    Z_DiagRec *r = p;
+#endif
 
     printf("Diagnostic message from database.\n");
-    if (!(ent = oid_getentbyoid(p->diagnosticSetId)) ||
+#ifdef Z_95
+    if (p->which != Z_DiagRec_defaultFormat)
+    {
+    	printf("Diagnostic record not in default format.\n");
+	return;
+    }
+    else
+    	r = p->u.defaultFormat;
+#endif
+    if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
     	ent->class != CLASS_DIAGSET || ent->value != VAL_BIB1)
     	printf("Missing or unknown diagset\n");
-    printf("Error condition: %d", *p->condition);
-    printf(" -- %s\n", p->addinfo ? p->addinfo : "");
+    printf("Error condition: %d", *r->condition);
+    printf(" -- %s\n", r->addinfo ? r->addinfo : "");
 }
 
 static void display_nameplusrecord(Z_NamePlusRecord *p)
@@ -414,7 +435,7 @@ static int send_searchRequest(char *arg)
 
 static int process_searchResponse(Z_SearchResponse *res)
 {
-    if (res->searchStatus)
+    if (*res->searchStatus)
 	printf("Search was a success.\n");
     else
 	printf("Search was a bloomin' failure.\n");
@@ -642,11 +663,11 @@ int cmd_scan(char *arg)
     }
     if (*arg)
     {
-    	if (send_scanrequest(arg, 5, 19) < 0)
+    	if (send_scanrequest(arg, 5, 20) < 0)
 	    return 0;
     }
     else
-    	if (send_scanrequest(last_scan, 1, 19) < 0)
+    	if (send_scanrequest(last_scan, 1, 20) < 0)
 	    return 0;
     return 2;
 }