Possible compatibility problems with earlier versions marked with '*'.
-<<<<<<< 1.43
-=======
--- XXXXXXXXXXXXX
Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
->>>>>>> /tmp/T4a00109
+Added SOIF syntax (using private OID for now) to retrieval module and client.
+
--- 1.2 1996/6/10 (1st anniversary release)
Added Summary record syntax. Lightly tested.
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.29 1996-05-22 08:35:24 adam Exp $
+# $Id: Makefile,v 1.30 1996-10-07 15:28:56 quinn Exp $
# Uncomment the lines below to enable mOSI communcation.
#ODEFS=-DUSE_XTIMOSI
#LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
#XMOSI=xmosi.o
-CDEFS=$(ODEFS)
+CDEFS=$(ODEFS)
#CC=
SHELL=/bin/sh
MAKE=make
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.10 1996-05-22 08:35:43 adam Exp $
+# $Id: Makefile,v 1.11 1996-10-07 15:29:01 quinn Exp $
LIBDIR=../lib
$(PROG): $(LIB) $(PROGO)
$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
+qparser: qparser.o
+ $(CC) $(CFLAGS) $(LIBINCLUDE) -o qparser qparser.o $(LIBS)
+
alll:
$(LIBDIR):
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.40 1996-08-29 14:19:34 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
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)
{
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");
return 1;
}
else if (!strcmp(arg, "grs1"))
+>>>>>>> /tmp/T4a00171
{
- printf("Preferred format is GRS1\n");
- recordsyntax = VAL_GRS1;
+ printf("Preferred format is SOIF\n");
+ recordsyntax = VAL_SOIF;
return 1;
}
else if (!strcmp(arg, "summary"))