Possible compatibility problems with earlier versions marked with '*'.
+--- XXXXXXXXXXXXX
+
+Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
+
--- 1.2 1996/6/10 (1st anniversary release)
Added Summary record syntax. Lightly tested.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.48 1996-06-10 08:53:33 quinn
+ * Revision 1.49 1996-07-06 19:58:28 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.48 1996/06/10 08:53:33 quinn
* Added Summary,OPAC,ResourceReport
*
* Revision 1.47 1996/05/29 15:47:50 quinn
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->resourceReportStatus,
ODR_CONTEXT, 50, 0) &&
- odr_implicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT,
+ odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT,
51, 1) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
odr_sequence_end(o);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.36 1996-06-10 08:53:47 quinn
+ * Revision 1.37 1996-07-06 19:58:29 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.36 1996/06/10 08:53:47 quinn
* Added Summary
*
* Revision 1.35 1996/06/03 09:45:50 quinn
* to illustrate the use of the YAZ service-level API.
*/
+#include <yconfig.h>
#include <stdio.h>
#include <stdlib.h>
-#ifdef WINDOWS
#include <time.h>
-#else
-#include <sys/time.h>
-#endif
#include <assert.h>
-#ifdef _AIX
-#include <sys/select.h>
-#endif
#include <comstack.h>
#include <tcpip.h>
assert((RPNquery = ccl_rpn_query(rpn)));
bib1.proto = protocol;
bib1.oclass = CLASS_ATTSET;
- bib1.value = VAL_BIB1;
+ bib1.value = attributeset;
RPNquery->attributeSetId = oid_getoidbyent(&bib1);
query.u.type_1 = RPNquery;
break;
sprintf(setstring, "%d", setnumber);
req->resultSetId = setstring;
}
+
+
+#if 0
+ if (1)
+ {
+ static Z_Range range;
+ static Z_Range *rangep = ⦥
+ req->num_ranges = 1;
+#endif
+
+
+
+
+
+
+
+
+
req->resultSetStartPoint = &setno;
req->numberOfRecordsRequested = &nos;
prefsyn.proto = protocol;
# Subset of bib-1 attributes map to CCL qualifiers
-# $Id: default.bib,v 1.2 1995-05-22 14:44:53 quinn Exp $
+# $Id: default.bib,v 1.3 1996-07-06 19:58:30 quinn Exp $
#
term t=l,r s=pw
clean t=l
ab u=62 s=pw
note u=63 s=pw
af u=1006 s=pw
+
+north u=2040 r=o
+south u=2041 r=o
+east u=2038 r=o
+west u=2039 r=o
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.11 1996-02-23 10:00:39 quinn
+ * Revision 1.12 1996-07-06 19:58:30 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.11 1996/02/23 10:00:39 quinn
* WAIS Work
*
* Revision 1.10 1996/02/20 12:52:11 quinn
#include <comstack.h>
#include <tcpip.h>
-#ifndef WINDOWS
-#include <sys/time.h>
-#endif
-
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
int tcpip_get(COMSTACK h, char **buf, int *bufsize);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmosi.c,v $
- * Revision 1.12 1996-05-22 08:34:44 adam
+ * Revision 1.13 1996-07-06 19:58:30 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.12 1996/05/22 08:34:44 adam
* Added ifdef USE_XTIMOSI; so that 'make depend' works.
*
* Revision 1.11 1996/02/23 10:00:41 quinn
#include <string.h>
#include <assert.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#define YNETINCLUDE
+#include <yconfig.h>
#include <comstack.h>
#include <xmosi.h>
* OF THIS SOFTWARE.
*
* $Log: comstack.h,v $
- * Revision 1.14 1996-02-10 12:23:41 quinn
+ * Revision 1.15 1996-07-06 19:58:32 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.14 1996/02/10 12:23:41 quinn
* Enable inetd operations fro TCP/IP stack
*
* Revision 1.13 1995/11/01 13:54:33 quinn
#ifndef COMSTACK_H
#define COMSTACK_H
+#define YNETINCLUDE
#include <yconfig.h>
#include <oid.h>
#include <xmalloc.h>
* OF THIS SOFTWARE.
*
* $Log: data1.h,v $
- * Revision 1.16 1996-06-10 08:55:34 quinn
+ * Revision 1.17 1996-07-06 19:58:32 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.16 1996/06/10 08:55:34 quinn
* Added Summary. Unfinished work
*
* Revision 1.15 1996/06/03 09:46:03 quinn
int node_selected;
int make_variantlist;
int no_data_requested;
+ int get_bytes;
} tag;
struct
* OF THIS SOFTWARE.
*
* $Log: tcpip.h,v $
- * Revision 1.6 1996-02-10 12:23:42 quinn
+ * Revision 1.7 1996-07-06 19:58:32 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.6 1996/02/10 12:23:42 quinn
* Enable inetd operations fro TCP/IP stack
*
* Revision 1.5 1995/09/29 17:12:13 quinn
#ifndef TCPIP_H
#define TCPIP_H
+#define YNETINCLUDE
#include <yconfig.h>
-#include <sys/types.h>
-#ifdef WINDOWS
-#include <winsock.h>
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
struct sockaddr_in *tcpip_strtoaddr(const char *str);
#ifndef YCONFIG_H
#define YCONFIG_H
+/* System includes */
+
+#ifdef _VMS_
+
+#elif WINDOWS
+
+#ifdef YNETINCLUDE
+#include <winsock.h>
+#endif
+
+#else
+/*
+ * Standard Unix headers
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#ifdef YNETINCLUDE
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
+
+#ifdef _AIX
+#include <sys/select.h>
+#endif
+
+#endif
+
#include <xmalloc.h>
#ifdef WINDOWS
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_int.c,v $
- * Revision 1.11 1995-09-29 17:12:16 quinn
+ * Revision 1.12 1996-07-06 19:58:33 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.11 1995/09/29 17:12:16 quinn
* Smallish
*
* Revision 1.10 1995/09/29 17:01:50 quinn
*/
-#include <sys/types.h>
-
-#ifdef WINDOWS
-#include <winsock.h>
-#else
-#include <netinet/in.h> /* for htons... */
-#endif
+#define YNETINCLUDE
+#include <yconfig.h>
#include <string.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_doespec.c,v $
- * Revision 1.4 1996-06-07 11:04:32 quinn
+ * Revision 1.5 1996-07-06 19:58:34 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.4 1996/06/07 11:04:32 quinn
* Fixed tag->tagset dependency
*
* Revision 1.3 1995/11/13 09:27:33 quinn
}
static void mark_subtree(data1_node *n, int make_variantlist, int no_data,
- Z_Variant *vreq)
+ int get_bytes, Z_Variant *vreq)
{
data1_node *c;
n->u.tag.node_selected = 1;
n->u.tag.make_variantlist = make_variantlist;
n->u.tag.no_data_requested = no_data;
+ n->u.tag.get_bytes = get_bytes;
}
for (c = n->child; c; c = c->next)
c->u.tag.node_selected = 1;
c->u.tag.make_variantlist = make_variantlist;
c->u.tag.no_data_requested = no_data;
+ c->u.tag.get_bytes = get_bytes;
}
- mark_subtree(c, make_variantlist, no_data, vreq);
+ mark_subtree(c, make_variantlist, no_data, get_bytes, vreq);
}
}
{
int show_variantlist = 0;
int no_data = 0;
+ int get_bytes = -1;
+
Z_Variant *vreq =
e->elements[i]->u.simpleElement->variantRequest;
oident *defset = oid_getentbyoid(e->defaultVariantSetId);
if (vreq)
{
+ Z_Triple *r;
+
/*
* 6,5: meta-data requested, variant list.
*/
*/
if (find_triple(vreq, defsetval, var1, 9, 1))
no_data = 1;
+
+ /* howmuch */
+ if ((r = find_triple(vreq, defsetval, var1, 5, 5)))
+ if (r->which == Z_Triple_integer)
+ get_bytes = *r->value.integer;
}
- mark_subtree(c, show_variantlist, no_data, vreq);
+ mark_subtree(c, show_variantlist, no_data, get_bytes, vreq);
}
hits++;
/*
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_espec.c,v $
- * Revision 1.5 1996-01-02 08:57:44 quinn
+ * Revision 1.6 1996-07-06 19:58:34 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.5 1996/01/02 08:57:44 quinn
* Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
*
* Revision 1.4 1995/12/05 11:16:10 quinn
t->which = Z_Triple_null;
t->value.null = ODR_NULLVAL;
}
+ else if (isdigit(*value))
+ {
+ t->which = Z_Triple_integer;
+ t->value.integer = odr_malloc(o, sizeof(*t->value.integer));
+ *t->value.integer = atoi(value);
+ }
else
{
t->which = Z_Triple_internationalString;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
- * Revision 1.5 1996-06-03 09:46:42 quinn
+ * Revision 1.6 1996-07-06 19:58:34 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.5 1996/06/03 09:46:42 quinn
* Added OID data type.
*
* Revision 1.4 1996/05/01 12:45:30 quinn
ODR o)
{
Z_ElementData *res = odr_malloc(o, sizeof(*res));
+ data1_node *p;
+
+ for (p = n->parent; p && p->which != DATA1N_tag; p = p->parent)
+ ;
if (!n)
{
else if (n->which == DATA1N_data && (leaf || n->parent->num_children == 1))
{
char str[512];
+ int toget;
switch (n->u.data.what)
{
*res->u.numeric = atoi(n->u.data.data);
break;
case DATA1I_text:
+ toget = n->u.data.len;
+ if (p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget)
+ toget = p->u.tag.get_bytes;
res->which = Z_ElementData_string;
- res->u.string = odr_malloc(o, n->u.data.len+1);
- memcpy(res->u.string, n->u.data.data, n->u.data.len);
- res->u.string[n->u.data.len] = '\0';
+ res->u.string = odr_malloc(o, toget+1);
+ memcpy(res->u.string, n->u.data.data, toget);
+ res->u.string[toget] = '\0';
break;
case DATA1I_oid:
res->which = Z_ElementData_oid;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.10 1996-01-19 15:41:47 quinn
+ * Revision 1.11 1996-07-06 19:58:35 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.10 1996/01/19 15:41:47 quinn
* Fixed uninitialized boolean.
*
* Revision 1.9 1996/01/17 14:52:47 adam
tagn->u.tag.node_selected = 0;
tagn->u.tag.make_variantlist = 0;
tagn->u.tag.no_data_requested = 0;
+ tagn->u.tag.get_bytes = -1;
if (!(tagn->u.tag.element = data1_getelementbytagname(root->u.root.absyn,
0, tagname)))
return 0;
res->u.tag.node_selected = 0;
res->u.tag.make_variantlist = 0;
res->u.tag.no_data_requested = 0;
+ res->u.tag.get_bytes = -1;
res->root = parent->root;
*buf = t + 1;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: eventl.c,v $
- * Revision 1.21 1996-02-21 12:55:51 quinn
+ * Revision 1.22 1996-07-06 19:58:35 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.21 1996/02/21 12:55:51 quinn
* small
*
* Revision 1.20 1996/02/21 12:52:55 quinn
*
*/
+#include <yconfig.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
-#ifdef _AIX
-#include <sys/select.h>
-#endif
#include <eventl.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.61 1996-06-10 08:56:16 quinn
+ * Revision 1.62 1996-07-06 19:58:35 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.61 1996/06/10 08:56:16 quinn
* Work on Summary.
*
* Revision 1.60 1996/05/30 11:03:10 quinn
*
*/
+#include <yconfig.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <assert.h>
-#include <sys/time.h>
#include <xmalloc.h>
#include <comstack.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: statserv.c,v $
- * Revision 1.35 1996-05-29 10:03:28 quinn
+ * Revision 1.36 1996-07-06 19:58:36 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.35 1996/05/29 10:03:28 quinn
* Options work
*
* Revision 1.34 1996/02/21 13:12:07 quinn
* really have to, but it's great for debugging memory management. :)
*/
+#include <yconfig.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
-#include <sys/types.h>
#include <pwd.h>
-#include <sys/time.h>
#include <options.h>
#include <eventl.h>
-# $Id: gils-b.est,v 1.5 1996-06-05 08:53:50 adam Exp $
+# $Id: gils-b.est,v 1.6 1996-07-06 19:58:36 quinn Exp $
simpleelement (1,1)
simpleelement (1,10)
simpleelement (1,12)
simpleelement (1,16)
simpleelement (4,1)
simpleelement (4,52)
-simpleelement (4,70)/(4,17)
simpleelement (4,1)
simpleelement (4,52)
simpleelement (4,98)
-
-#
-# These are not formally required by GILS
-#
-simpleelement (4,59)
-simpleelement (4,70)
-simpleelement (4,97)
esetname B gils-b.est
esetname G gils-g.est
esetname W gils-b.est # We don't really do bodyOfDisplay yet.
-esetname F @
+esetname F gils-f.est
elm (1,1) schemaIdentifier -
elm (1,10) rank -
elm (4,98)/(4,18) crossReferenceType !
elm (4,23) originalControlIdentifier !
elm (4,59) supplementalInformation !
-
-elm (2,9) bodyOfDisplay Any
-
-#
-# Local tags - testing only
-#
-
-elm sampleText bodyOfText !