/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.52 1997-09-29 07:20:31 adam
+ * Revision 1.60 1998-01-29 14:08:52 adam
+ * Better sort diagnostics.
+ *
+ * Revision 1.59 1998/01/29 13:17:56 adam
+ * Added sort.
+ *
+ * Revision 1.58 1998/01/07 13:51:45 adam
+ * Minor change.
+ *
+ * Revision 1.57 1998/01/07 12:58:22 adam
+ * Using fgets instead of gets.
+ *
+ * Revision 1.56 1997/11/05 09:18:31 adam
+ * The client handles records with no associated syntax.
+ *
+ * Revision 1.55 1997/10/31 12:20:08 adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
+ * Revision 1.54 1997/10/27 13:52:46 adam
+ * Header yaz-util includes all YAZ utility header files.
+ *
+ * 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
* to illustrate the use of the YAZ service-level API.
*/
-#include <yconfig.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <assert.h>
+#include <yaz-util.h>
+
#include <comstack.h>
#include <tcpip.h>
#ifdef USE_XTIMOSI
#include <proto.h>
#include <marcdisp.h>
#include <diagbib1.h>
-#include <options.h>
#include <pquery.h>
ODR_MASK_SET(req->options, Z_Options_namedResultSets);
ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
ODR_MASK_SET(req->options, Z_Options_scan);
+ ODR_MASK_SET(req->options, Z_Options_sort);
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
odr_reset(print);
}
}
-
/* Check if this is a known, ASN.1 type tucked away in an octet string */
if (ent && r->which == Z_External_octet)
{
r->which = type->what;
}
}
- if (ent->value == VAL_SOIF)
+ if (ent && 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)
{
if (marcdump)
fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
}
- else if (ent->value == VAL_SUTRS)
+ else if (ent && ent->value == VAL_SUTRS)
{
if (r->which != Z_External_sutrs)
{
}
printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf);
}
- else if (ent->value == VAL_GRS1)
+ else if (ent && ent->value == VAL_GRS1)
{
if (r->which != Z_External_grs1)
{
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;
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;
}
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;
Z_RecordComposition compo;
oident prefsyn;
int nos = 1;
+ int oid[OID_SIZE];
char *p;
char setstring[100];
}
if (*arg)
setno = atoi(arg);
-
- if (setnumber >= 0)
+ if (p && (p=strchr(p+1, '+')))
+ {
+ strcpy (setstring, p+1);
+ req->resultSetId = setstring;
+ }
+ else if (setnumber >= 0)
{
sprintf(setstring, "%d", setnumber);
req->resultSetId = setstring;
}
-
-
#if 0
if (1)
{
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;
return 2;
}
+int send_sortrequest(char *arg, int newset)
+{
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
+ Z_SortRequest *req = apdu->u.sortRequest;
+ Z_SortKeySpecList *sksl = odr_malloc (out, sizeof(*sksl));
+ char setstring[32];
+ char sort_string[32], sort_flags[32];
+ int off;
+ int oid[OID_SIZE];
+ oident bib1;
+
+ if (setnumber >= 0)
+ sprintf (setstring, "%d", setnumber);
+ else
+ sprintf (setstring, "default");
+
+ req->inputResultSetNames =
+ odr_malloc (out, sizeof(*req->inputResultSetNames));
+ req->inputResultSetNames->num_strings = 1;
+ req->inputResultSetNames->strings =
+ odr_malloc (out, sizeof(*req->inputResultSetNames->strings));
+ req->inputResultSetNames->strings[0] =
+ odr_malloc (out, strlen(setstring)+1);
+ strcpy (req->inputResultSetNames->strings[0], setstring);
+
+ if (newset && setnumber >= 0)
+ sprintf (setstring, "%d", ++setnumber);
+
+ req->sortedResultSetName = odr_malloc (out, strlen(setstring)+1);
+ strcpy (req->sortedResultSetName, setstring);
+
+ req->sortSequence = sksl;
+ sksl->num_specs = 0;
+ sksl->specs = odr_malloc (out, sizeof(sksl->specs) * 20);
+
+ bib1.proto = protocol;
+ bib1.oclass = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
+ while ((sscanf (arg, "%31s %31s%n", sort_string, sort_flags, &off)) == 2
+ && off > 1)
+ {
+ int i;
+ char *sort_string_sep;
+ Z_SortKeySpec *sks = odr_malloc (out, sizeof(*sks));
+ Z_SortKey *sk = odr_malloc (out, sizeof(*sk));
+
+ arg += off;
+ sksl->specs[sksl->num_specs++] = sks;
+ sks->sortElement = odr_malloc (out, sizeof(*sks->sortElement));
+ sks->sortElement->which = Z_SortElement_generic;
+ sks->sortElement->u.generic = sk;
+
+ if ((sort_string_sep = strchr (sort_string, '=')))
+ {
+ Z_AttributeElement *el = odr_malloc (out, sizeof(*el));
+ sk->which = Z_SortKey_sortAttributes;
+ sk->u.sortAttributes =
+ odr_malloc (out, sizeof(*sk->u.sortAttributes));
+ sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid);
+ sk->u.sortAttributes->list =
+ odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
+ sk->u.sortAttributes->list->num_attributes = 1;
+ sk->u.sortAttributes->list->attributes =
+ odr_malloc (out,
+ sizeof(*sk->u.sortAttributes->list->attributes));
+ sk->u.sortAttributes->list->attributes[0] = el;
+ el->attributeSet = 0;
+ el->attributeType = odr_malloc (out, sizeof(*el->attributeType));
+ *el->attributeType = atoi (sort_string);
+ el->which = Z_AttributeValue_numeric;
+ el->value.numeric = odr_malloc (out, sizeof(*el->value.numeric));
+ *el->value.numeric = atoi (sort_string_sep + 1);
+ }
+ else
+ {
+ sk->which = Z_SortKey_sortField;
+ sk->u.sortField = odr_malloc (out, strlen(sort_string)+1);
+ strcpy (sk->u.sortField, sort_string);
+ }
+ sks->sortRelation = odr_malloc (out, sizeof(*sks->sortRelation));
+ *sks->sortRelation = Z_SortRelation_ascending;
+ sks->caseSensitivity = odr_malloc (out, sizeof(*sks->caseSensitivity));
+ *sks->caseSensitivity = Z_SortCase_caseSensitive;
+
+ sks->missingValueAction = NULL;
+
+ for (i = 0; sort_flags[i]; i++)
+ {
+ switch (sort_flags[i])
+ {
+ case 'a':
+ case 'A':
+ case '>':
+ *sks->sortRelation = Z_SortRelation_ascending;
+ break;
+ case 'd':
+ case 'D':
+ case '<':
+ *sks->sortRelation = Z_SortRelation_descending;
+ break;
+ case 'i':
+ case 'I':
+ *sks->caseSensitivity = Z_SortCase_caseInsensitive;
+ break;
+ case 'S':
+ case 's':
+ *sks->caseSensitivity = Z_SortCase_caseSensitive;
+ break;
+ }
+ }
+ }
+ if (!sksl->num_specs)
+ {
+ printf ("Missing sort specifications\n");
+ return -1;
+ }
+ send_apdu(apdu);
+ return 2;
+}
+
void display_term(Z_TermInfo *t)
{
if (t->term->which == Z_Term_general)
u.nonSurrogateDiagnostics->diagRecs[0], 1);
}
+void process_sortResponse(Z_SortResponse *res)
+{
+ printf("Sort: status=");
+ switch (*res->sortStatus)
+ {
+ case Z_SortStatus_success:
+ printf ("success"); break;
+ case Z_SortStatus_partial_1:
+ printf ("partial"); break;
+ case Z_SortStatus_failure:
+ printf ("failure"); break;
+ default:
+ printf ("unknown (%d)", *res->sortStatus);
+ }
+ printf ("\n");
+ if (res->diagnostics)
+ display_diagrecs(res->diagnostics->diagRecs,
+ res->diagnostics->num_diagRecs);
+}
+
+int cmd_sort_generic(char *arg, int newset)
+{
+ if (!session)
+ {
+ printf("Session not initialized yet\n");
+ return 0;
+ }
+ if (!ODR_MASK_GET(session->options, Z_Options_sort))
+ {
+ printf("Target doesn't support sort\n");
+ return 0;
+ }
+ if (*arg)
+ {
+ if (send_sortrequest(arg, newset) < 0)
+ return 0;
+ return 2;
+ }
+ return 0;
+}
+
+int cmd_sort(char *arg)
+{
+ return cmd_sort_generic (arg, 0);
+}
+
+int cmd_sort_newset (char *arg)
+{
+ return cmd_sort_generic (arg, 1);
+}
+
int cmd_scan(char *arg)
{
if (!session)
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, "unimarc"))
- {
- printf("Preferred format is UNIMARC\n");
- recordsyntax = VAL_UNIMARC;
- 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,unimarc,grs1,summary,explain}.\n");
+ printf ("unknown record syntax\n");
return 0;
}
+ return 1;
}
int cmd_elements(char *arg)
{"quit", cmd_quit, ""},
{"find", cmd_find, "<query>"},
{"base", cmd_base, "<base-name>"},
- {"show", cmd_show, "<rec#>['+'<#recs>]"},
+ {"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]"},
{"scan", cmd_scan, "<term>"},
+ {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ..."},
+ {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ..."},
{"authentication", cmd_authentication, "<acctstring>"},
{"lslb", cmd_lslb, "<largeSetLowerBound>"},
{"ssub", cmd_ssub, "<smallSetUpperBound>"},
fd_set input;
#endif
char line[1024], word[1024], arg[1024];
-
+
#ifdef USE_SELECT
FD_ZERO(&input);
FD_SET(0, &input);
#else
if (!wait)
#endif
- {
+ {
/* quick & dirty way to get a command line. */
- if (!gets(line))
- break;
+ char *end_p;
+ if (!fgets(line, 1023, stdin))
+ break;
+ if ((end_p = strchr (line, '\n')))
+ *end_p = '\0';
if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
{
strcpy(word, last_cmd);
#endif
switch(apdu->which)
{
- case Z_APDU_initResponse:
- process_initResponse(apdu->u.initResponse);
- break;
- case Z_APDU_searchResponse:
- process_searchResponse(apdu->u.searchResponse);
- break;
- case Z_APDU_scanResponse:
- process_scanResponse(apdu->u.scanResponse);
- break;
- case Z_APDU_presentResponse:
- printf("Received presentResponse.\n");
- setno +=
- *apdu->u.presentResponse->numberOfRecordsReturned;
- if (apdu->u.presentResponse->records)
- display_records(apdu->u.presentResponse->records);
- else
- printf("No records.\n");
- break;
- case Z_APDU_close:
- printf("Target has closed the association.\n");
- process_close(apdu->u.close);
- break;
- default:
- printf("Received unknown APDU type (%d).\n",
- apdu->which);
- exit(1);
+ case Z_APDU_initResponse:
+ process_initResponse(apdu->u.initResponse);
+ break;
+ case Z_APDU_searchResponse:
+ process_searchResponse(apdu->u.searchResponse);
+ break;
+ case Z_APDU_scanResponse:
+ process_scanResponse(apdu->u.scanResponse);
+ break;
+ case Z_APDU_presentResponse:
+ setno +=
+ *apdu->u.presentResponse->numberOfRecordsReturned;
+ if (apdu->u.presentResponse->records)
+ display_records(apdu->u.presentResponse->records);
+ else
+ printf("No records.\n");
+ break;
+ case Z_APDU_sortResponse:
+ process_sortResponse(apdu->u.sortResponse);
+ break;
+ case Z_APDU_close:
+ printf("Target has closed the association.\n");
+ process_close(apdu->u.close);
+ break;
+ default:
+ printf("Received unknown APDU type (%d).\n",
+ apdu->which);
+ exit(1);
}
printf(C_PROMPT);
fflush(stdout);
projects / yaz-moved-to-github.git / blobdiff