Changeset 2650

Timestamp:

2001-07-12T15:33:16+12:00 (23 years ago)

Author:

jrm21

Message:

added an error check - now returns an error string for some errors instead of
continuing (and later causing problems).

File:

• trunk/gsdl/packages/yaz/client/yaz_zclient.c (modified) (2 diffs)

trunk/gsdl/packages/yaz/client/yaz_zclient.c

@@ -5 +5 @@
  *
  * $Log$
+ * Revision 1.4  2001/07/12 03:33:16  jrm21
+ * added an error check - now returns an error string for some errors instead of
+ * continuing (and later causing problems).
+ *
  * Revision 1.3  2001/06/13 04:22:26  jrm21
  * don't add <a href> tags for USMARC field 856 (online access), as it is not
@@ -1926 +1930 @@
   /* just do some double checking */
   if (*apdu->u.presentResponse->numberOfRecordsReturned!=1 ||
-      !apdu->u.presentResponse->records ||
-      apdu->u.presentResponse->records->which!=Z_Records_DBOSD) {
+      !apdu->u.presentResponse->records ) {
     /* something bad has happened... johnmcp */
     fprintf (stderr,"Error occured in yaz while getting record (GSDL)\n");
+  }
+
+  switch (apdu->u.presentResponse->records->which) {
+  case Z_Records_DBOSD: break; /* do nothing - this is a record */
+
+    /* otherwise we got a diagnostic message... */
+  case Z_Records_NSD:
+    switch (apdu->u.presentResponse->records->u.nonSurrogateDiagnostic->which){
+      /* these are both represented as char* in yaz, so either is OK */
+      /*    case Z_DefaultDiagForm_v2Addinfo:
+        case Z_DefaultDiagForm_v3Addinfo: --wrong names*/
+    case Z_DiagnosticFormat_s_defaultDiagRec:
+    case Z_DiagnosticFormat_s_explicitDiagnostic:
+      return apdu->u.presentResponse->records->u.nonSurrogateDiagnostic
+    ->u.v2Addinfo; /* return the error message */
+    default: ; /* this should happen for v3 of the spec... */
+    }
+  case Z_Records_multipleNSD: ; /* should handle one day... */
   }