/*
- * Copyright (c) 1995-2001, Index Data
+ * Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.130 2001-11-13 23:00:42 adam Exp $
+ * $Id: client.c,v 1.162 2002-07-25 12:52:53 adam Exp $
*/
#include <stdio.h>
#include <yaz/yaz-util.h>
-#include <yaz/tcpip.h>
-#ifdef USE_XTIMOSI
-#include <yaz/xmosi.h>
-#endif
+#include <yaz/comstack.h>
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
#include <yaz/otherinfo.h>
+#include <yaz/charneg.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
-#if YAZ_MODULE_ill
#include <yaz/ill.h>
-#endif
-#if YAZ_MODULE_ccl
#include <yaz/yaz-ccl.h>
-#endif
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
+#include <unistd.h>
#endif
#if HAVE_READLINE_HISTORY_H
#include <readline/history.h>
#endif
+#include <sys/stat.h>
+
+
#include "admin.h"
+#include "tabcomplete.h"
#define C_PROMPT "Z> "
char *databaseNames[128];
int num_databaseNames = 0;
static Z_External *record_last = 0;
-static int setnumber = 0; /* current result set number */
+static int setnumber = -1; /* current result set number */
static int smallSetUpperBound = 0;
static int largeSetLowerBound = 1;
static int mediumSetPresentNumber = 0;
static char ccl_fields[512] = "default.bib";
static char* esPackageName = 0;
static char* yazProxy = 0;
+static int kilobytes = 1024;
+static char* yazCharset = 0;
+static char* yazLang = 0;
+
static char last_cmd[32] = "?";
static FILE *marcdump = 0;
static QueryType queryType = QueryType_Prefix;
-#if YAZ_MODULE_ccl
static CCL_bibset bibset; /* CCL bibset handle */
+
+#if HAVE_READLINE_COMPLETION_OVER
+
+#else
+/* readline doesn't have this var. Define it ourselves. */
+int rl_attempted_completion_over = 0;
#endif
+/* set this one to 1, to avoid decode of unknown MARCs */
+#define AVOID_MARC_DECODE 1
+
+/* nice helper macro as extensive tabbing gives spaces at the en of the args lines */
+#define REMOVE_TAILING_BLANKS(a) {\
+ char* args_end=(a)+strlen(a)-1; \
+ while(isspace(*args_end)) {*args_end=0;--args_end;}; \
+ }
+
+
+void process_cmd_line(char* line);
+char ** readline_completer(char *text, int start, int end);
+char *command_generator(const char *text, int state);
+char** curret_global_list=NULL;
+int cmd_register_tab(char* arg);
+
ODR getODROutputStream()
{
return out;
odr_reset(out); /* release the APDU structure */
}
+static void print_stringn(const unsigned char *buf, size_t len)
+{
+ size_t i;
+ for (i = 0; i<len; i++)
+ if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
+ printf ("%c", buf[i]);
+ else
+ printf ("\\X%02X", buf[i]);
+}
+
static void print_refid (Z_ReferenceId *id)
{
if (id)
{
- printf ("ReferenceId: '%.*s'\n", id->len, id->buf);
+ printf ("Reference Id: ");
+ print_stringn (id->buf, id->len);
+ printf ("\n");
}
}
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
- *req->maximumRecordSize = 1024*1024;
- *req->preferredMessageSize = 1024*1024;
+ *req->maximumRecordSize = 1024*kilobytes;
+ *req->preferredMessageSize = 1024*kilobytes;
req->idAuthentication = auth;
yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
1, type_and_host);
+ if (yazCharset || yazLang) {
+ Z_OtherInformation **p;
+ Z_OtherInformationUnit *p0;
+
+ yaz_oi_APDU(apdu, &p);
+
+ if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
+ ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(out,
+ (const char**)&yazCharset, (yazCharset)?1:0,
+ (const char**)&yazLang, (yazLang)?1:0, 1);
+ }
+ }
+
send_apdu(apdu);
printf("Sent initrequest.\n");
}
if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations))
printf (" concurrentOperations");
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
+ {
printf (" namedResultSets");
+ setnumber = 0;
+ }
+ if (ODR_MASK_GET(res->options, Z_Options_encapsulation))
+ printf (" encapsulation");
+ if (ODR_MASK_GET(res->options, Z_Options_resultCount))
+ printf (" resultCount");
+ if (ODR_MASK_GET(res->options, Z_Options_negotiationModel))
+ printf (" negotiationModel");
+ if (ODR_MASK_GET(res->options, Z_Options_duplicateDetection))
+ printf (" duplicateDetection");
+ if (ODR_MASK_GET(res->options, Z_Options_queryType104))
+ printf (" queryType104");
printf ("\n");
+
+ if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
+
+ Z_CharSetandLanguageNegotiation *p =
+ yaz_get_charneg_record(res->otherInfo);
+
+ if (p) {
+
+ char *charset=NULL, *lang=NULL;
+ int selected;
+
+ yaz_get_response_charneg(session_mem, p, &charset, &lang,
+ &selected);
+
+ printf("Accepted character set : %s\n", charset);
+ printf("Accepted code language : %s\n", lang ? lang : "none");
+ printf("Accepted records in ...: %d\n", selected );
+ }
+ }
fflush (stdout);
return 0;
}
return 1;
}
-
int cmd_open(char *arg)
{
void *add;
char type_and_host[101], base[101];
- CS_TYPE t;
-
+
if (conn)
{
printf("Already connected.\n");
-
+
cs_close (conn);
conn = NULL;
if (session_mem)
session_mem = NULL;
}
}
- t = tcpip_type;
- base[0] = '\0';
- if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
- return 0;
-
- if(yazProxy)
+ if (strncmp (arg, "unix:", 5) == 0)
{
- conn = cs_create_host(yazProxy, 1, &add);
- }
- else
- {
- conn = cs_create_host(type_and_host, 1, &add);
+ base[0] = '\0';
+ conn = cs_create_host(arg, 1, &add);
+ }
+ else
+ {
+ base[0] = '\0';
+ if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
+ return 0;
+ if (yazProxy)
+ conn = cs_create_host(yazProxy, 1, &add);
+ else
+ conn = cs_create_host(type_and_host, 1, &add);
}
-
if (!conn)
{
- printf ("Couldn't create comstack\n");
- return 0;
+ printf ("Couldn't create comstack\n");
+ return 0;
}
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
{
- printf ("error = %s\n", cs_strerror(conn));
- if (conn->cerrno == CSYSERR)
- perror("system");
+ printf ("error = %s\n", cs_strerror(conn));
+ if (conn->cerrno == CSYSERR)
+ perror("system");
cs_close(conn);
conn = 0;
return 0;
}
printf("Ok.\n");
-
+
send_initRequest(type_and_host);
if (*base)
cmd_base (base);
int cmd_authentication(char *arg)
{
static Z_IdAuthentication au;
- static char open[256];
+ static char user[40], group[40], pass[40];
+ static Z_IdPass idPass;
+ int r;
if (!*arg)
{
auth = 0;
return 1;
}
- auth = &au;
- au.which = Z_IdAuthentication_open;
- au.u.open = open;
- strcpy(open, arg);
+ r = sscanf (arg, "%39s %39s %39s", user, group, pass);
+ if (r == 0)
+ {
+ printf("Auth field set to null\n");
+ auth = 0;
+ }
+ if (r == 1)
+ {
+ auth = &au;
+ au.which = Z_IdAuthentication_open;
+ au.u.open = user;
+ }
+ if (r == 2)
+ {
+ auth = &au;
+ au.which = Z_IdAuthentication_idPass;
+ au.u.idPass = &idPass;
+ idPass.groupId = NULL;
+ idPass.userId = user;
+ idPass.password = group;
+ }
+ if (r == 3)
+ {
+ auth = &au;
+ au.which = Z_IdAuthentication_idPass;
+ au.u.idPass = &idPass;
+ idPass.groupId = group;
+ idPass.userId = user;
+ idPass.password = pass;
+ }
return 1;
}
/* SEARCH SERVICE ------------------------------ */
+static void display_record(Z_External *r);
static void display_variant(Z_Variant *v, int level)
{
int i;
if (!r)
+ {
return;
+ }
for (i = 0; i < r->num_elements; i++)
{
Z_TaggedElement *t;
printf("%s) ", t->tagValue->u.string);
if (t->content->which == Z_ElementData_subtree)
{
- printf("\n");
- display_grs1(t->content->u.subtree, level+1);
+ if (!t->content->u.subtree)
+ printf (" (no subtree)\n");
+ else
+ {
+ printf("\n");
+ display_grs1(t->content->u.subtree, level+1);
+ }
}
else if (t->content->which == Z_ElementData_string)
printf("%s\n", t->content->u.string);
{
int *ip = t->content->u.oid;
oident *oent;
-
+
if ((oent = oid_getentbyoid(t->content->u.oid)))
printf("OID: %s\n", oent->desc);
else
printf("[Element empty]\n");
else if (t->content->which == Z_ElementData_elementNotThere)
printf("[Element not there]\n");
+ else if (t->content->which == Z_ElementData_date)
+ printf("Date: %s\n", t->content->u.date);
+ else if (t->content->which == Z_ElementData_ext)
+ {
+ printf ("External\n");
+ display_record (t->content->u.ext);
+ }
else
- printf("??????\n");
+ printf("? type = %d\n",t->content->which);
if (t->appliedVariant)
display_variant(t->appliedVariant, level+1);
if (t->metaData && t->metaData->supportedVariants)
}
}
+
static void print_record(const unsigned char *buf, size_t len)
{
- size_t i;
- for (i = 0; i<len; i++)
- if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
- fputc (buf[i], stdout);
- else
- printf ("\\X%02X", buf[i]);
- /* add newline if not already added ... */
- if (i <= 0 || buf[i-1] != '\n')
- fputc ('\n', stdout);
+ size_t i = len;
+ print_stringn (buf, len);
+ /* add newline if not already added ... */
+ if (i <= 0 || buf[i-1] != '\n')
+ printf ("\n");
}
-static void display_record(Z_DatabaseRecord *p)
+static void display_record(Z_External *r)
{
- Z_External *r = (Z_External*) p;
oident *ent = oid_getentbyoid(r->direct_reference);
record_last = r;
/*
* Call the given decoder to process the record.
*/
- odr_setbuf(in, (char*)p->u.octet_aligned->buf,
- p->u.octet_aligned->len, 0);
+ odr_setbuf(in, (char*)r->u.octet_aligned->buf,
+ r->u.octet_aligned->len, 0);
if (!(*type->fun)(in, (char **)&rr, 0, 0))
{
odr_perror(in, "Decoding constructed record.");
fprintf(stderr, "[Near %d]\n", odr_offset(in));
fprintf(stderr, "Packet dump:\n---------\n");
- odr_dumpBER(stderr, (char*)p->u.octet_aligned->buf,
- p->u.octet_aligned->len);
+ odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf,r->u.octet_aligned->len);
fprintf(stderr, "---------\n");
- exit(1);
- }
- /*
- * Note: we throw away the original, BER-encoded record here.
- * Do something else with it if you want to keep it.
- */
- r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */
- r->which = type->what;
+
+ /* note just ignores the error ant print the bytes form the octet_aligned laiter */
+ } else {
+ /*
+ * Note: we throw away the original, BER-encoded record here.
+ * Do something else with it if you want to keep it.
+ */
+ r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */
+ r->which = type->what;
+ };
}
}
+ if (ent && ent->oclass != CLASS_RECSYN)
+ return;
if (ent && ent->value == VAL_SOIF)
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
- else if (r->which == Z_External_octet && p->u.octet_aligned->len)
+ else if (r->which == Z_External_octet && r->u.octet_aligned->len)
{
- const char *octet_buf = (char*)p->u.octet_aligned->buf;
+ const char *octet_buf = (char*)r->u.octet_aligned->buf;
if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
ent->value == VAL_HTML)
+ {
print_record((const unsigned char *) octet_buf,
- p->u.octet_aligned->len);
+ r->u.octet_aligned->len);
+ }
+ else if (ent->value == VAL_POSTSCRIPT)
+ {
+ int size = r->u.octet_aligned->len;
+ if (size > 100)
+ size = 100;
+ print_record((const unsigned char *) octet_buf, size);
+ }
else
{
- if (marc_display_exl (octet_buf, NULL, 0 /* debug */,
- p->u.octet_aligned->len)
- <= 0)
+ if (
+#if AVOID_MARC_DECODE
+ /* primitive check for a marc OID 5.1-29 except 16 */
+ ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 &&
+ ent->oidsuffix[1] != 16
+#else
+ 1
+#endif
+ )
+ {
+ if (marc_display_exl (octet_buf, NULL, 0 /* debug */,
+ r->u.octet_aligned->len) <= 0)
+ {
+ printf ("bad MARC. Dumping as it is:\n");
+ print_record((const unsigned char*) octet_buf,
+ r->u.octet_aligned->len);
+ }
+ }
+ else
{
- printf ("ISO2709 decoding failed, dumping record as is:\n");
print_record((const unsigned char*) octet_buf,
- p->u.octet_aligned->len);
+ r->u.octet_aligned->len);
}
}
if (marcdump)
- fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump);
+ fwrite (octet_buf, 1, r->u.octet_aligned->len, marcdump);
}
else if (ent && ent->value == VAL_SUTRS)
{
}
}
-
static void display_diagrecs(Z_DiagRec **pp, int num)
{
int i;
Z_SearchRequest *req = apdu->u.searchRequest;
Z_Query query;
int oid[OID_SIZE];
-#if YAZ_MODULE_ccl
struct ccl_rpn_node *rpn = NULL;
int error, pos;
-#endif
char setstring[100];
Z_RPNQuery *RPNquery;
Odr_oct ccl_query;
-#if YAZ_MODULE_ccl
if (queryType == QueryType_CCL2RPN)
{
rpn = ccl_find_str(bibset, arg, &error, &pos);
return 0;
}
}
-#endif
req->referenceId = set_refid (out);
if (!strcmp(arg, "@big")) /* strictly for troublemaking */
{
ccl_query.buf = (unsigned char*) arg;
ccl_query.len = strlen(arg);
break;
-#if YAZ_MODULE_ccl
case QueryType_CCL2RPN:
query.which = Z_Query_type_1;
RPNquery = ccl_rpn_query(out, rpn);
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
-#endif
default:
printf ("Unsupported query type\n");
return 0;
return 2;
}
+/* display Query Expression as part of searchResult-1 */
+static void display_queryExpression (Z_QueryExpression *qe)
+{
+ if (!qe)
+ return;
+ if (qe->which == Z_QueryExpression_term)
+ {
+ if (qe->u.term->queryTerm)
+ {
+ Z_Term *term = qe->u.term->queryTerm;
+ switch (term->which)
+ {
+ case Z_Term_general:
+ printf (" %.*s", term->u.general->len, term->u.general->buf);
+ break;
+ case Z_Term_characterString:
+ printf (" %s", term->u.characterString);
+ break;
+ case Z_Term_numeric:
+ printf (" %d", *term->u.numeric);
+ break;
+ case Z_Term_null:
+ printf (" null");
+ break;
+ }
+ }
+ }
+}
+
+/* see if we can find USR:SearchResult-1 */
+static void display_searchResult (Z_OtherInformation *o)
+{
+ int i;
+ if (!o)
+ return ;
+ for (i = 0; i < o->num_elements; i++)
+ {
+ if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo)
+ {
+ Z_External *ext = o->list[i]->information.externallyDefinedInfo;
+
+ if (ext->which == Z_External_searchResult1)
+ {
+ int j;
+ Z_SearchInfoReport *sr = ext->u.searchResult1;
+ printf ("SearchResult-1:");
+ for (j = 0; j < sr->num; j++)
+ {
+ if (!sr->elements[j]->subqueryExpression)
+ printf (" %d", j);
+ display_queryExpression (
+ sr->elements[j]->subqueryExpression);
+ display_queryExpression (
+ sr->elements[j]->subqueryInterpretation);
+ display_queryExpression (
+ sr->elements[j]->subqueryRecommendation);
+ if (sr->elements[j]->subqueryCount)
+ printf ("(%d)", *sr->elements[j]->subqueryCount);
+ }
+ printf ("\n");
+ }
+ }
+ }
+}
+
static int process_searchResponse(Z_SearchResponse *res)
{
printf ("Received SearchResponse.\n");
printf("Search was a success.\n");
else
printf("Search was a bloomin' failure.\n");
- printf("Number of hits: %d, setno %d\n",
- *res->resultCount, setnumber);
+ printf("Number of hits: %d", *res->resultCount);
+ if (setnumber >= 0)
+ printf (", setno %d", setnumber);
+ printf ("\n");
+ display_searchResult (res->additionalSearchInfo);
printf("records returned: %d\n",
- *res->numberOfRecordsReturned);
+ *res->numberOfRecordsReturned);
setno += *res->numberOfRecordsReturned;
if (res->records)
display_records(res->records);
{
switch (pStringNumeric->which)
{
- case Z_StringOrNumeric_string:
- print_string(iLevel, pTag, pStringNumeric->u.string);
- break;
-
- case Z_StringOrNumeric_numeric:
- print_int(iLevel, pTag, pStringNumeric->u.numeric);
- break;
-
- default:
- print_level(iLevel);
- printf("%s: valid type for Z_StringOrNumeric\n", pTag);
- break;
+ case Z_StringOrNumeric_string:
+ print_string(iLevel, pTag, pStringNumeric->u.string);
+ break;
+
+ case Z_StringOrNumeric_numeric:
+ print_int(iLevel, pTag, pStringNumeric->u.numeric);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("%s: valid type for Z_StringOrNumeric\n", pTag);
+ break;
}
}
}
print_level(iLevel);
printf("Universe Report Duplicate: \n");
iLevel++;
- print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno);
+ print_string_or_numeric(iLevel, "Hit No",
+ pUniverseReportDuplicate->hitno);
}
}
-static void print_universe_report_hits(int iLevel, Z_UniverseReportHits *pUniverseReportHits)
+static void
+print_universe_report_hits(int iLevel,
+ Z_UniverseReportHits *pUniverseReportHits)
{
if (pUniverseReportHits != NULL)
{
print_level(iLevel);
printf("Universe Report Hits: \n");
iLevel++;
- print_string_or_numeric(iLevel, "Database", pUniverseReportHits->database);
+ print_string_or_numeric(iLevel, "Database",
+ pUniverseReportHits->database);
print_string_or_numeric(iLevel, "Hits", pUniverseReportHits->hits);
}
}
print_int(iLevel, "Total Hits", pUniverseReport->totalHits);
switch (pUniverseReport->which)
{
- case Z_UniverseReport_databaseHits:
- print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits);
- break;
-
- case Z_UniverseReport_duplicate:
- print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate);
- break;
-
- default:
- print_level(iLevel);
- printf("Type: %d\n", pUniverseReport->which);
- break;
+ case Z_UniverseReport_databaseHits:
+ print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits);
+ break;
+
+ case Z_UniverseReport_duplicate:
+ print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("Type: %d\n", pUniverseReport->which);
+ break;
}
}
}
print_string(iLevel, "Descriptor", pExternal->descriptor);
switch (pExternal->which)
{
- case Z_External_universeReport:
- print_universe_report(iLevel, pExternal->u.universeReport);
- break;
-
- default:
- print_level(iLevel);
- printf("Type: %d\n", pExternal->which);
- break;
+ case Z_External_universeReport:
+ print_universe_report(iLevel, pExternal->u.universeReport);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("Type: %d\n", pExternal->which);
+ break;
}
}
}
void process_ESResponse(Z_ExtendedServicesResponse *res)
{
- printf("process_ESResponse status=");
+ printf("Status: ");
switch (*res->operationStatus)
{
case Z_ExtendedServicesResponse_done:
printf ("failure\n");
display_diagrecs(res->diagnostics, res->num_diagnostics);
break;
+ default:
+ printf ("unknown\n");
}
if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
(res->num_diagnostics != 0) ) {
display_diagrecs(res->diagnostics, res->num_diagnostics);
}
+ print_refid (res->referenceId);
+ if (res->taskPackage &&
+ res->taskPackage->which == Z_External_extendedService)
+ {
+ Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService;
+ Odr_oct *id = taskPackage->targetReference;
+ Z_External *ext = taskPackage->taskSpecificParameters;
+
+ if (id)
+ {
+ printf ("Target Reference: ");
+ print_stringn (id->buf, id->len);
+ printf ("\n");
+ }
+ if (ext->which == Z_External_update)
+ {
+ Z_IUUpdateTaskPackage *utp = ext->u.update->u.taskPackage;
+ if (utp && utp->targetPart)
+ {
+ Z_IUTargetPart *targetPart = utp->targetPart;
+ int i;
-}
+ for (i = 0; i<targetPart->num_taskPackageRecords; i++)
+ {
-#if YAZ_MODULE_ill
+ Z_IUTaskPackageRecordStructure *tpr =
+ targetPart->taskPackageRecords[i];
+ printf ("task package record %d\n", i+1);
+ if (tpr->which == Z_IUTaskPackageRecordStructure_record)
+ {
+ display_record (tpr->u.record);
+ }
+ else
+ {
+ printf ("other type\n");
+ }
+ }
+ }
+ }
+ }
+}
const char *get_ill_element (void *clientData, const char *element)
{
- printf ("%s\n", element);
return 0;
}
ctl.odr = out;
ctl.clientData = 0;
ctl.f = get_ill_element;
-
+
req = ill_get_ItemRequest(&ctl, "ill", 0);
if (!req)
printf ("ill_get_ItemRequest failed\n");
r->u.single_ASN1_type = (Odr_oct *)
odr_malloc (out, sizeof(*r->u.single_ASN1_type));
r->u.single_ASN1_type->buf = (unsigned char *)
- odr_malloc (out, item_request_size);
+ odr_malloc (out, item_request_size);
r->u.single_ASN1_type->len = item_request_size;
r->u.single_ASN1_type->size = item_request_size;
memcpy (r->u.single_ASN1_type->buf, item_request_buf,
}
return r;
}
-#endif
-#ifdef YAZ_MODULE_ill
static Z_External *create_external_ILL_APDU(int which)
{
struct ill_get_ctl ctl;
r->u.single_ASN1_type = (Odr_oct *)
odr_malloc (out, sizeof(*r->u.single_ASN1_type));
r->u.single_ASN1_type->buf = (unsigned char *)
- odr_malloc (out, ill_request_size);
+ odr_malloc (out, ill_request_size);
r->u.single_ASN1_type->len = ill_request_size;
r->u.single_ASN1_type->size = ill_request_size;
memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
}
return r;
}
-#endif
static Z_External *create_ItemOrderExternal(const char *type, int itemno)
(int *) odr_malloc(out, sizeof(int));
*r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
-#if YAZ_MODULE_ill
if (!strcmp (type, "item") || !strcmp(type, "2"))
{
printf ("using item-request\n");
}
else if (!strcmp(type, "xml") || !strcmp(type, "3"))
{
- const char *xml_buf =
- "<itemorder>\n"
- " <type>request</type>\n"
- " <libraryNo>000200</libraryNo>\n"
- " <borrowerTicketNo> 1212 </borrowerTicketNo>\n"
- "</itemorder>";
+ const char *xml_buf =
+ "<itemorder>\n"
+ " <type>request</type>\n"
+ " <libraryNo>000200</libraryNo>\n"
+ " <borrowerTicketNo> 1212 </borrowerTicketNo>\n"
+ "</itemorder>";
r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
z_ext_record (out, VAL_TEXT_XML, xml_buf, strlen(xml_buf));
}
else
r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
-#else
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
-#endif
return r;
}
oident update_oid;
printf ("Update request\n");
fflush(stdout);
-
+
if (!record_last)
return 0;
update_oid.proto = PROTO_Z3950;
return 2;
}
-/* II : Added to do DALI Item Order Extended services request */
static int cmd_itemorder(char *arg)
{
char type[12];
int itemno;
-
+
if (sscanf (arg, "%10s %d", type, &itemno) != 2)
return 0;
printf("Item order request\n");
fflush(stdout);
send_itemorder(type, itemno);
- return(2);
+ return 2;
}
static int cmd_find(char *arg)
static int cmd_setnames(char *arg)
{
- if (setnumber < 0)
- {
- printf("Set numbering enabled.\n");
+ if (*arg == '1') /* enable ? */
+ setnumber = 0;
+ else if (*arg == '0') /* disable ? */
+ setnumber = -1;
+ else if (setnumber < 0) /* no args, toggle .. */
setnumber = 0;
- }
else
- {
- printf("Set numbering disabled.\n");
setnumber = -1;
- }
+
+ if (setnumber >= 0)
+ printf("Set numbering enabled.\n");
+ else
+ printf("Set numbering disabled.\n");
return 1;
}
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;
printf("Sent presentRequest (%d+%d).\n", setno, nos);
return 2;
}
+
+static void close_session (void)
+{
+ cs_close (conn);
+ conn = 0;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
+ sent_close = 0;
+}
void process_close(Z_Close *req)
{
printf("Reason: %s, message: %s\n", reasons[*req->closeReason],
req->diagnosticInformation ? req->diagnosticInformation : "NULL");
if (sent_close)
- {
- cs_close (conn);
- conn = NULL;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
- sent_close = 0;
- }
+ close_session ();
else
{
*res->closeReason = Z_Close_finished;
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
Z_ScanRequest *req = apdu->u.scanRequest;
int use_rpn = 1;
-#if YAZ_MODULE_ccl
int oid[OID_SIZE];
if (queryType == QueryType_CCL2RPN)
}
ccl_rpn_delete (rpn);
}
-#endif
if (use_rpn && !(req->termListAndStartPoint =
p_query_scan(out, protocol, &req->attributeSet, query)))
{
queryType = QueryType_CCL;
else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn"))
queryType = QueryType_Prefix;
-#if YAZ_MODULE_ccl
else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn"))
queryType = QueryType_CCL2RPN;
-#endif
else
{
printf ("Querytype must be one of:\n");
printf (" prefix - Prefix query\n");
printf (" ccl - CCL query\n");
-#if YAZ_MODULE_ccl
printf (" ccl2rpn - CCL query converted to RPN\n");
-#endif
return 0;
}
return 1;
return 2;
}
-int cmd_packagename(char* arg) {
+int cmd_packagename(char* arg)
+{
xfree (esPackageName);
esPackageName = NULL;
if (*arg)
strcpy (esPackageName, arg);
}
return 1;
-};
+}
-int cmd_proxy(char* arg) {
+int cmd_proxy(char* arg)
+{
+ if (*arg == '\0') {
+ printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL);
+ return 1;
+ }
xfree (yazProxy);
yazProxy = NULL;
if (*arg)
strcpy (yazProxy, arg);
}
return 1;
-};
+}
-static void initialize(void)
+int cmd_charset(char* arg)
{
-#if YAZ_MODULE_ccl
- FILE *inf;
-#endif
- if (!(out = odr_createmem(ODR_ENCODE)) ||
- !(in = odr_createmem(ODR_DECODE)) ||
- !(print = odr_createmem(ODR_PRINT)))
+ char l1[30], l2[30];
+
+ *l1 = *l2 = 0;
+ if (sscanf(arg, "%29s %29s", l1, l2) < 1)
{
- fprintf(stderr, "failed to allocate ODR streams\n");
- exit(1);
+ printf("Current character set is `%s'\n", (yazCharset) ?
+ yazCharset:NULL);
+ return 1;
}
- setvbuf(stdout, 0, _IONBF, 0);
- if (apdu_file)
- odr_setprint(print, apdu_file);
-
-#if YAZ_MODULE_ccl
- bibset = ccl_qual_mk ();
- inf = fopen (ccl_fields, "r");
- if (inf)
+ xfree (yazCharset);
+ yazCharset = NULL;
+ if (*l1)
+ yazCharset = xstrdup(l1);
+ if (*l2)
{
- ccl_qual_file (bibset, inf);
- fclose (inf);
+ odr_set_charset (out, l1, l2);
+ odr_set_charset (in, l2, l1);
}
-#endif
- cmd_base("Default");
+ return 1;
}
-static int client(int wait)
+int cmd_lang(char* arg)
{
- static struct {
- char *cmd;
- int (*fun)(char *arg);
- char *ad;
- } cmd[] = {
- {"open", cmd_open, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
- {"quit", cmd_quit, ""},
- {"find", cmd_find, "<query>"},
- {"delete", cmd_delete, "<setname>"},
- {"base", cmd_base, "<base-name>"},
- {"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>"},
- {"mspn", cmd_mspn, "<mediumSetPresentNumber>"},
- {"status", cmd_status, ""},
- {"setnames", cmd_setnames, ""},
- {"cancel", cmd_cancel, ""},
- {"format", cmd_format, "<recordsyntax>"},
- {"schema", cmd_schema, "<schema>"},
- {"elements", cmd_elements, "<elementSetName>"},
- {"close", cmd_close, ""},
- {"attributeset", cmd_attributeset, "<attrset>"},
- {"querytype", cmd_querytype, "<type>"},
- {"refid", cmd_refid, "<id>"},
- {"itemorder", cmd_itemorder, "ill|item <itemno>"},
- {"update", cmd_update, "<item>"},
- {"packagename", cmd_packagename, "<packagename>"},
- {"proxy", cmd_proxy, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
- /* Server Admin Functions */
- {"adm-reindex", cmd_adm_reindex, "<database-name>"},
- {"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
- {"adm-create", cmd_adm_create, ""},
- {"adm-drop", cmd_adm_drop, "('database'|'index')<object-name>"},
- {"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>"},
- {"adm-refresh", cmd_adm_refresh, ""},
- {"adm-commit", cmd_adm_commit, ""},
- {"adm-shutdown", cmd_adm_shutdown, ""},
- {"adm-startup", cmd_adm_startup, ""},
- {0,0}
- };
- char *netbuffer= 0;
- int netbufferlen = 0;
- int i;
- Z_APDU *apdu;
-#if HAVE_GETTIMEOFDAY
- struct timeval tv_start, tv_end;
- gettimeofday (&tv_start, 0);
-#endif
+ if (*arg == '\0') {
+ printf("Current language is `%s'\n", (yazLang)?yazLang:NULL);
+ return 1;
+ }
+ xfree (yazLang);
+ yazLang = NULL;
+ if (*arg)
+ {
+ yazLang = (char *) xmalloc (strlen(arg)+1);
+ strcpy (yazLang, arg);
+ }
+ return 1;
+}
+
+int cmd_source(char* arg)
+{
+ /* first should open the file and read one line at a time.. */
+ FILE* includeFile;
+ char line[1024], *cp;
- while (1)
{
- int res;
-#ifdef USE_SELECT
- fd_set input;
-#endif
- char line[1024], word[32], arg[1024];
+ char* args_end=(arg)+strlen(arg)-1;
+ while(isspace(*args_end))
+ {*args_end=0;
+ --args_end;};
+ }
+
+ REMOVE_TAILING_BLANKS(arg);
+
+ if(strlen(arg)<1) {
+ fprintf(stderr,"Error in source command use a filename\n");
+ return -1;
+ }
+
+ includeFile = fopen (arg, "r");
+
+ if(!includeFile) {
+ fprintf(stderr,"Unable to open file %s for reading\n",arg);
+ return -1;
+ }
+
+ while(!feof(includeFile)) {
+ memset(line,0,sizeof(line));
+ fgets(line,sizeof(line),includeFile);
-#ifdef USE_SELECT
- FD_ZERO(&input);
- FD_SET(0, &input);
- if (conn)
- FD_SET(cs_fileno(conn), &input);
- if ((res = select(20, &input, 0, 0, 0)) < 0)
+ if(strlen(line) < 2) continue;
+ if(line[0] == '#') continue;
+
+ if ((cp = strrchr (line, '\n')))
+ *cp = '\0';
+
+ process_cmd_line(line);
+ }
+
+ if(fclose(includeFile)<0) {
+ perror("unable to close include file");
+ exit(1);
+ }
+ return 1;
+}
+
+int cmd_subshell(char* args)
+{
+ if(strlen(args))
+ system(args);
+ else
+ system(getenv("SHELL"));
+
+ printf("\n");
+ return 1;
+}
+
+int cmd_set_apdufile(char* arg)
+{
+ REMOVE_TAILING_BLANKS(arg);
+
+ if(apdu_file && apdu_file != stderr) { /* don't close stdout*/
+ perror("unable to close apdu log file");
+ }
+ apdu_file=NULL;
+
+ if(strlen(arg)<1) {
+ return 1;
+ }
+
+ if(!strcmp(arg,"-"))
+ apdu_file=stderr;
+ else
+ apdu_file=fopen(arg, "a");
+
+ if(!apdu_file) {
+ perror("unable to open apdu log file no apdu log loaded");
+ } else {
+ odr_setprint(print, apdu_file);
+ }
+
+ return 1;
+}
+
+int cmd_set_cclfields(char* arg)
+{
+ FILE *inf;
+
+ REMOVE_TAILING_BLANKS(arg);
+
+ bibset = ccl_qual_mk ();
+ inf = fopen (arg, "r");
+ if (inf)
+ {
+ ccl_qual_file (bibset, inf);
+ fclose (inf);
+ }
+
+ return 1;
+}
+
+int cmd_set_marcdump(char* arg)
+{
+ if(marcdump && marcdump != stderr) { /* don't close stdout*/
+ perror("unable to close apdu log file");
+ }
+ marcdump=NULL;
+
+ if(strlen(arg)<1) {
+ return 1;
+ }
+
+ if(!strcmp(arg,"-"))
+ marcdump=stderr;
+ else
+ marcdump=fopen(arg, "a");
+
+ if(!marcdump) {
+ perror("unable to open apdu marcdump file no marcdump done\n");
+ }
+
+ return 1;
+}
+
+int cmd_set_proxy(char* arg) {
+ if(yazProxy) free(yazProxy);
+ yazProxy=NULL;
+
+ if(strlen(arg) > 1) {
+ yazProxy=strdup(arg);
+ }
+ return 1;
+}
+
+/*
+ this command takes 3 arge {name class oid}
+ */
+int cmd_register_oid(char* args) {
+ static struct {
+ char* className;
+ oid_class oclass;
+ } oid_classes[] = {
+ {"appctx",CLASS_APPCTX},
+ {"absyn",CLASS_ABSYN},
+ {"attset",CLASS_ATTSET},
+ {"transyn",CLASS_TRANSYN},
+ {"diagset",CLASS_DIAGSET},
+ {"recsyn",CLASS_RECSYN},
+ {"resform",CLASS_RESFORM},
+ {"accform",CLASS_ACCFORM},
+ {"extserv",CLASS_EXTSERV},
+ {"userinfo",CLASS_USERINFO},
+ {"elemspec",CLASS_ELEMSPEC},
+ {"varset",CLASS_VARSET},
+ {"schema",CLASS_SCHEMA},
+ {"tagset",CLASS_TAGSET},
+ {"general",CLASS_GENERAL},
+ {0,0}
+ };
+ char oname_str[101], oclass_str[101], oid_str[101];
+ char* name;
+ int i;
+ oid_class oidclass = CLASS_GENERAL;
+ int val = 0, oid[OID_SIZE];
+ struct oident * new_oident=NULL;
+
+ if (sscanf (args, "%100[^ ] %100[^ ] %100s",
+ oname_str,oclass_str, oid_str) < 1) {
+ printf("Error in regristrate command \n");
+ return 0;
+ }
+
+ for (i = 0; oid_classes[i].className; i++) {
+ if (!strcmp(oid_classes[i].className, oclass_str))
{
- perror("select");
- exit(1);
+ oidclass=oid_classes[i].oclass;
+ break;
}
- if (!res)
- continue;
- if (!wait && FD_ISSET(0, &input))
-#else
- if (!wait)
-#endif
+ }
+
+ if(!(oid_classes[i].className)) {
+ printf("Unknonwn oid class %s\n",oclass_str);
+ return 0;
+ }
+
+ i = 0;
+ name = oid_str;
+ val = 0;
+
+ while (isdigit (*name))
+ {
+ val = val*10 + (*name - '0');
+ name++;
+ if (*name == '.')
{
-#if HAVE_READLINE_READLINE_H
- char* line_in;
- line_in=readline(C_PROMPT);
- if (!line_in)
- break;
+ if (i < OID_SIZE-1)
+ oid[i++] = val;
+ val = 0;
+ name++;
+ }
+ }
+ oid[i] = val;
+ oid[i+1] = -1;
+
+ new_oident=oid_addent (oid,PROTO_GENERAL,oidclass,oname_str,VAL_DYNAMIC);
+ if(strcmp(new_oident->desc,oname_str)) {
+ fprintf(stderr,"oid is already named as %s, regristration faild\n",
+ new_oident->desc);
+ }
+ return 1;
+}
+
+int cmd_push_command(char* arg)
+{
#if HAVE_READLINE_HISTORY_H
- if (*line_in)
- add_history(line_in);
+ if(strlen(arg)>1)
+ add_history(arg);
+#else
+ fprintf(stderr,"Not compiled with the readline/history module\n");
#endif
- strcpy(line,line_in);
- free (line_in);
-#else
- char *end_p;
- printf (C_PROMPT);
- fflush(stdout);
- if (!fgets(line, 1023, stdin))
- break;
- if ((end_p = strchr (line, '\n')))
- *end_p = '\0';
-#endif
+ return 1;
+}
+
+void source_rcfile()
+{
+ /* Look for a $HOME/.yazclientrc and source it if it exists */
+ struct stat statbuf;
+ char buffer[1000];
+ char* homedir=getenv("HOME");
+
+ if(!homedir) return;
+
+ sprintf(buffer,"%s/.yazclientrc",homedir);
+
+ if(stat(buffer,&statbuf)==0) {
+ cmd_source(buffer);
+ }
+
+ if(stat(".yazclientrc",&statbuf)==0) {
+ cmd_source(".yazclientrc");
+ }
+}
+
+
+static void initialize(void)
+{
+ FILE *inf;
+ if (!(out = odr_createmem(ODR_ENCODE)) ||
+ !(in = odr_createmem(ODR_DECODE)) ||
+ !(print = odr_createmem(ODR_PRINT)))
+ {
+ fprintf(stderr, "failed to allocate ODR streams\n");
+ exit(1);
+ }
+ oid_init();
+
+ setvbuf(stdout, 0, _IONBF, 0);
+ if (apdu_file)
+ odr_setprint(print, apdu_file);
+
+ bibset = ccl_qual_mk ();
+ inf = fopen (ccl_fields, "r");
+ if (inf)
+ {
+ ccl_qual_file (bibset, inf);
+ fclose (inf);
+ }
+ cmd_base("Default");
+
+#if HAVE_READLINE_READLINE_H
+ rl_attempted_completion_function = (CPPFunction*)readline_completer;
+#endif
+
+ source_rcfile();
+}
+
+
#if HAVE_GETTIMEOFDAY
- gettimeofday (&tv_start, 0);
+struct timeval tv_start, tv_end;
#endif
- if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
+void wait_and_handle_responce()
+{
+
+ int res;
+ char *netbuffer= 0;
+ int netbufferlen = 0;
+ Z_APDU *apdu;
+
+
+ if (conn)
+ {
+ do
+ {
+ if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0)
{
- strcpy(word, last_cmd);
- *arg = '\0';
+ printf("Target closed connection\n");
+ close_session ();
+ break;
}
- else if (res == 1)
- *arg = 0;
- strcpy(last_cmd, word);
- for (i = 0; cmd[i].cmd; i++)
- if (!strncmp(cmd[i].cmd, word, strlen(word)))
- {
- res = (*cmd[i].fun)(arg);
- break;
- }
- if (!cmd[i].cmd) /* dump our help-screen */
+ if (!res)
{
- printf("Unknown command: %s.\n", word);
- printf("Currently recognized commands:\n");
- for (i = 0; cmd[i].cmd; i++)
- printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
- res = 1;
+ printf("Target closed connection.\n");
+ close_session ();
+ break;
+ }
+ odr_reset(in); /* release APDU from last round */
+ record_last = 0;
+ odr_setbuf(in, netbuffer, res, 0);
+ if (!z_APDU(in, &apdu, 0, 0))
+ {
+ odr_perror(in, "Decoding incoming APDU");
+ fprintf(stderr, "[Near %d]\n", odr_offset(in));
+ fprintf(stderr, "Packet dump:\n---------\n");
+ odr_dumpBER(stderr, netbuffer, res);
+ fprintf(stderr, "---------\n");
+ if (apdu_file)
+ z_APDU(print, &apdu, 0, 0);
+ close_session ();
+ break;
}
- if (res < 2)
+ if (apdu_file && !z_APDU(print, &apdu, 0, 0))
{
+ odr_perror(print, "Failed to print incoming APDU");
+ odr_reset(print);
continue;
}
- }
- wait = 0;
- if (conn
-#ifdef USE_SELECT
- && FD_ISSET(cs_fileno(conn), &input)
-#endif
- )
- {
- do
+ switch(apdu->which)
{
- if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0)
- {
- perror("cs_get");
- exit(1);
- }
- if (!res)
- {
- printf("Target closed connection.\n");
- exit(1);
- }
- odr_reset(in); /* release APDU from last round */
- record_last = 0;
- odr_setbuf(in, netbuffer, res, 0);
- if (!z_APDU(in, &apdu, 0, 0))
- {
- odr_perror(in, "Decoding incoming APDU");
- fprintf(stderr, "[Near %d]\n", odr_offset(in));
- fprintf(stderr, "Packet dump:\n---------\n");
- odr_dumpBER(stderr, netbuffer, res);
- fprintf(stderr, "---------\n");
- if (apdu_file)
- z_APDU(print, &apdu, 0, 0);
- exit(1);
- }
- if (apdu_file && !z_APDU(print, &apdu, 0, 0))
- {
- odr_perror(print, "Failed to print incoming APDU");
- odr_reset(print);
- continue;
- }
- 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:
- print_refid (apdu->u.presentResponse->referenceId);
- setno +=
- *apdu->u.presentResponse->numberOfRecordsReturned;
- if (apdu->u.presentResponse->records)
- display_records(apdu->u.presentResponse->records);
- else
- printf("No records.\n");
- printf ("nextResultSetPosition = %d\n",
+ 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:
+ print_refid (apdu->u.presentResponse->referenceId);
+ setno +=
+ *apdu->u.presentResponse->numberOfRecordsReturned;
+ if (apdu->u.presentResponse->records)
+ display_records(apdu->u.presentResponse->records);
+ else
+ printf("No records.\n");
+ printf ("nextResultSetPosition = %d\n",
*apdu->u.presentResponse->nextResultSetPosition);
- break;
- case Z_APDU_sortResponse:
- process_sortResponse(apdu->u.sortResponse);
- break;
- case Z_APDU_extendedServicesResponse:
- printf("Got extended services response\n");
- process_ESResponse(apdu->u.extendedServicesResponse);
- break;
- case Z_APDU_close:
- printf("Target has closed the association.\n");
- process_close(apdu->u.close);
- break;
- case Z_APDU_resourceControlRequest:
- process_resourceControlRequest
- (apdu->u.resourceControlRequest);
- break;
- case Z_APDU_deleteResultSetResponse:
- process_deleteResultSetResponse(apdu->u.
- deleteResultSetResponse);
- break;
- default:
- printf("Received unknown APDU type (%d).\n",
- apdu->which);
- exit(1);
- }
+ break;
+ case Z_APDU_sortResponse:
+ process_sortResponse(apdu->u.sortResponse);
+ break;
+ case Z_APDU_extendedServicesResponse:
+ printf("Got extended services response\n");
+ process_ESResponse(apdu->u.extendedServicesResponse);
+ break;
+ case Z_APDU_close:
+ printf("Target has closed the association.\n");
+ process_close(apdu->u.close);
+ break;
+ case Z_APDU_resourceControlRequest:
+ process_resourceControlRequest
+ (apdu->u.resourceControlRequest);
+ break;
+ case Z_APDU_deleteResultSetResponse:
+ process_deleteResultSetResponse(apdu->u.
+ deleteResultSetResponse);
+ break;
+ default:
+ printf("Received unknown APDU type (%d).\n",
+ apdu->which);
+ close_session ();
}
- while (conn && cs_more(conn));
+ }
+ while (conn && cs_more(conn));
#if HAVE_GETTIMEOFDAY
- gettimeofday (&tv_end, 0);
- if (1)
- {
- printf ("Elapsed: %.6f\n", (double) tv_end.tv_usec /
- 1e6 + tv_end.tv_sec -
- ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec));
+ gettimeofday (&tv_end, 0);
+#if 0
+ printf ("S/U S/U=%ld/%ld %ld/%ld",
+ (long) tv_start.tv_sec,
+ (long) tv_start.tv_usec,
+ (long) tv_end.tv_sec,
+ (long) tv_end.tv_usec);
+#endif
+ printf ("Elapsed: %.6f\n",
+ (double) tv_end.tv_usec / 1e6 + tv_end.tv_sec -
+ ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec));
+#endif
+ }
+ xfree (netbuffer);
+}
+
+
+int cmd_cclparse(char* arg) {
+ int error, pos;
+ struct ccl_rpn_node *rpn=NULL;
+
+
+ rpn = ccl_find_str (bibset, arg, &error, &pos);
+
+ if (error) {
+ printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " ");
+ printf ("%s\n", ccl_err_msg (error));
+ }
+ else
+ {
+ if (rpn)
+ {
+ ccl_pr_tree(rpn, stdout);
+ }
+ }
+ if (rpn)
+ ccl_rpn_delete(rpn);
+
+ printf ("\n");
+
+ return 0;
+};
+
+
+static int cmd_help (char *line);
+
+typedef char *(*completerFunctionType)(const char *text, int state);
+
+static struct {
+ char *cmd;
+ int (*fun)(char *arg);
+ char *ad;
+ completerFunctionType rl_completerfunction;
+ int complete_filenames;
+ char **local_tabcompletes;
+} cmd[] = {
+ {"open", cmd_open, "('tcp'|'ssl')':<host>[':'<port>][/<db>]",NULL,0,NULL},
+ {"quit", cmd_quit, "",NULL,0,NULL},
+ {"find", cmd_find, "<query>",NULL,0,NULL},
+ {"delete", cmd_delete, "<setname>",NULL,0,NULL},
+ {"base", cmd_base, "<base-name>",NULL,0,NULL},
+ {"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
+ {"scan", cmd_scan, "<term>",NULL,0,NULL},
+ {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
+ {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
+ {"authentication", cmd_authentication, "<acctstring>",NULL,0,NULL},
+ {"lslb", cmd_lslb, "<largeSetLowerBound>",NULL,0,NULL},
+ {"ssub", cmd_ssub, "<smallSetUpperBound>",NULL,0,NULL},
+ {"mspn", cmd_mspn, "<mediumSetPresentNumber>",NULL,0,NULL},
+ {"status", cmd_status, "",NULL,0,NULL},
+ {"setnames", cmd_setnames, "",NULL,0,NULL},
+ {"cancel", cmd_cancel, "",NULL,0,NULL},
+ {"format", cmd_format, "<recordsyntax>",complete_format,0,NULL},
+ {"schema", cmd_schema, "<schema>",complete_schema,0,NULL},
+ {"elements", cmd_elements, "<elementSetName>",NULL,0,NULL},
+ {"close", cmd_close, "",NULL,0,NULL},
+ {"attributeset", cmd_attributeset, "<attrset>",complete_attributeset,0,NULL},
+ {"querytype", cmd_querytype, "<type>",complete_querytype,0,NULL},
+ {"refid", cmd_refid, "<id>",NULL,0,NULL},
+ {"itemorder", cmd_itemorder, "ill|item <itemno>",NULL,0,NULL},
+ {"update", cmd_update, "<item>",NULL,0,NULL},
+ {"packagename", cmd_packagename, "<packagename>",NULL,0,NULL},
+ {"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0,NULL},
+ {"charset", cmd_charset, "<charset_name>",NULL,0,NULL},
+ {"lang", cmd_lang, "<language_code>",NULL,0,NULL},
+ {".", cmd_source, "<filename>",NULL,1,NULL},
+ {"!", cmd_subshell, "Subshell command",NULL,1,NULL},
+ {"set_apdufile", cmd_set_apdufile, "<filename>",NULL,1,NULL},
+ {"set_marcdump", cmd_set_marcdump," <filename>",NULL,1,NULL},
+ {"set_cclfile", cmd_set_cclfields," <filename>",NULL,1,NULL},
+ {"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
+ {"push_command", cmd_push_command,"<command>",command_generator,0,NULL},
+ {"register_tab", cmd_register_tab,"<commandname> <tab>",command_generator,0,NULL},
+ {"cclparse", cmd_cclparse,"<ccl find command>",NULL,0,NULL},
+ /* Server Admin Functions */
+ {"adm-reindex", cmd_adm_reindex, "<database-name>",NULL,0,NULL},
+ {"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>",NULL,0,NULL},
+ {"adm-create", cmd_adm_create, "",NULL,0,NULL},
+ {"adm-drop", cmd_adm_drop, "('database'|'index')<object-name>",NULL,0,NULL},
+ {"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>",NULL,0,NULL},
+ {"adm-refresh", cmd_adm_refresh, "",NULL,0,NULL},
+ {"adm-commit", cmd_adm_commit, "",NULL,0,NULL},
+ {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL},
+ {"adm-startup", cmd_adm_startup, "",NULL,0,NULL},
+ {"help", cmd_help, "", NULL,0,NULL},
+ {0,0,0,0,0,0}
+};
+
+static int cmd_help (char *line)
+{
+ int i;
+ char topic[21];
+
+ *topic = 0;
+ sscanf (line, "%20s", topic);
+
+ if (*topic == 0)
+ printf("Commands:\n");
+ for (i = 0; cmd[i].cmd; i++)
+ if (*topic == 0 || strcmp (topic, cmd[i].cmd) == 0)
+ printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
+ if (strcmp (topic, "find") == 0)
+ {
+ printf ("RPN:\n");
+ printf (" \"term\" Simple Term\n");
+ printf (" @attr [attset] type=value op Attribute\n");
+ printf (" @and opl opr And\n");
+ printf (" @or opl opr Or\n");
+ printf (" @not opl opr And-Not\n");
+ printf (" @set set Result set\n");
+ printf ("\n");
+ printf ("Bib-1 attribute types\n");
+ printf ("1=Use: ");
+ printf ("4=Title 7=ISBN 8=ISSN 30=Date 62=Abstract 1003=Author 1016=Any\n");
+ printf ("2=Relation: ");
+ printf ("1< 2<= 3= 4>= 5> 6!= 102=Relevance\n");
+ printf ("3=Position: ");
+ printf ("1=First in Field 2=First in subfield 3=Any position\n");
+ printf ("4=Structure: ");
+ printf ("1=Phrase 2=Word 3=Key 4=Year 5=Date 6=WordList\n");
+ printf ("5=Truncation: ");
+ printf ("1=Right 2=Left 3=L&R 100=No 101=# 102=Re-1 103=Re-2\n");
+ printf ("6=Completeness:");
+ printf ("1=Incomplete subfield 2=Complete subfield 3=Complete field\n");
+ }
+ return 1;
+}
+
+int cmd_register_tab(char* arg) {
+
+ char command[101], tabargument[101];
+ int i;
+ int num_of_tabs;
+ char** tabslist;
+
+ if (sscanf (arg, "%100s %100s", command, tabargument) < 1) {
+ return 0;
+ };
+
+ /* locate the amdn in the list */
+ for (i = 0; cmd[i].cmd; i++) {
+ if (!strncmp(cmd[i].cmd, command, strlen(command))) {
+ break;
+ }
+ }
+
+ if(!cmd[i].cmd) {
+ fprintf(stderr,"Unknown command %s\n",command);
+ return 1;
+ };
+
+
+
+ if(!cmd[i].local_tabcompletes) {
+ cmd[i].local_tabcompletes = calloc(1,sizeof(char**));
+ };
+
+ num_of_tabs=0;
+
+ tabslist = cmd[i].local_tabcompletes;
+ for(;tabslist && *tabslist;tabslist++) {
+ num_of_tabs++;
+ };
+
+ cmd[i].local_tabcompletes=realloc(cmd[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**));
+ tabslist=cmd[i].local_tabcompletes;
+ tabslist[num_of_tabs]=strdup(tabargument);
+ tabslist[num_of_tabs+1]=NULL;
+ return 1;
+}
+
+
+void process_cmd_line(char* line)
+{
+ int i,res;
+ char word[32], arg[1024];
+
+#if HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+
+ if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
+ {
+ strcpy(word, last_cmd);
+ *arg = '\0';
+ }
+ else if (res == 1)
+ *arg = 0;
+ strcpy(last_cmd, word);
+
+ /* removed tailing spaces from the arg command */
+ {
+ char* p;
+ char* lastnonspace=NULL;
+ p = arg;
+
+ for(;*p; ++p) {
+ if(!isspace(*p)) {
+ lastnonspace = p;
}
+ }
+ if(lastnonspace)
+ *(++lastnonspace) = 0;
+ }
+
+
+ for (i = 0; cmd[i].cmd; i++)
+ if (!strncmp(cmd[i].cmd, word, strlen(word)))
+ {
+ res = (*cmd[i].fun)(arg);
+ break;
+ }
+
+ if (!cmd[i].cmd) /* dump our help-screen */
+ {
+ printf("Unknown command: %s.\n", word);
+ cmd_help ("");
+ res = 1;
+ }
+
+ if(apdu_file) fflush(apdu_file);
+
+ if (res >= 2)
+ wait_and_handle_responce();
+
+ if(apdu_file)
+ fflush(apdu_file);
+ if(marcdump)
+ fflush(marcdump);
+}
+
+
+char *command_generator(const char *text, int state)
+{
+ static int idx;
+ if (state==0) {
+ idx = 0;
+ }
+ for( ; cmd[idx].cmd; ++idx) {
+ if (!strncmp(cmd[idx].cmd,text,strlen(text))) {
+ ++idx; /* skip this entry on the next run */
+ return strdup(cmd[idx-1].cmd);
+ }
+ }
+ return NULL;
+}
+
+
+/*
+ This function only known how to complete on the first word
+*/
+char ** readline_completer(char *text, int start, int end) {
+#if HAVE_READLINE_READLINE_H
+
+ completerFunctionType completerToUse;
+
+ if(start == 0) {
+#if HAVE_READLINE_RL_COMPLETION_MATCHES
+ char** res=rl_completion_matches(text,
+ command_generator);
+#else
+ char** res=completion_matches(text,
+ (CPFunction*)command_generator);
#endif
+ rl_attempted_completion_over = 1;
+ return res;
+ } else {
+ char arg[1024],word[32];
+ int i=0 ,res;
+ if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {
+ rl_attempted_completion_over = 1;
+ return NULL;
+ }
+
+ if(start != strlen(word) +1 ) {
+ rl_attempted_completion_over = 1;
+ return 0;
+ }
+ for (i = 0; cmd[i].cmd; i++) {
+ if (!strncmp(cmd[i].cmd, word, strlen(word))) {
+ break;
+ }
+ }
+
+ if(!cmd[i].cmd) return NULL;
+
+
+ curret_global_list = cmd[i].local_tabcompletes;
+
+ completerToUse = cmd[i].rl_completerfunction;
+ if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */
+ completerToUse = default_completer;
+
+ if(completerToUse) {
+#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES
+ char** res=
+ rl_completion_matches(text,
+ completerToUse);
+#else
+ char** res=
+ completion_matches(text,
+ (CPFunction*)completerToUse);
+#endif
+ if(!cmd[i].complete_filenames)
+ rl_attempted_completion_over = 1;
+ return res;
+ } else {
+ if(!cmd[i].complete_filenames)
+ rl_attempted_completion_over = 1;
+ return 0;
}
}
+#else
return 0;
+#endif
+}
+
+
+static void client(void)
+{
+ char line[1024];
+
+ line[1023] = '\0';
+
+#if HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+
+ while (1)
+ {
+ char *line_in = NULL;
+#if HAVE_READLINE_READLINE_H
+ if (isatty(0))
+ {
+ line_in=readline(C_PROMPT);
+ if (!line_in)
+ break;
+#if HAVE_READLINE_HISTORY_H
+ if (*line_in)
+ add_history(line_in);
+#endif
+ strncpy(line, line_in, 1023);
+ free (line_in);
+ }
+#endif
+ if (!line_in)
+ {
+ char *end_p;
+ printf (C_PROMPT);
+ fflush(stdout);
+ if (!fgets(line, 1023, stdin))
+ break;
+ if ((end_p = strchr (line, '\n')))
+ *end_p = '\0';
+ }
+ process_cmd_line(line);
+ }
}
int main(int argc, char **argv)
{
char *prog = *argv;
+ char *open_command = 0;
+ char *auth_command = 0;
char *arg;
int ret;
- int opened = 0;
-
- while ((ret = options("c:a:m:v:p:", argv, argc, &arg)) != -2)
+
+ while ((ret = options("k:c:a:m:v:p:u:", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
- if (!opened)
+ if (!open_command)
{
- initialize ();
- if (cmd_open (arg) == 2) {
-#if HAVE_READLINE_HISTORY_H
- char* tmp=(char*)malloc(strlen(arg)+6);
- *tmp=0;
- strcat(tmp,"open ");
- strcat(tmp,arg);
- add_history(tmp);
- free(tmp);
-#endif
- opened = 1;
- };
+ open_command = (char *) xmalloc (strlen(arg)+6);
+ strcpy (open_command, "open ");
+ strcat (open_command, arg);
}
break;
+ case 'k':
+ kilobytes = atoi(arg);
+ break;
case 'm':
if (!(marcdump = fopen (arg, "a")))
{
exit (1);
}
break;
- case 'c':
- strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
- ccl_fields[sizeof(ccl_fields)-1] = '\0';
- break;
+ case 'c':
+ strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+ ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ break;
case 'a':
if (!strcmp(arg, "-"))
apdu_file=stderr;
else
apdu_file=fopen(arg, "a");
break;
- case 'p':
- yazProxy=strdup(arg);
- break;
+ case 'p':
+ yazProxy=strdup(arg);
+ break;
+ case 'u':
+ if (!auth_command)
+ {
+ auth_command = (char *) xmalloc (strlen(arg)+6);
+ strcpy (auth_command, "auth ");
+ strcat (auth_command, arg);
+ }
+ break;
case 'v':
yaz_log_init (yaz_log_mask_str(arg), "", NULL);
break;
default:
fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
- "[-c cclfields] [-p <proxy-addr>] [<server-addr>]\n",
+ "[-c cclfields]\n [-p <proxy-addr>] [-u <auth>] "
+ "[-k size] [<server-addr>]\n",
prog);
exit (1);
- }
+ }
}
- if (!opened)
- initialize ();
- return client (opened);
+ initialize();
+ if (auth_command)
+ {
+#ifdef HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+ process_cmd_line (auth_command);
+#if HAVE_READLINE_HISTORY_H
+ add_history(auth_command);
+#endif
+ xfree(auth_command);
+ }
+ if (open_command)
+ {
+#ifdef HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+ process_cmd_line (open_command);
+#if HAVE_READLINE_HISTORY_H
+ add_history(open_command);
+#endif
+ xfree(open_command);
+ }
+ client ();
+ exit (0);
}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
projects / yaz-moved-to-github.git / blobdiff