Work

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

diff --git a/client/client.c b/client/client.c
index c8a1d73..943fd7b 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.39  1996-08-27 10:43:22  quinn
+ * Revision 1.41  1996-10-07 15:29:03  quinn
+ * Work
+ *
+ * Revision 1.40  1996/08/29  14:19:34  quinn
+ * Fixed conflict (CVS)
+ *
+ * Revision 1.39  1996/08/27  10:43:22  quinn
  * Made select() optional
  *
  * Revision 1.38  1996/08/12  14:09:11  adam
@@ -482,7 +488,9 @@ static void display_record(Z_DatabaseRecord *p)
            r->which = type->what;
        }
     }
-    if (r->which == Z_External_octet && p->u.octet_aligned->len)
+    if (ent->value == VAL_SOIF)
+        printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf);
+    else if (r->which == Z_External_octet && p->u.octet_aligned->len)
         marc_display ((char*)p->u.octet_aligned->buf, stdout);
     else if (ent->value == VAL_SUTRS)
     {
@@ -992,12 +1000,30 @@ int cmd_format(char *arg)
         recordsyntax = VAL_DANMARC;
         return 1;
     }
+<<<<<<< client.c
     else if (!strcmp(arg, "grs1"))
     {
         printf("Preferred format is GRS1\n");
         recordsyntax = VAL_GRS1;
         return 1;
     }
+    else if (!strcmp(arg, "soif"))
+||||||| 1.40
+    else if (!strcmp(arg, "grs1"))
+=======
+    else if (!strcmp(arg, "ukmarc"))
+    {
+        printf("Preferred format is UKMARC\n");
+        recordsyntax = VAL_UKMARC;
+        return 1;
+    }
+    else if (!strcmp(arg, "grs1"))
+>>>>>>> /tmp/T4a00171
+    {
+        printf("Preferred format is SOIF\n");
+        recordsyntax = VAL_SOIF;
+        return 1;
+    }
     else if (!strcmp(arg, "summary"))
     {
         printf("Preferred format is Summary\n");
@@ -1012,7 +1038,7 @@ int cmd_format(char *arg)
     }
     else
     {
-        printf("Specify one of {sutrs,usmarc,danmarc,grs1,summary,explain}.\n");
+        printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n");
         return 0;
     }
 }