From 1318fabb307dce513479df1890cac2f20cddda45 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Wed, 9 Oct 1996 15:54:51 +0000 Subject: [PATCH] Added SearchInfoReport --- CHANGELOG | 20 ++++++++++++++++++++ asn/Makefile | 4 ++-- asn/proto.c | 9 ++++++--- asn/prt-ext.c | 8 +++++++- include/oid.h | 8 ++++++-- include/proto.h | 7 ++++++- include/prt-exp.h | 2 +- include/prt-ext.h | 2 ++ util/oid.c | 8 +++++++- 9 files changed, 57 insertions(+), 11 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ecc720f..7c299dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,33 @@ 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. diff --git a/asn/Makefile b/asn/Makefile index c7ede65..83bae77 100644 --- a/asn/Makefile +++ b/asn/Makefile @@ -1,7 +1,7 @@ # 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. @@ -11,7 +11,7 @@ DEFS=$(INCLUDE) 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 diff --git a/asn/proto.c b/asn/proto.c index d77f267..b75ba69 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -1,10 +1,13 @@ - /* +/* * 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 @@ -1483,7 +1486,7 @@ int z_DeleteResultSetRequest(ODR o, Z_DeleteResultSetRequest **p, int opt) 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) && diff --git a/asn/prt-ext.c b/asn/prt-ext.c index a7773ab..42b1580 100644 --- a/asn/prt-ext.c +++ b/asn/prt-ext.c @@ -4,7 +4,10 @@ * 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 @@ -55,6 +58,7 @@ static Z_ext_typeent type_table[] = {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} }; @@ -96,6 +100,8 @@ int z_External(ODR o, Z_External **p, int opt) {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} }; diff --git a/include/oid.h b/include/oid.h index cd0d234..98e914a 100644 --- a/include/oid.h +++ b/include/oid.h @@ -24,7 +24,10 @@ * 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 @@ -158,7 +161,8 @@ typedef enum oid_value VAL_SETG, VAL_VAR1, VAL_ESPEC1, - VAL_SOIF + VAL_SOIF, + VAL_SEARCHRES1 } oid_value; typedef struct oident diff --git a/include/proto.h b/include/proto.h index f19cfc6..112e839 100644 --- a/include/proto.h +++ b/include/proto.h @@ -24,7 +24,10 @@ * 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 @@ -1347,6 +1350,7 @@ int z_DiagRec(ODR o, Z_DiagRec **p, int opt); 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 #include @@ -1356,6 +1360,7 @@ Z_APDU *zget_APDU(ODR o, int which); #include #include #include +#include #include diff --git a/include/prt-exp.h b/include/prt-exp.h index 711969a..e842231 100644 --- a/include/prt-exp.h +++ b/include/prt-exp.h @@ -147,7 +147,7 @@ typedef struct Z_ProxSupportUnit #define Z_ProxSupportUnit_private 1 union { - int known; + int *known; Z_ProxSupportPrivate *private; } u; } Z_ProxSupportUnit; diff --git a/include/prt-ext.h b/include/prt-ext.h index dccd86b..e6f708c 100644 --- a/include/prt-ext.h +++ b/include/prt-ext.h @@ -69,6 +69,7 @@ struct Z_External #define Z_External_espec1 12 #define Z_External_summary 13 #define Z_External_OPAC 14 +#define Z_External_searchResult1 15 union { /* Generic types */ @@ -88,6 +89,7 @@ struct Z_External Z_DiagnosticFormat *diag1; Z_Espec1 *espec1; Z_BriefBib *summary; + Z_SearchInfoReport *searchResult1; } u; }; diff --git a/util/oid.c b/util/oid.c index 6856de7..950abf4 100644 --- a/util/oid.c +++ b/util/oid.c @@ -4,7 +4,10 @@ * 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 @@ -137,6 +140,9 @@ static oident oids[] = {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" }, -- 1.7.10.4