/*
- * Copyright (c) 1995-1996, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.45 1997-05-14 06:53:29 adam
+ * Revision 1.53 1997-09-29 13:18:59 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.52 1997/09/29 07:20:31 adam
+ * Client code uses nmem_init.
+ *
+ * Revision 1.51 1997/09/26 09:41:55 adam
+ * Updated client to handle multiple diagnostics.
+ *
+ * Revision 1.50 1997/09/17 12:10:29 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.49 1997/09/04 13:45:17 adam
+ * Added UNImarc to list of available syntaxes.
+ *
+ * Revision 1.48 1997/09/01 08:48:44 adam
+ * New windows NT/95 port using MSV5.0. Only a few changes made
+ * to avoid warnings. Sub project created: client.dsp.
+ *
+ * Revision 1.47 1997/07/01 13:49:56 adam
+ * Take care of case when invalid target is specified on command line.
+ *
+ * Revision 1.46 1997/06/23 10:30:18 adam
+ * Added call to ccl_rpn_delete in search. Added ODR stream "out"
+ * as parameter to ccl_rpn_query to release RPN query.
+ *
+ * Revision 1.45 1997/05/14 06:53:29 adam
* C++ support.
*
* Revision 1.44 1997/05/05 11:20:35 adam
fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n");
return 0;
}
+ if (!strcmp(type, "tcp"))
+ {
+ t = tcpip_type;
+ protocol = PROTO_Z3950;
+ }
+ else
#ifdef USE_XTIMOSI
if (!strcmp(type, "osi"))
{
- if (!(add = mosi_strtoaddr(addr)))
- {
- perror(arg);
- return 0;
- }
t = mosi_type;
protocol = PROTO_SR;
}
else
#endif
- if (!strcmp(type, "tcp"))
- {
- if (!(add = tcpip_strtoaddr(addr)))
- {
- perror(arg);
- return 0;
- }
- t = tcpip_type;
- protocol = PROTO_Z3950;
- }
- else
{
- fprintf(stderr, "Bad type: %s\n", type);
- return 0;
+ fprintf(stderr, "Bad type: %s\n", type);
+ return 0;
}
if (!(conn = cs_create(t, 1, protocol)))
{
perror("cs_create");
return 0;
}
+ if (!(add = cs_straddr(conn, addr)))
+ {
+ perror(arg);
+ return 0;
+ }
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
else if (r->which == Z_External_octet && p->u.octet_aligned->len)
{
const char *marc_buf = (char*)p->u.octet_aligned->buf;
- marc_display (marc_buf, stdout);
+ marc_display (marc_buf, NULL);
if (marcdump)
fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
}
}
}
-static void display_diagrec(Z_DiagRec *p)
+
+static void display_diagrecs(Z_DiagRec **pp, int num)
{
+ int i;
oident *ent;
-#ifdef Z_95
Z_DefaultDiagFormat *r;
-#else
- Z_DiagRec *r = p;
-#endif
- printf("Diagnostic message from database:\n");
-#ifdef Z_95
- if (p->which != Z_DiagRec_defaultFormat)
+ printf("Diagnostic message(s) from database:\n");
+ for (i = 0; i<num; i++)
{
- printf("Diagnostic record not in default format.\n");
- return;
+ Z_DiagRec *p = pp[i];
+ if (p->which != Z_DiagRec_defaultFormat)
+ {
+ printf("Diagnostic record not in default format.\n");
+ return;
+ }
+ else
+ r = p->u.defaultFormat;
+ if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
+ ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
+ printf("Missing or unknown diagset\n");
+ printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
+ if (r->addinfo && *r->addinfo)
+ printf(" -- '%s'\n", r->addinfo);
+ else
+ printf("\n");
}
- else
- r = p->u.defaultFormat;
-#endif
- if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
- ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
- printf("Missing or unknown diagset\n");
- printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
- if (r->addinfo && *r->addinfo)
- printf(" -- '%s'\n", r->addinfo);
- else
- printf("\n");
}
+
static void display_nameplusrecord(Z_NamePlusRecord *p)
{
if (p->databaseName)
printf("[%s]", p->databaseName);
if (p->which == Z_NamePlusRecord_surrogateDiagnostic)
- display_diagrec(p->u.surrogateDiagnostic);
+ display_diagrecs(&p->u.surrogateDiagnostic, 1);
else
display_record(p->u.databaseRecord);
}
int i;
if (p->which == Z_Records_NSD)
- display_diagrec(p->u.nonSurrogateDiagnostic);
- else
+ display_diagrecs (&p->u.nonSurrogateDiagnostic, 1);
+ else if (p->which == Z_Records_multipleNSD)
+ display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
+ p->u.multipleNonSurDiagnostics->num_diagRecs);
+ else
{
printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records);
for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++)
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
Z_SearchRequest *req = apdu->u.searchRequest;
Z_Query query;
+ int oid[OID_SIZE];
#if CCL2RPN
struct ccl_rpn_node *rpn;
int error, pos;
mediumSetPresentNumber > 0))
{
oident prefsyn;
+ int oid[OID_SIZE];
prefsyn.proto = protocol;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
req->preferredRecordSyntax =
- odr_oiddup(out, oid_getoidbyent(&prefsyn));
+ odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid));
req->smallSetElementSetNames =
req->mediumSetElementSetNames = elementSetNames;
}
#if CCL2RPN
case QueryType_CCL2RPN:
query.which = Z_Query_type_1;
- assert((RPNquery = ccl_rpn_query(rpn)));
+ assert((RPNquery = ccl_rpn_query(out, rpn)));
bib1.proto = protocol;
bib1.oclass = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- RPNquery->attributeSetId = oid_getoidbyent(&bib1);
+ RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid);
query.u.type_1 = RPNquery;
+ ccl_rpn_delete (rpn);
break;
#endif
default:
Z_RecordComposition compo;
oident prefsyn;
int nos = 1;
+ int oid[OID_SIZE];
char *p;
char setstring[100];
prefsyn.proto = protocol;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
- req->preferredRecordSyntax = oid_getoidbyent(&prefsyn);
+ req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid);
+
if (elementSetNames)
{
req->recordComposition = &compo;
{
printf("See you later, alligator.\n");
exit(0);
+ return 0;
}
int cmd_cancel(char *arg)
display_term(ent->entries[i]->u.termInfo);
}
else
- display_diagrec(ent->entries[i]->u.surrogateDiagnostic);
+ display_diagrecs(&ent->entries[i]->u.surrogateDiagnostic, 1);
}
else
- display_diagrec(res->entries->u.nonSurrogateDiagnostics->diagRecs[0]);
+ display_diagrecs(&res->entries->
+ u.nonSurrogateDiagnostics->diagRecs[0], 1);
}
int cmd_scan(char *arg)
printf("Usage: format <recordsyntax>\n");
return 0;
}
- if (!strcmp(arg, "sutrs"))
- {
- printf("Preferred format is SUTRS.\n");
- recordsyntax = VAL_SUTRS;
- return 1;
- }
- else if (!strcmp(arg, "usmarc"))
- {
- printf("Preferred format is USMARC\n");
- recordsyntax = VAL_USMARC;
- return 1;
- }
- else if (!strcmp(arg, "danmarc"))
- {
- printf("Preferred format is DANMARC\n");
- recordsyntax = VAL_DANMARC;
- return 1;
- }
- else if (!strcmp(arg, "ukmarc"))
+ recordsyntax = oid_getvalbyname (arg);
+ if (recordsyntax == VAL_NONE)
{
- printf("Preferred format is UKMARC\n");
- recordsyntax = VAL_UKMARC;
- return 1;
- }
- else if (!strcmp(arg, "grs1"))
- {
- printf("Preferred format is GRS1\n");
- recordsyntax = VAL_GRS1;
- return 1;
- }
- else if (!strcmp(arg, "soif"))
- {
- printf("Preferred format is SOIF\n");
- recordsyntax = VAL_SOIF;
- return 1;
- }
- else if (!strcmp(arg, "summary"))
- {
- printf("Preferred format is Summary\n");
- recordsyntax = VAL_SUMMARY;
- return 1;
- }
- else if (!strcmp(arg, "explain"))
- {
- printf("Preferred format is Explain\n");
- recordsyntax = VAL_EXPLAIN;
- return 1;
- }
- else
- {
- printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n");
+ printf ("unknown record syntax\n");
return 0;
}
+ return 1;
}
int cmd_elements(char *arg)
#if CCL2RPN
FILE *inf;
#endif
-
+ nmem_init();
if (!(out = odr_createmem(ODR_ENCODE)) ||
!(in = odr_createmem(ODR_DECODE)) ||
!(print = odr_createmem(ODR_PRINT)))
switch (ret)
{
case 0:
- cmd_open (arg);
- opened = 1;
+ if (cmd_open (arg) == 2)
+ opened = 1;
break;
case 'm':
if (!(marcdump = fopen (arg, "a")))
projects / yaz-moved-to-github.git / blobdiff