Possible compatibility problems with earlier versions marked with '*'.
+<<<<<<< 1.45
+<<<<<<< 1.43
+=======
+=======
+>>>>>>> /tmp/T4a02877
--- XXXXXXXXXXXXX
+<<<<<<< CHANGELOG
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+
+<<<<<<< CHANGELOG
+Smallish bug-fixes in the new encoders/decoders (explain).
+
+Bug (stupid) fixed in DeleteRequest.
+||||||| 1.46
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+=======
Fixed tagging bug of type 101 query in SearchRequest-Query PDU encoder/decoder.
Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+>>>>>>> /tmp/T4a18297
+||||||| 1.45
+>>>>>>> /tmp/T4a00109
+=======
Added SOIF syntax (using private OID for now) to retrieval module and client.
+>>>>>>> /tmp/T4a02877
--- 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.23 1996-06-10 08:53:31 quinn Exp $
+# $Id: Makefile,v 1.24 1996-10-09 15:54:54 quinn Exp $
SHELL=/bin/sh
INCLUDE=-I../include -I.
LIB=$(LIBDIR)/libasn.a
LIBS=-lodr -lasn
PO = proto.o diagbib1.o zget.o prt-rsc.o prt-acc.o prt-exp.o prt-ext.o \
- prt-grs.o prt-exd.o prt-dia.o prt-esp.o prt-arc.o
+ prt-grs.o prt-exd.o prt-dia.o prt-esp.o prt-arc.o prt-add.o
CPP=$(CC) -E
RANLIB=ranlib
- /*
+/*
* Copyright (c) 1995, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.52 1996-10-08 12:56:57 adam
+ * Revision 1.53 1996-10-09 15:54:55 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.52 1996/10/08 12:56:57 adam
* Bug fix: tagging of type 101 query.
*
* Revision 1.51 1996/07/26 14:07:21 quinn
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->deleteFunction, ODR_CONTEXT, 32,
0) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->resultSetList,
+ (odr_sequence_of(o, z_ResultSetId, &(*p)->resultSetList,
&(*p)->num_ids) || odr_ok(o)) &&
#ifdef Z_95
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-ext.c,v $
- * Revision 1.9 1996-06-10 08:53:36 quinn
+ * Revision 1.10 1996-10-09 15:54:55 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.9 1996/06/10 08:53:36 quinn
* Added Summary,OPAC,ResourceReport
*
* Revision 1.8 1996/02/20 12:51:44 quinn
{VAL_ESPEC1, Z_External_espec1, z_Espec1},
{VAL_SUMMARY, Z_External_summary, z_BriefBib},
{VAL_OPAC, Z_External_OPAC, z_OPACRecord},
+ {VAL_SEARCHRES1, Z_External_searchResult1, z_SearchInfoReport},
{VAL_NONE, 0, 0}
};
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, z_Espec1},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, z_BriefBib},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, z_OPACRecord},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_searchResult1,
+ z_SearchInfoReport},
{-1, -1, -1, -1, 0}
};
* OF THIS SOFTWARE.
*
* $Log: oid.h,v $
- * Revision 1.14 1996-10-07 15:29:17 quinn
+ * Revision 1.15 1996-10-09 15:54:57 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.14 1996/10/07 15:29:17 quinn
* Added SOIF support
*
* Revision 1.13 1996/02/20 17:57:53 adam
VAL_SETG,
VAL_VAR1,
VAL_ESPEC1,
- VAL_SOIF
+ VAL_SOIF,
+ VAL_SEARCHRES1
} oid_value;
typedef struct oident
* OF THIS SOFTWARE.
*
* $Log: proto.h,v $
- * Revision 1.36 1996-10-07 15:29:20 quinn
+ * Revision 1.37 1996-10-09 15:54:58 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.36 1996/10/07 15:29:20 quinn
* Added SOIF support
*
* Revision 1.35 1996/06/10 08:57:38 quinn
int z_AttributeList(ODR o, Z_AttributeList **p, int opt);
int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt);
Z_APDU *zget_APDU(ODR o, int which);
+int z_Query(ODR o, Z_Query **p, int opt);
#include <prt-rsc.h>
#include <prt-acc.h>
#include <prt-exd.h>
#include <prt-dia.h>
#include <prt-esp.h>
+#include <prt-add.h>
#include <prt-ext.h>
#define Z_ProxSupportUnit_private 1
union
{
- int known;
+ int *known;
Z_ProxSupportPrivate *private;
} u;
} Z_ProxSupportUnit;
#define Z_External_espec1 12
#define Z_External_summary 13
#define Z_External_OPAC 14
+#define Z_External_searchResult1 15
union
{
/* Generic types */
Z_DiagnosticFormat *diag1;
Z_Espec1 *espec1;
Z_BriefBib *summary;
+ Z_SearchInfoReport *searchResult1;
} u;
};
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: oid.c,v $
- * Revision 1.15 1996-10-07 15:29:43 quinn
+ * Revision 1.16 1996-10-09 15:55:02 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.15 1996/10/07 15:29:43 quinn
* Added SOIF support
*
* Revision 1.14 1996/02/20 17:58:28 adam
{PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE, {9,5,-1}, "DB. Update" },
{PROTO_Z3950, CLASS_EXTSERV, VAL_EXPORTSPEC,{9,6,-1}, "exp. spec." },
{PROTO_Z3950, CLASS_EXTSERV, VAL_EXPORTINV, {9,7,-1}, "exp. inv." },
+
+ {PROTO_Z3950, CLASS_USERINFO,VAL_SEARCHRES1 {10,1,-1}, "searchResult-1"},
+
{PROTO_Z3950, CLASS_ELEMSPEC,VAL_ESPEC1, {11,1,-1}, "Espec-1" },
{PROTO_Z3950, CLASS_VARSET, VAL_VAR1, {12,1,-1}, "Variant-1" },