-/*
- * Copyright (c) 1995-2000, Index Data
+/*
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: client.c,v $
- * Revision 1.100 2000-03-20 19:29:59 adam
- * Minor change.
- *
- * Revision 1.99 2000/03/20 19:06:25 adam
- * Added Segment request for fronend server. Work on admin for client.
- *
- * Revision 1.98 2000/03/16 13:55:49 ian
- * Added commands for sending shutdown and startup admin requests via the admin ES.
- *
- * Revision 1.97 2000/03/14 14:06:04 ian
- * Minor change to order of debugging output for send_apdu,
- * fixed encoding of admin request.
- *
- * Revision 1.96 2000/03/14 09:27:07 ian
- * Added code to enable sending of admin extended service requests
- *
- * Revision 1.95 2000/02/28 11:20:05 adam
- * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
- *
- * Revision 1.94 2000/01/31 13:15:21 adam
- * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
- * that some characters are not surrounded by spaces in resulting term.
- * ILL-code updates.
- *
- * Revision 1.93 2000/01/15 09:39:50 adam
- * Implemented ill_get_ILLRequest. More ILL testing for client.
- *
- * Revision 1.92 1999/12/21 16:24:48 adam
- * More robust ISO2709 handling (in case of real bad formats).
- *
- * Revision 1.91 1999/12/16 23:36:19 adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.90 1999/11/30 13:47:11 adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.89 1999/11/04 14:58:44 adam
- * Added status elements for backend delete result set handler.
- * Updated delete result result set command for client.
- *
- * Revision 1.88 1999/10/11 10:00:29 adam
- * Modified printing of records.
- *
- * Revision 1.87 1999/08/27 09:40:32 adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.86 1999/07/06 12:13:35 adam
- * Added "schema" command.
- *
- * Revision 1.85 1999/06/16 11:55:24 adam
- * Added APDU log to client.
- *
- * Revision 1.84 1999/06/01 14:29:11 adam
- * Work on Extended Services.
- *
- * Revision 1.83 1999/05/26 15:24:26 adam
- * Fixed minor bugs regarding DB Update (introduced by previous commit).
- *
- * Revision 1.82 1999/05/26 13:49:12 adam
- * DB Update implemented in client (very basic).
- *
- * Revision 1.81 1999/04/20 09:56:48 adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.80 1999/03/31 11:18:24 adam
- * Implemented odr_strdup. Added Reference ID to backend server API.
- *
- * Revision 1.79 1999/03/23 14:14:25 adam
- * Yet another fix.
- *
- * Revision 1.78 1999/03/18 12:57:18 adam
- * Minor fix.
- *
- * Revision 1.77 1999/03/11 15:26:51 adam
- * Fixed bug (introduced by previous commit).
- *
- * Revision 1.76 1999/03/11 11:12:07 adam
- * Added GNU readline support. HTML display in client.
- *
- * Revision 1.75 1999/02/01 15:37:32 adam
- * Fixed minor bug introduced by previous commit.
- *
- * Revision 1.74 1999/02/01 15:35:21 adam
- * Added XML display.
- *
- * Revision 1.73 1998/10/20 13:55:43 quinn
- * Fixed Scan bug in asn and client
- *
- * Revision 1.72 1998/10/20 13:23:15 quinn
- * changed preferred pos to 1
- *
- * Revision 1.71 1998/10/20 13:21:43 adam
- * Fixed scan response handler.
- *
- * Revision 1.70 1998/09/22 09:40:37 adam
- * Minor changes in sort spec.
- *
- * Revision 1.69 1998/08/19 16:10:06 adam
- * Changed som member names of DeleteResultSetRequest/Response.
- *
- * Revision 1.68 1998/07/20 12:37:06 adam
- * Added 'delete <resultset>' command. Changed open command so that
- * it reconnects if already connected.
- *
- * Revision 1.67 1998/06/09 13:55:06 adam
- * Minor changes.
- *
- * Revision 1.66 1998/05/18 13:06:53 adam
- * Changed the way attribute sets are handled by the retriaval module.
- * Extended Explain conversion / schema.
- * Modified server and client to work with ASN.1 compiled protocol handlers.
- *
- * Revision 1.65 1998/03/31 15:13:19 adam
- * Development towards compiled ASN.1.
- *
- * Revision 1.64 1998/03/31 11:07:44 adam
- * Furhter work on UNIverse resource report.
- * Added Extended Services handling in frontend server.
- *
- * Revision 1.63 1998/03/05 08:05:10 adam
- * Added a few casts to make C++ happy.
- *
- * Revision 1.62 1998/02/11 11:53:33 adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.61 1998/02/10 11:03:06 adam
- * Implemented command refid. Client prints reference-ID's, when present,
- * in responses.
- *
- * 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
- * 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
- * Client uses "options" utility and marc dump filename may be specified
- * as an option (-m <file>).
- *
- * Revision 1.43 1996/11/08 11:03:26 adam
- * Client accepts multiple database names.
- *
- * Revision 1.42 1996/10/08 10:44:57 quinn
- * Resolved conflicts.
- *
- * Revision 1.41 1996/10/07 15:29:03 quinn
- * Work
- *
- * Revision 1.40 1996/08/29 14:19:34 quinn
- * Fixed conflict (CVS)
- *
- * Revision 1.39 1996/08/27 10:43:22 quinn
- * Made select() optional
- *
- * Revision 1.38 1996/08/12 14:09:11 adam
- * Default prefix query attribute set defined by using p_query_attset.
*
- * 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
- * Added display of OIDs in the GRS routine.
- *
- * Revision 1.34 1996/05/09 07:26:49 quinn
- * *** empty log message ***
- *
- * Revision 1.33 1996/05/09 07:25:22 quinn
- * Small
- *
- * Revision 1.32 1996/03/15 11:05:33 adam
- * The user can set the preferred query type (prefix, ccl, ..) with the
- * querytype command.
- *
- * Revision 1.31 1996/02/20 12:51:54 quinn
- * Fixed problems with EXTERNAL.
- *
- * Revision 1.30 1996/02/12 18:18:09 quinn
- * Fidgeting.
- *
- * Revision 1.29 1996/01/02 08:57:25 quinn
- * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
- *
- * Revision 1.28 1995/12/14 11:09:31 quinn
- * Added Explain record syntax to the format command.
- *
- * Revision 1.27 1995/12/12 16:37:02 quinn
- * Added destroy element to data1_node.
- *
- * Revision 1.26 1995/12/12 14:11:00 quinn
- * Minimal.
- *
- * Revision 1.25 1995/11/13 09:27:22 quinn
- * Fiddling with the variant stuff.
- *
- * Revision 1.24 1995/10/30 12:41:13 quinn
- * Added hostname lookup for server.
- *
- * Revision 1.23 1995/10/18 16:12:30 quinn
- * Better diagnostics.
- *
- * Revision 1.22 1995/10/11 14:49:12 quinn
- * Smallish.
- *
- * Revision 1.21 1995/09/29 17:01:47 quinn
- * More Windows work
- *
- * Revision 1.20 1995/08/29 14:24:13 quinn
- * Added second half of close-handshake
- *
- * Revision 1.19 1995/08/29 11:17:28 quinn
- * Added code to receive close
- *
- * Revision 1.18 1995/08/28 12:21:27 quinn
- * Client can now ask for simple element set names.
- *
- * Revision 1.17 1995/08/17 12:45:02 quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.16 1995/08/15 12:00:04 quinn
- * Updated External
- *
- * Revision 1.15 1995/06/22 09:28:03 quinn
- * Fixed bug in SUTRS processing.
- *
- * Revision 1.14 1995/06/19 12:37:41 quinn
- * Added BER dumper.
- *
- * Revision 1.13 1995/06/16 10:29:11 quinn
- * *** empty log message ***
- *
- * Revision 1.12 1995/06/15 07:44:57 quinn
- * Moving to v3.
- *
- * Revision 1.11 1995/06/14 15:26:40 quinn
- * *** empty log message ***
- *
- * Revision 1.10 1995/06/06 14:56:58 quinn
- * Better diagnostics.
- *
- * Revision 1.9 1995/06/06 08:15:19 quinn
- * Cosmetic.
- *
- * Revision 1.8 1995/06/05 10:52:22 quinn
- * Added SCAN.
- *
- * Revision 1.7 1995/06/02 09:50:09 quinn
- * Smallish.
- *
- * Revision 1.6 1995/05/31 08:29:21 quinn
- * Nothing significant.
- *
- * Revision 1.5 1995/05/29 08:10:47 quinn
- * Moved oid.c to util.
- *
- * Revision 1.4 1995/05/22 15:30:13 adam
- * Client uses prefix query notation.
- *
- * Revision 1.3 1995/05/22 15:06:53 quinn
- * *** empty log message ***
- *
- * Revision 1.2 1995/05/22 14:56:40 quinn
- * *** empty log message ***
- *
- * Revision 1.1 1995/05/22 11:30:31 quinn
- * Added prettier client.
- *
- *
- */
-
-/*
- * This is the obligatory little toy client, whose primary purpose is
- * to illustrate the use of the YAZ service-level API.
+ * $Id: client.c,v 1.195 2003-05-20 20:33:29 adam Exp $
*/
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include <time.h>
+#include <ctype.h>
+
+#ifdef WIN32
+#include <io.h>
+#define S_ISREG(x) (x & _S_IFREG)
+#define S_ISDIR(x) (x & _S_IFDIR)
+#endif
#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>
-#ifdef ASN_COMPILED
#include <yaz/ill.h>
-#endif
-
-#if CCL2RPN
+#include <yaz/srw.h>
#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> "
+static char *codeset = 0; /* character set for output */
+
static ODR out, in, print; /* encoding and decoding streams */
+static ODR srw_sr_odr_out = 0;
+static Z_SRW_PDU *srw_sr = 0;
static FILE *apdu_file = 0;
+static FILE *ber_file = 0;
static COMSTACK conn = 0; /* our z-association */
static Z_IdAuthentication *auth = 0; /* our current auth definition */
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 int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
static enum oid_value recordsyntax = VAL_USMARC;
-static enum oid_value schema = VAL_NONE;
+static char *schema = 0;
static int sent_close = 0;
-static NMEM session_mem = NULL; /* memory handle for init-response */
+static NMEM session_mem = NULL; /* memory handle for init-response */
static Z_InitResponse *session = 0; /* session parameters */
-static char last_scan[512] = "0";
-static char last_cmd[100] = "?";
-static FILE *marcdump = 0;
+static char last_scan_line[512] = "0";
+static char last_scan_query[512] = "0";
+static char ccl_fields[512] = "default.bib";
+static char *esPackageName = 0;
+static char *yazProxy = 0;
+static int kilobytes = 1024;
+static char *negotiationCharset = 0;
+static char *outputCharset = 0;
+static char *marcCharset = 0;
+static char* yazLang = 0;
+
+static char last_cmd[32] = "?";
+static FILE *marc_file = 0;
static char *refid = NULL;
+static char *last_open_command = NULL;
+static int auto_reconnect = 0;
typedef enum {
QueryType_Prefix,
QueryType_CCL,
- QueryType_CCL2RPN
+ QueryType_CCL2RPN,
+ QueryType_CQL
} QueryType;
static QueryType queryType = QueryType_Prefix;
-#if CCL2RPN
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
+
+#define maxOtherInfosSupported 10
+struct {
+ int oidval;
+ char* value;
+} extraOtherInfos[maxOtherInfosSupported];
+
+
+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(const char* arg);
+
+static void close_session (void);
+
ODR getODROutputStream()
{
return out;
}
-void send_apdu(Z_APDU *a)
+const char* query_type_as_string(QueryType q)
+{
+ switch (q) {
+ case QueryType_Prefix: return "prefix (RPN sent to server)";
+ case QueryType_CCL: return "CCL (CCL sent to server) ";
+ case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)";
+ case QueryType_CQL: return "CQL (CQL sent to server)";
+ default:
+ return "unknown Query type internal yaz-client error";
+ }
+}
+
+
+void do_hex_dump(char* buf,int len)
+{
+#if 0
+ int i,x;
+ for( i=0; i<len ; i=i+16 )
+ {
+ printf(" %4.4d ",i);
+ for(x=0 ; i+x<len && x<16; ++x)
+ {
+ printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
+ }
+ printf("\n");
+ }
+#endif
+}
+
+void add_otherInfos(Z_APDU *a)
+{
+ Z_OtherInformation **oi;
+ int i;
+
+ yaz_oi_APDU(a, &oi);
+ for(i=0; i<maxOtherInfosSupported; ++i)
+ {
+ if(extraOtherInfos[i].oidval != -1)
+ yaz_oi_set_string_oidval(oi, out, extraOtherInfos[i].oidval,
+ 1, extraOtherInfos[i].value);
+ }
+}
+
+int send_apdu(Z_APDU *a)
{
char *buf;
int len;
-
+
+ add_otherInfos(a);
+
if (apdu_file)
{
z_APDU(print, &a, 0, 0);
if (!z_APDU(out, &a, 0, 0))
{
odr_perror(out, "Encoding APDU");
- exit(1);
+ close_session();
+ return 0;
}
buf = odr_getbuf(out, &len, 0);
+ if (ber_file)
+ odr_dumpBER(ber_file, buf, len);
/* printf ("sending APDU of size %d\n", len); */
if (cs_put(conn, buf, len) < 0)
{
fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn)));
- exit(1);
+ close_session();
+ return 0;
}
+ do_hex_dump(buf,len);
odr_reset(out); /* release the APDU structure */
+ return 1;
+}
+
+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");
}
}
{
Z_ReferenceId *id;
if (!refid)
- return 0;
+ return 0;
id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id));
id->size = id->len = strlen(refid);
id->buf = (unsigned char *) odr_malloc (out, id->len);
/* INIT SERVICE ------------------------------- */
-static void send_initRequest()
+static void send_initRequest(const char* type_and_host)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
Z_InitRequest *req = apdu->u.initRequest;
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;
- send_apdu(apdu);
- printf("Sent initrequest.\n");
+ req->referenceId = set_refid (out);
+
+ if (yazProxy)
+ yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
+ 1, type_and_host);
+
+ if (negotiationCharset || 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**)&negotiationCharset,
+ negotiationCharset ? 1 : 0,
+ (const char**)&yazLang, yazLang ? 1 : 0, 1);
+ }
+ }
+
+ if (send_apdu(apdu))
+ printf("Sent initrequest.\n");
}
static int process_initResponse(Z_InitResponse *res)
{
+ int ver = 0;
/* save session parameters for later use */
session_mem = odr_extract_mem(in);
session = res;
+ for (ver = 0; ver<5; ver++)
+ if (!ODR_MASK_GET(res->protocolVersion, ver))
+ break;
+
if (!*res->result)
- printf("Connection rejected by target.\n");
+ printf("Connection rejected by v%d target.\n", ver);
else
- printf("Connection accepted by target.\n");
+ printf("Connection accepted by v%d target.\n", ver);
if (res->implementationId)
printf("ID : %s\n", res->implementationId);
if (res->implementationName)
printf("Guessing visiblestring:\n");
printf("'%s'\n", res->userInformationField->u. octet_aligned->buf);
}
- odr_reset (print);
+ odr_reset (print);
+ }
+ printf ("Options:");
+ if (ODR_MASK_GET(res->options, Z_Options_search))
+ printf (" search");
+ if (ODR_MASK_GET(res->options, Z_Options_present))
+ printf (" present");
+ if (ODR_MASK_GET(res->options, Z_Options_delSet))
+ printf (" delSet");
+ if (ODR_MASK_GET(res->options, Z_Options_resourceReport))
+ printf (" resourceReport");
+ if (ODR_MASK_GET(res->options, Z_Options_resourceCtrl))
+ printf (" resourceCtrl");
+ if (ODR_MASK_GET(res->options, Z_Options_accessCtrl))
+ printf (" accessCtrl");
+ if (ODR_MASK_GET(res->options, Z_Options_scan))
+ printf (" scan");
+ if (ODR_MASK_GET(res->options, Z_Options_sort))
+ printf (" sort");
+ if (ODR_MASK_GET(res->options, Z_Options_extendedServices))
+ printf (" extendedServices");
+ if (ODR_MASK_GET(res->options, Z_Options_level_1Segmentation))
+ printf (" level1Segmentation");
+ if (ODR_MASK_GET(res->options, Z_Options_level_2Segmentation))
+ printf (" level2Segmentation");
+ 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;
}
-static int cmd_base(char *arg)
+static int set_base(const char *arg)
{
int i;
- char *cp;
+ const char *cp;
- if (!*arg)
- {
- printf("Usage: base <database> <database> ...\n");
- return 0;
- }
for (i = 0; i<num_databaseNames; i++)
xfree (databaseNames[i]);
num_databaseNames = 0;
while (1)
{
+ char *cp1;
if (!(cp = strchr(arg, ' ')))
cp = arg + strlen(arg);
if (cp - arg < 1)
break;
databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg);
memcpy (databaseNames[num_databaseNames], arg, cp - arg);
- databaseNames[num_databaseNames++][cp - arg] = '\0';
+ databaseNames[num_databaseNames][cp - arg] = '\0';
+
+ for (cp1 = databaseNames[num_databaseNames]; *cp1 ; cp1++)
+ if (*cp1 == '+')
+ *cp1 = ' ';
+ num_databaseNames++;
+
if (!*cp)
break;
arg = cp+1;
}
+ if (num_databaseNames == 0)
+ {
+ num_databaseNames = 1;
+ databaseNames[0] = xstrdup("");
+ }
return 1;
}
-
-int cmd_open(char *arg)
+static int cmd_base(const char *arg)
{
- void *add;
- char type[100], addr[100], base[100];
- CS_TYPE t;
-
- if (conn)
- {
- printf("Already connected.\n");
-
- cs_close (conn);
- conn = NULL;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
- }
- base[0] = '\0';
- if (!*arg || sscanf(arg, "%[^:]:%[^/]/%s", type, addr, base) < 2)
+ if (!*arg)
{
- fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n");
+ printf("Usage: base <database> <database> ...\n");
return 0;
}
- if (*base)
- cmd_base (base);
- if (!strcmp(type, "tcp"))
+ return set_base(arg);
+}
+
+void cmd_open_remember_last_open_command(const char* arg, char* new_open_command)
+{
+ if(last_open_command != arg)
{
- t = tcpip_type;
- protocol = PROTO_Z3950;
+ if(last_open_command) xfree(last_open_command);
+ last_open_command = xstrdup(new_open_command);
}
- else
-#ifdef USE_XTIMOSI
- if (!strcmp(type, "osi"))
+}
+
+int session_connect(const char *arg)
+{
+ void *add;
+ char type_and_host[101];
+ const char *basep = 0;
+ if (conn)
{
- t = mosi_type;
- protocol = PROTO_SR;
- }
+ cs_close (conn);
+ conn = NULL;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
+ }
+ cs_get_host_args(arg, &basep);
+
+ strncpy(type_and_host, arg, sizeof(type_and_host)-1);
+ type_and_host[sizeof(type_and_host)-1] = '\0';
+
+ cmd_open_remember_last_open_command(arg,type_and_host);
+
+ if (yazProxy)
+ conn = cs_create_host(yazProxy, 1, &add);
else
-#endif
- {
- fprintf(stderr, "Bad type: %s\n", type);
- return 0;
- }
- if (!(conn = cs_create(t, 1, protocol)))
+ conn = cs_create_host(arg, 1, &add);
+ if (!conn)
{
- perror("cs_create");
+ printf ("Couldn't create comstack\n");
return 0;
}
- if (!(add = cs_straddr(conn, addr)))
+#if HAVE_XML2
+#else
+ if (conn->protocol == PROTO_HTTP)
{
- perror(arg);
- return 0;
+ printf ("SRW/HTTP not enabled in this YAZ\n");
+ cs_close(conn);
+ conn = 0;
+ return 0;
}
+#endif
+ protocol = conn->protocol;
+ if (conn->protocol == PROTO_HTTP)
+ set_base("");
+ else
+ set_base("Default");
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
{
- perror("connect");
+ printf ("error = %s\n", cs_strerror(conn));
+ if (conn->cerrno == CSYSERR)
+ {
+ char msg[256];
+ yaz_strerror(msg, sizeof(msg));
+ printf ("%s\n", msg);
+ }
cs_close(conn);
conn = 0;
return 0;
}
- printf("Ok.\n");
- send_initRequest();
- return 2;
+ printf("OK.\n");
+ if (basep && *basep)
+ set_base (basep);
+ if (protocol == PROTO_Z3950)
+ {
+ send_initRequest(type_and_host);
+ return 2;
+ }
+ return 0;
+}
+
+int cmd_open(const char *arg)
+{
+ static char cur_host[200];
+ if (arg)
+ {
+ strncpy (cur_host, arg, sizeof(cur_host)-1);
+ cur_host[sizeof(cur_host)-1] = 0;
+ }
+ return session_connect(cur_host);
+}
+
+void try_reconnect()
+{
+ char* open_command;
+
+ if(!( auto_reconnect && last_open_command) ) return ;
+
+ open_command = (char *) xmalloc (strlen(last_open_command)+6);
+ strcpy (open_command, "open ");
+
+ strcat (open_command, last_open_command);
+
+ process_cmd_line(open_command);
+
+ xfree(open_command);
}
-int cmd_authentication(char *arg)
+int cmd_authentication(const 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)
+static void print_record(const unsigned char *buf, size_t len)
{
- int i;
-
- for (i = 0; i < v->num_triples; i++)
- {
- printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass,
- *v->triples[i]->type);
- if (v->triples[i]->which == Z_Triple_internationalString)
- printf(",value=%s\n", v->triples[i]->value.internationalString);
- else
- printf("\n");
- }
+ 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_grs1(Z_GenericRecord *r, int level)
+static void display_record(Z_External *r)
{
- int i;
-
- if (!r)
- return;
- for (i = 0; i < r->num_elements; i++)
- {
- Z_TaggedElement *t;
-
- printf("%*s", level * 4, "");
- t = r->elements[i];
- printf("(");
- if (t->tagType)
- printf("%d,", *t->tagType);
- else
- printf("?,");
- if (t->tagValue->which == Z_StringOrNumeric_numeric)
- printf("%d) ", *t->tagValue->u.numeric);
- else
- printf("%s) ", t->tagValue->u.string);
- if (t->content->which == Z_ElementData_subtree)
- {
- 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);
- else if (t->content->which == Z_ElementData_numeric)
- printf("%d\n", *t->content->u.numeric);
- else if (t->content->which == Z_ElementData_oid)
- {
- int *ip = t->content->u.oid;
- oident *oent;
-
- if ((oent = oid_getentbyoid(t->content->u.oid)))
- printf("OID: %s\n", oent->desc);
- else
- {
- printf("{");
- while (ip && *ip >= 0)
- printf(" %d", *(ip++));
- printf(" }\n");
- }
- }
- else if (t->content->which == Z_ElementData_noDataRequested)
- printf("[No data requested]\n");
- else if (t->content->which == Z_ElementData_elementEmpty)
- printf("[Element empty]\n");
- else if (t->content->which == Z_ElementData_elementNotThere)
- printf("[Element not there]\n");
- else
- printf("??????\n");
- if (t->appliedVariant)
- display_variant(t->appliedVariant, level+1);
- if (t->metaData && t->metaData->supportedVariants)
- {
- int c;
-
- printf("%*s---- variant list\n", (level+1)*4, "");
- for (c = 0; c < t->metaData->num_supportedVariants; c++)
- {
- printf("%*svariant #%d\n", (level+1)*4, "", c);
- display_variant(t->metaData->supportedVariants[c], level + 2);
- }
- }
- }
-}
-
-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);
-}
-
-static void display_record(Z_DatabaseRecord *p)
-{
- Z_External *r = (Z_External*) p;
- oident *ent = oid_getentbyoid(r->direct_reference);
+ oident *ent = oid_getentbyoid(r->direct_reference);
record_last = r;
/*
/* Check if this is a known, ASN.1 type tucked away in an octet string */
if (ent && r->which == Z_External_octet)
{
- Z_ext_typeent *type = z_ext_getentbyref(ent->value);
- void *rr;
+ Z_ext_typeent *type = z_ext_getentbyref(ent->value);
+ void *rr;
- if (type)
- {
- /*
- * Call the given decoder to process the record.
- */
- odr_setbuf(in, (char*)p->u.octet_aligned->buf,
- p->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);
- 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;
- }
+ if (type)
+ {
+ /*
+ * Call the given decoder to process the record.
+ */
+ 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(stdout, "[Near %d]\n", odr_offset(in));
+ fprintf(stdout, "Packet dump:\n---------\n");
+ odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
+ fprintf(stdout, "---------\n");
+
+ /* note just ignores the error ant print the bytes form the octet_aligned later */
+ } 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)
+ print_record((const unsigned char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
+ else if (r->which == Z_External_octet)
{
- const char *octet_buf = (char*)p->u.octet_aligned->buf;
- if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
+ 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);
- else
+ 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 (octet_buf, NULL) <= 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
+ )
+ {
+ char *result;
+ int rlen;
+ yaz_iconv_t cd = 0;
+ yaz_marc_t mt = yaz_marc_create();
+
+ if (yaz_marc_decode_buf(mt, octet_buf,r->u.octet_aligned->len,
+ &result, &rlen)> 0)
+ {
+ char *from = 0;
+ if (marcCharset && strcmp(marcCharset, "auto"))
+ from = marcCharset;
+ else
+ {
+ if (ent->value == VAL_USMARC)
+ {
+ if (octet_buf[9] == 'a')
+ from = "UTF-8";
+ else
+ from = "MARC8";
+ }
+ else
+ from = "ISO-8859-1";
+ }
+ if (outputCharset && from)
+ {
+ printf ("convert from %s to %s\n", from,
+ outputCharset);
+ cd = yaz_iconv_open(outputCharset, from);
+ }
+ if (!cd)
+ fwrite (result, 1, rlen, stdout);
+ else
+ {
+ char outbuf[12];
+ size_t inbytesleft = rlen;
+ const char *inp = result;
+
+ while (inbytesleft)
+ {
+ size_t outbytesleft = sizeof(outbuf);
+ char *outp = outbuf;
+ size_t r = yaz_iconv (cd, (char**) &inp,
+ &inbytesleft,
+ &outp, &outbytesleft);
+ if (r == (size_t) (-1))
+ {
+ int e = yaz_iconv_error(cd);
+ if (e != YAZ_ICONV_E2BIG)
+ break;
+ }
+ fwrite (outbuf, outp - outbuf, 1, stdout);
+ }
+ }
+ }
+ else
+ {
+ printf ("bad MARC. Dumping as it is:\n");
+ print_record((const unsigned char*) octet_buf,
+ r->u.octet_aligned->len);
+ }
+ yaz_marc_destroy(mt);
+ if (cd)
+ yaz_iconv_close(cd);
+ }
+ 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);
+ if (marc_file)
+ fwrite (octet_buf, 1, r->u.octet_aligned->len, marc_file);
}
else if (ent && ent->value == VAL_SUTRS)
{
}
else if (ent && ent->value == VAL_GRS1)
{
+ WRBUF w;
if (r->which != Z_External_grs1)
{
printf("Expecting single GRS type for GRS.\n");
return;
}
- display_grs1(r->u.grs1, 0);
+ w = wrbuf_alloc();
+ yaz_display_grs1(w, r->u.grs1, 0);
+ puts (wrbuf_buf(w));
+ wrbuf_free(w, 1);
}
else
{
}
}
-
static void display_diagrecs(Z_DiagRec **pp, int num)
{
int i;
printf("Diagnostic message(s) from database:\n");
for (i = 0; i<num; i++)
{
- 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));
-#ifdef ASN_COMPILED
- switch (r->which)
- {
- case Z_DefaultDiagFormat_v2Addinfo:
- printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
- break;
- case Z_DefaultDiagFormat_v3Addinfo:
- printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
- break;
- }
-#else
- if (r->addinfo && *r->addinfo)
- printf(" -- '%s'\n", r->addinfo);
- else
- printf("\n");
-#endif
+ 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));
+ switch (r->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
+ break;
+ }
}
}
if (p->which == Z_Records_NSD)
{
-#ifdef ASN_COMPILED
- Z_DiagRec dr, *dr_p = &dr;
- dr.which = Z_DiagRec_defaultFormat;
- dr.u.defaultFormat = p->u.nonSurrogateDiagnostic;
- display_diagrecs (&dr_p, 1);
-#else
- display_diagrecs (&p->u.nonSurrogateDiagnostic, 1);
-#endif
+ Z_DiagRec dr, *dr_p = &dr;
+ dr.which = Z_DiagRec_defaultFormat;
+ dr.u.defaultFormat = p->u.nonSurrogateDiagnostic;
+ display_diagrecs (&dr_p, 1);
}
else if (p->which == Z_Records_multipleNSD)
- display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
- p->u.multipleNonSurDiagnostics->num_diagRecs);
+ display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
+ p->u.multipleNonSurDiagnostics->num_diagRecs);
else
{
printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records);
}
}
-static int send_deleteResultSetRequest(char *arg)
+static int send_deleteResultSetRequest(const char *arg)
{
char names[8][32];
int i;
req->referenceId = set_refid (out);
req->num_resultSetList =
- sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s",
- names[0], names[1], names[2], names[3],
- names[4], names[5], names[6], names[7]);
+ sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s",
+ names[0], names[1], names[2], names[3],
+ names[4], names[5], names[6], names[7]);
req->deleteFunction = (int *)
- odr_malloc (out, sizeof(*req->deleteFunction));
+ odr_malloc (out, sizeof(*req->deleteFunction));
if (req->num_resultSetList > 0)
{
- *req->deleteFunction = Z_DeleteRequest_list;
- req->resultSetList = (char **)
- odr_malloc (out, sizeof(*req->resultSetList)*
- req->num_resultSetList);
- for (i = 0; i<req->num_resultSetList; i++)
- req->resultSetList[i] = names[i];
+ *req->deleteFunction = Z_DeleteRequest_list;
+ req->resultSetList = (char **)
+ odr_malloc (out, sizeof(*req->resultSetList)*
+ req->num_resultSetList);
+ for (i = 0; i<req->num_resultSetList; i++)
+ req->resultSetList[i] = names[i];
}
else
{
- *req->deleteFunction = Z_DeleteRequest_all;
- req->resultSetList = 0;
+ *req->deleteFunction = Z_DeleteRequest_all;
+ req->resultSetList = 0;
}
send_apdu(apdu);
return 2;
}
-static int send_searchRequest(char *arg)
+#if HAVE_XML2
+static int send_srw(Z_SRW_PDU *sr)
+{
+ const char *charset = negotiationCharset;
+ const char *host_port = 0;
+ char *path = 0;
+ char ctype[50];
+ Z_SOAP_Handler h[2] = {
+ {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
+ {0, 0, 0}
+ };
+ ODR o = odr_createmem(ODR_ENCODE);
+ int ret;
+ Z_SOAP *p = odr_malloc(o, sizeof(*p));
+ Z_GDU *gdu;
+
+ path = odr_malloc(out, strlen(databaseNames[0])+2);
+ *path = '/';
+ strcpy(path+1, databaseNames[0]);
+
+ gdu = z_get_HTTP_Request(out);
+ gdu->u.HTTP_Request->path = odr_strdup(out, path);
+
+ if (host_port)
+ {
+ const char *cp0 = strstr(host_port, "://");
+ const char *cp1 = 0;
+ if (cp0)
+ cp0 = cp0+3;
+ else
+ cp0 = host_port;
+
+ cp1 = strchr(cp0, '/');
+ if (!cp1)
+ cp1 = cp0+strlen(cp0);
+
+ if (cp0 && cp1)
+ {
+ char *h = odr_malloc(out, cp1 - cp0 + 1);
+ memcpy (h, cp0, cp1 - cp0);
+ h[cp1-cp0] = '\0';
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
+ "host", h);
+ }
+ }
+
+ strcpy(ctype, "text/xml");
+ if (charset && strlen(charset) < 20)
+ {
+ strcat(ctype, "; charset=");
+ strcat(ctype, charset);
+ }
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
+ "Content-Type", ctype);
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
+ "SOAPAction", "\"\"");
+ p->which = Z_SOAP_generic;
+ p->u.generic = odr_malloc(o, sizeof(*p->u.generic));
+ p->u.generic->no = 0;
+ p->u.generic->ns = 0;
+ p->u.generic->p = sr;
+ p->ns = "http://schemas.xmlsoap.org/soap/envelope/";
+
+ ret = z_soap_codec_enc(o, &p,
+ &gdu->u.HTTP_Request->content_buf,
+ &gdu->u.HTTP_Request->content_len, h,
+ charset);
+
+ if (z_GDU(out, &gdu, 0, 0))
+ {
+ /* encode OK */
+ char *buf_out;
+ int len_out;
+ int r;
+ buf_out = odr_getbuf(out, &len_out, 0);
+
+ /* we don't odr_reset(out), since we may need the buffer again */
+
+ r = cs_put(conn, buf_out, len_out);
+
+ odr_destroy(o);
+
+ if (r >= 0)
+ return 2;
+ }
+ return 0;
+}
+#endif
+
+#if HAVE_XML2
+static int send_SRW_searchRequest(const char *arg)
+{
+ Z_SRW_PDU *sr = 0;
+
+ if (!srw_sr)
+ {
+ assert(srw_sr_odr_out == 0);
+ srw_sr_odr_out = odr_createmem(ODR_ENCODE);
+ }
+ odr_reset(srw_sr_odr_out);
+
+ setno = 1;
+
+ /* save this for later .. when fetching individual records */
+ srw_sr = sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+ sr->u.request->query_type = Z_SRW_query_type_cql;
+ sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
+
+ sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
+ sr->u.request->query_type = Z_SRW_query_type_cql;
+ sr->u.request->query.cql = odr_strdup(out, arg);
+ if (schema)
+ sr->u.request->recordSchema = schema;
+ return send_srw(sr);
+}
+#endif
+
+static int send_searchRequest(const char *arg)
{
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 = NULL;
int error, pos;
- oident bib1;
-#endif
char setstring[100];
Z_RPNQuery *RPNquery;
Odr_oct ccl_query;
+ YAZ_PQF_Parser pqf_parser;
+ Z_External *ext;
-#if CCL2RPN
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 */
{
{
case QueryType_Prefix:
query.which = Z_Query_type_1;
- RPNquery = p_query_rpn (out, protocol, arg);
+ pqf_parser = yaz_pqf_create ();
+ RPNquery = yaz_pqf_parse (pqf_parser, out, arg);
if (!RPNquery)
{
- printf("Prefix query error\n");
+ const char *pqf_msg;
+ size_t off;
+ int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ printf("%*s^\n", off+4, "");
+ printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
+
+ yaz_pqf_destroy (pqf_parser);
return 0;
}
+ yaz_pqf_destroy (pqf_parser);
query.u.type_1 = RPNquery;
break;
case QueryType_CCL:
ccl_query.buf = (unsigned char*) arg;
ccl_query.len = strlen(arg);
break;
-#if CCL2RPN
case QueryType_CCL2RPN:
query.which = Z_Query_type_1;
RPNquery = ccl_rpn_query(out, rpn);
- if (!RPNquery)
- {
- printf ("Couldn't convert from CCL to RPN\n");
- return 0;
- }
- bib1.proto = protocol;
- bib1.oclass = CLASS_ATTSET;
- bib1.value = VAL_BIB1;
- RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid);
+ if (!RPNquery)
+ {
+ printf ("Couldn't convert from CCL to RPN\n");
+ return 0;
+ }
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
-#endif
+ case QueryType_CQL:
+ query.which = Z_Query_type_104;
+ ext = (Z_External *) odr_malloc(out, sizeof(*ext));
+ ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2");
+ ext->indirect_reference = 0;
+ ext->descriptor = 0;
+ ext->which = Z_External_CQL;
+ ext->u.cql = odr_strdup(out, arg);
+ query.u.type_104 = ext;
+ break;
default:
printf ("Unsupported query type\n");
return 0;
}
- send_apdu(apdu);
+ if (send_apdu(apdu))
+ printf("Sent searchRequest.\n");
setno = 1;
- printf("Sent searchRequest.\n");
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;
}
}
}
-static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate)
+static void print_universe_report_duplicate(
+ int iLevel,
+ Z_UniverseReportDuplicate *pUniverseReportDuplicate)
{
if (pUniverseReportDuplicate != NULL)
{
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 ("done\n");
- break;
+ printf ("done\n");
+ break;
case Z_ExtendedServicesResponse_accepted:
- printf ("accepted\n");
- break;
+ printf ("accepted\n");
+ break;
case Z_ExtendedServicesResponse_failure:
- printf ("failure\n");
- display_diagrecs(res->diagnostics, res->num_diagnostics);
- break;
+ 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++)
+ {
-#ifdef ASN_COMPILED
+ 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 ("asking for %s\n", element); */
- if (!strcmp (element, "ill,transaction-id,transaction-group-qualifier"))
- return "1";
- if (!strcmp (element, "ill,transaction-id,transaction-qualifier"))
- return "1";
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");
+
if (!ill_ItemRequest (out, &req, 0, 0))
{
- if (apdu_file)
- {
- ill_ItemRequest(print, &req, 0, 0);
- odr_reset(print);
- }
- item_request_buf = odr_getbuf (out, &item_request_size, 0);
- if (item_request_buf)
- odr_setbuf (out, item_request_buf, item_request_size, 1);
+ if (apdu_file)
+ {
+ ill_ItemRequest(print, &req, 0, 0);
+ odr_reset(print);
+ }
+ item_request_buf = odr_getbuf (out, &item_request_size, 0);
+ if (item_request_buf)
+ odr_setbuf (out, item_request_buf, item_request_size, 1);
printf ("Couldn't encode ItemRequest, size %d\n", item_request_size);
- return 0;
+ return 0;
}
else
{
- oident oid;
-
- item_request_buf = odr_getbuf (out, &item_request_size, 0);
- oid.proto = PROTO_GENERAL;
- oid.oclass = CLASS_GENERAL;
- oid.value = VAL_ISO_ILL_1;
-
- r = (Z_External *) odr_malloc (out, sizeof(*r));
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
- r->indirect_reference = 0;
- r->descriptor = 0;
- r->which = Z_External_single;
-
- r->u.single_ASN1_type = (Odr_oct *)
- odr_malloc (out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = 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,
- item_request_size);
- printf ("len = %d\n", item_request_size);
+ oident oid;
+
+ item_request_buf = odr_getbuf (out, &item_request_size, 0);
+ oid.proto = PROTO_GENERAL;
+ oid.oclass = CLASS_GENERAL;
+ oid.value = VAL_ISO_ILL_1;
+
+ r = (Z_External *) odr_malloc (out, sizeof(*r));
+ r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
+ r->indirect_reference = 0;
+ r->descriptor = 0;
+ r->which = Z_External_single;
+
+ 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);
+ 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,
+ item_request_size);
+
+ do_hex_dump(item_request_buf,item_request_size);
}
return r;
}
-#else
-static Z_External *create_external_itemRequest()
-{
- return 0;
-}
-#endif
-#ifdef ASN_COMPILED
-static Z_External *create_external_ILLRequest()
+static Z_External *create_external_ILL_APDU(int which)
{
struct ill_get_ctl ctl;
- ILL_Request *req;
+ ILL_APDU *ill_apdu;
Z_External *r = 0;
int ill_request_size = 0;
char *ill_request_buf = 0;
-
+
ctl.odr = out;
ctl.clientData = 0;
ctl.f = get_ill_element;
- req = ill_get_ILLRequest(&ctl, "ill", 0);
+ ill_apdu = ill_get_APDU(&ctl, "ill", 0);
- if (!ill_Request (out, &req, 0, 0))
+ if (!ill_APDU (out, &ill_apdu, 0, 0))
{
- if (apdu_file)
- {
- printf ("-------------------\n");
- ill_Request(print, &req, 0, 0);
- odr_reset(print);
- printf ("-------------------\n");
- }
- ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
- if (ill_request_buf)
- odr_setbuf (out, ill_request_buf, ill_request_size, 1);
+ if (apdu_file)
+ {
+ printf ("-------------------\n");
+ ill_APDU(print, &ill_apdu, 0, 0);
+ odr_reset(print);
+ printf ("-------------------\n");
+ }
+ ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
+ if (ill_request_buf)
+ odr_setbuf (out, ill_request_buf, ill_request_size, 1);
printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size);
- return 0;
+ return 0;
}
else
{
- oident oid;
- ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
-
- oid.proto = PROTO_GENERAL;
- oid.oclass = CLASS_GENERAL;
- oid.value = VAL_ISO_ILL_1;
-
- r = (Z_External *) odr_malloc (out, sizeof(*r));
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
- r->indirect_reference = 0;
- r->descriptor = 0;
- r->which = Z_External_single;
-
- r->u.single_ASN1_type = (Odr_oct *)
- odr_malloc (out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = 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);
- printf ("len = %d\n", ill_request_size);
+ oident oid;
+ ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
+
+ oid.proto = PROTO_GENERAL;
+ oid.oclass = CLASS_GENERAL;
+ oid.value = VAL_ISO_ILL_1;
+
+ r = (Z_External *) odr_malloc (out, sizeof(*r));
+ r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
+ r->indirect_reference = 0;
+ r->descriptor = 0;
+ r->which = Z_External_single;
+
+ 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);
+ 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);
+/* printf ("len = %d\n", ill_request_size); */
+/* do_hex_dump(ill_request_buf,ill_request_size); */
+/* printf("--- end of extenal\n"); */
+
}
return r;
}
-#else
-static Z_External *create_external_ILLRequest()
-{
- return 0;
-}
-#endif
static Z_External *create_ItemOrderExternal(const char *type, int itemno)
r->u.itemOrder = (Z_ItemOrder *) odr_malloc(out,sizeof(Z_ItemOrder));
memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder));
-#ifdef ASN_COMPILED
r->u.itemOrder->which=Z_IOItemOrder_esRequest;
-#else
- r->u.itemOrder->which=Z_ItemOrder_esRequest;
-#endif
r->u.itemOrder->u.esRequest = (Z_IORequest *)
- odr_malloc(out,sizeof(Z_IORequest));
+ odr_malloc(out,sizeof(Z_IORequest));
memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest));
r->u.itemOrder->u.esRequest->toKeep = (Z_IOOriginPartToKeep *)
- odr_malloc(out,sizeof(Z_IOOriginPartToKeep));
+ odr_malloc(out,sizeof(Z_IOOriginPartToKeep));
memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep));
r->u.itemOrder->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *)
- odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep));
+ odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep));
memset(r->u.itemOrder->u.esRequest->notToKeep, 0, sizeof(Z_IOOriginPartNotToKeep));
r->u.itemOrder->u.esRequest->toKeep->supplDescription = NULL;
r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL;
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem =
- (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem));
+ (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem));
memset(r->u.itemOrder->u.esRequest->notToKeep->resultSetItem, 0, sizeof(Z_IOResultSetItem));
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1";
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item =
- (int *) odr_malloc(out, sizeof(int));
+ (int *) odr_malloc(out, sizeof(int));
*r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
- switch (*type)
- {
- case '2':
- printf ("using item-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_itemRequest();
- break;
- case '1':
- printf ("using ILL-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_ILLRequest();
- break;
- default:
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
+ if (!strcmp (type, "item") || !strcmp(type, "2"))
+ {
+ printf ("using item-request\n");
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ create_external_itemRequest();
}
+ else if (!strcmp(type, "ill") || !strcmp(type, "1"))
+ {
+ printf ("using ILL-request\n");
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ create_external_ILL_APDU(ILL_APDU_ILL_Request);
+ }
+ 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>";
+ 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;
+
return r;
}
static int send_itemorder(const char *type, int itemno)
{
- Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
oident ItemOrderRequest;
ItemOrderRequest.oclass = CLASS_EXTSERV;
ItemOrderRequest.value = VAL_ITEMORDER;
req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest));
- req->packageName = "1.Extendedserveq";
+ req->packageName = esPackageName;
req->taskSpecificParameters = create_ItemOrderExternal(type, itemno);
return 0;
}
-static int cmd_update(char *arg)
+static int only_z3950()
+{
+ if (protocol == PROTO_HTTP)
+ {
+ printf ("Not supported by SRW\n");
+ return 1;
+ }
+ return 0;
+}
+
+static int cmd_update(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
Z_IUOriginPartToKeep *toKeep;
Z_IUSuppliedRecords *notToKeep;
oident update_oid;
- printf ("Update request\n");
- fflush(stdout);
+ char action[20], recid[20], fname[80];
+ int action_no;
+ Z_External *record_this = 0;
- if (!record_last)
+ if (only_z3950())
return 0;
+ *action = 0;
+ *recid = 0;
+ *fname = 0;
+ sscanf (arg, "%19s %19s %79s", action, recid, fname);
+
+ if (!strcmp (action, "insert"))
+ action_no = Z_IUOriginPartToKeep_recordInsert;
+ else if (!strcmp (action, "replace"))
+ action_no = Z_IUOriginPartToKeep_recordReplace;
+ else if (!strcmp (action, "delete"))
+ action_no = Z_IUOriginPartToKeep_recordDelete;
+ else if (!strcmp (action, "update"))
+ action_no = Z_IUOriginPartToKeep_specialUpdate;
+ else
+ {
+ printf ("Bad action: %s\n", action);
+ printf ("Possible values: insert, replace, delete, update\n");
+ return 0;
+ }
+
+ if (*fname)
+ {
+ FILE *inf;
+ struct stat status;
+ stat (fname, &status);
+ if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r")))
+ {
+ size_t len = status.st_size;
+ char *buf = (char *) xmalloc (len);
+
+ fread (buf, 1, len, inf);
+
+ fclose (inf);
+
+ record_this = z_ext_record (out, VAL_TEXT_XML, buf, len);
+
+ xfree (buf);
+ }
+ else
+ {
+ printf ("File %s doesn't exist\n", fname);
+ return 0;
+ }
+ }
+ else
+ {
+ if (!record_last)
+ {
+ printf ("No last record (update ignored)\n");
+ return 0;
+ }
+ record_this = record_last;
+ }
+
update_oid.proto = PROTO_Z3950;
update_oid.oclass = CLASS_EXTSERV;
update_oid.value = VAL_DBUPDATE;
oid_ent_to_oid (&update_oid, oid);
req->packageType = odr_oiddup(out,oid);
- req->packageName = "1.Extendedserveq";
+ req->packageName = esPackageName;
+
+ req->referenceId = set_refid (out);
r = req->taskSpecificParameters = (Z_External *)
- odr_malloc (out, sizeof(*r));
+ odr_malloc (out, sizeof(*r));
r->direct_reference = odr_oiddup(out,oid);
r->indirect_reference = 0;
r->descriptor = 0;
r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update));
r->u.update->which = Z_IUUpdate_esRequest;
r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest));
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest));
toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
toKeep->databaseName = databaseNames[0];
toKeep->schema = 0;
toKeep->elementSetName = 0;
toKeep->actionQualifier = 0;
toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
- *toKeep->action = Z_IUOriginPartToKeep_recordInsert;
+ *toKeep->action = action_no;
notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
notToKeep->num = 1;
notToKeep->elements = (Z_IUSuppliedRecords_elem **)
- odr_malloc(out, sizeof(*notToKeep->elements));
+ odr_malloc(out, sizeof(*notToKeep->elements));
notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
- odr_malloc(out, sizeof(**notToKeep->elements));
- notToKeep->elements[0]->u.number = 0;
- notToKeep->elements[0]->supplementalId = 0;
- notToKeep->elements[0]->correlationInfo = 0;
- notToKeep->elements[0]->record = record_last;
+ odr_malloc(out, sizeof(**notToKeep->elements));
+ notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
+ if (*recid)
+ {
+ notToKeep->elements[0]->u.opaque = (Odr_oct *)
+ odr_malloc (out, sizeof(Odr_oct));
+ notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
+ notToKeep->elements[0]->u.opaque->size = strlen(recid);
+ notToKeep->elements[0]->u.opaque->len = strlen(recid);
+ }
+ else
+ notToKeep->elements[0]->u.opaque = 0;
+ notToKeep->elements[0]->supplementalId = 0;
+ notToKeep->elements[0]->correlationInfo = 0;
+ notToKeep->elements[0]->record = record_this;
send_apdu(apdu);
return 2;
}
-/* II : Added to do DALI Item Order Extended services request */
-static int cmd_itemorder(char *arg)
+static int cmd_itemorder(const char *arg)
{
char type[12];
int itemno;
-
- if (sscanf (arg, "%10s %d", type, &itemno) != 2)
+
+ if (only_z3950())
return 0;
+ 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_find(const char *arg)
{
if (!*arg)
{
printf("Find what?\n");
return 0;
}
- if (!conn)
+ if (protocol == PROTO_HTTP)
{
- printf("Not connected yet\n");
+#if HAVE_XML2
+ if (!conn)
+ cmd_open(0);
+ if (!send_SRW_searchRequest(arg))
+ return 0;
+#else
return 0;
+#endif
+ }
+ else
+ {
+ if (!conn)
+ {
+ try_reconnect();
+
+ if (!conn) {
+ printf("Not connected yet\n");
+ return 0;
+ }
+ }
+ if (!send_searchRequest(arg))
+ return 0;
}
- if (!send_searchRequest(arg))
- return 0;
return 2;
}
-static int cmd_delete(char *arg)
+static int cmd_delete(const char *arg)
{
if (!conn)
{
printf("Not connected yet\n");
return 0;
}
+ if (only_z3950())
+ return 0;
if (!send_deleteResultSetRequest(arg))
return 0;
return 2;
}
-static int cmd_ssub(char *arg)
+static int cmd_ssub(const char *arg)
{
if (!(smallSetUpperBound = atoi(arg)))
return 0;
return 1;
}
-static int cmd_lslb(char *arg)
+static int cmd_lslb(const char *arg)
{
+ if (only_z3950())
+ return 0;
if (!(largeSetLowerBound = atoi(arg)))
return 0;
return 1;
}
-static int cmd_mspn(char *arg)
+static int cmd_mspn(const char *arg)
{
+ if (only_z3950())
+ return 0;
if (!(mediumSetPresentNumber = atoi(arg)))
return 0;
return 1;
}
-static int cmd_status(char *arg)
+static int cmd_status(const char *arg)
{
printf("smallSetUpperBound: %d\n", smallSetUpperBound);
printf("largeSetLowerBound: %d\n", largeSetLowerBound);
return 1;
}
-static int cmd_setnames(char *arg)
+static int cmd_setnames(const 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;
}
/* PRESENT SERVICE ----------------------------- */
-static int send_presentRequest(char *arg)
+static void parse_show_args(const char *arg_c, char *setstring,
+ int *start, int *number)
{
- Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
- Z_PresentRequest *req = apdu->u.presentRequest;
- Z_RecordComposition compo;
- oident prefsyn;
- int nos = 1;
- int oid[OID_SIZE];
+ char arg[40];
char *p;
- char setstring[100];
- req->referenceId = set_refid (out);
+ strncpy(arg, arg_c, sizeof(arg)-1);
+ arg[sizeof(arg)-1] = '\0';
+
if ((p = strchr(arg, '+')))
{
- nos = atoi(p + 1);
- *p = 0;
+ *number = atoi(p + 1);
+ *p = '\0';
}
if (*arg)
- setno = atoi(arg);
+ *start = atoi(arg);
if (p && (p=strchr(p+1, '+')))
- {
strcpy (setstring, p+1);
- req->resultSetId = setstring;
- }
else if (setnumber >= 0)
- {
sprintf(setstring, "%d", setnumber);
+ else
+ *setstring = '\0';
+}
+
+static int send_presentRequest(const char *arg)
+{
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
+ Z_PresentRequest *req = apdu->u.presentRequest;
+ Z_RecordComposition compo;
+ oident prefsyn;
+ int nos = 1;
+ int oid[OID_SIZE];
+ char setstring[100];
+
+ req->referenceId = set_refid (out);
+
+ parse_show_args(arg, setstring, &setno, &nos);
+ if (*setstring)
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;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
req->preferredRecordSyntax =
- odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
+ odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
- if (schema != VAL_NONE)
+ if (schema)
{
oident prefschema;
prefschema.proto = protocol;
prefschema.oclass = CLASS_SCHEMA;
- prefschema.value = schema;
-
- req->recordComposition = &compo;
- compo.which = Z_RecordComp_complex;
- compo.u.complex = (Z_CompSpec *)
- odr_malloc(out, sizeof(*compo.u.complex));
- compo.u.complex->selectAlternativeSyntax = (bool_t *)
- odr_malloc(out, sizeof(bool_t));
- *compo.u.complex->selectAlternativeSyntax = 0;
-
- compo.u.complex->generic = (Z_Specification *)
- odr_malloc(out, sizeof(*compo.u.complex->generic));
- compo.u.complex->generic->schema = (Odr_oid *)
- odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
- if (!compo.u.complex->generic->schema)
- {
- /* OID wasn't a schema! Try record syntax instead. */
- prefschema.oclass = CLASS_RECSYN;
- compo.u.complex->generic->schema = (Odr_oid *)
- odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
- }
- if (!elementSetNames)
- compo.u.complex->generic->elementSpec = 0;
- else
- {
- compo.u.complex->generic->elementSpec = (Z_ElementSpec *)
- odr_malloc(out, sizeof(Z_ElementSpec));
- compo.u.complex->generic->elementSpec->which =
- Z_ElementSpec_elementSetName;
- compo.u.complex->generic->elementSpec->u.elementSetName =
- elementSetNames->u.generic;
- }
- compo.u.complex->num_dbSpecific = 0;
- compo.u.complex->dbSpecific = 0;
- compo.u.complex->num_recordSyntax = 0;
- compo.u.complex->recordSyntax = 0;
+ prefschema.value = oid_getvalbyname(schema);
+
+ req->recordComposition = &compo;
+ compo.which = Z_RecordComp_complex;
+ compo.u.complex = (Z_CompSpec *)
+ odr_malloc(out, sizeof(*compo.u.complex));
+ compo.u.complex->selectAlternativeSyntax = (bool_t *)
+ odr_malloc(out, sizeof(bool_t));
+ *compo.u.complex->selectAlternativeSyntax = 0;
+
+ compo.u.complex->generic = (Z_Specification *)
+ odr_malloc(out, sizeof(*compo.u.complex->generic));
+ compo.u.complex->generic->which = Z_Schema_oid;
+ compo.u.complex->generic->schema.oid = (Odr_oid *)
+ odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
+ if (!compo.u.complex->generic->schema.oid)
+ {
+ /* OID wasn't a schema! Try record syntax instead. */
+ prefschema.oclass = CLASS_RECSYN;
+ compo.u.complex->generic->schema.oid = (Odr_oid *)
+ odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
+ }
+ if (!elementSetNames)
+ compo.u.complex->generic->elementSpec = 0;
+ else
+ {
+ compo.u.complex->generic->elementSpec = (Z_ElementSpec *)
+ odr_malloc(out, sizeof(Z_ElementSpec));
+ compo.u.complex->generic->elementSpec->which =
+ Z_ElementSpec_elementSetName;
+ compo.u.complex->generic->elementSpec->u.elementSetName =
+ elementSetNames->u.generic;
+ }
+ compo.u.complex->num_dbSpecific = 0;
+ compo.u.complex->dbSpecific = 0;
+ compo.u.complex->num_recordSyntax = 0;
+ compo.u.complex->recordSyntax = 0;
}
else if (elementSetNames)
{
return 2;
}
+#if HAVE_XML2
+static int send_SRW_presentRequest(const char *arg)
+{
+ char setstring[100];
+ int nos = 1;
+ Z_SRW_PDU *sr = srw_sr;
+
+ if (!sr)
+ return 0;
+ parse_show_args(arg, setstring, &setno, &nos);
+ sr->u.request->startRecord = odr_intdup(out, setno);
+ sr->u.request->maximumRecords = odr_intdup(out, nos);
+ if (schema)
+ sr->u.request->recordSchema = schema;
+ return send_srw(sr);
+}
+#endif
+
+static void close_session (void)
+{
+ if (conn)
+ cs_close (conn);
+ conn = 0;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
+ sent_close = 0;
+ odr_reset(out);
+ odr_reset(in);
+ odr_reset(print);
+}
+
void process_close(Z_Close *req)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
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;
- send_apdu(apdu);
- printf("Sent response.\n");
- sent_close = 1;
+ *res->closeReason = Z_Close_finished;
+ send_apdu(apdu);
+ printf("Sent response.\n");
+ sent_close = 1;
}
}
-static int cmd_show(char *arg)
+static int cmd_show(const char *arg)
{
- if (!conn)
+ if (protocol == PROTO_HTTP)
{
- printf("Not connected yet\n");
+#if HAVE_XML2
+ if (!conn)
+ cmd_open(0);
+ if (!send_SRW_presentRequest(arg))
+ return 0;
+#else
return 0;
+#endif
+ }
+ else
+ {
+ if (!conn)
+ {
+ printf("Not connected yet\n");
+ return 0;
+ }
+ if (!send_presentRequest(arg))
+ return 0;
}
- if (!send_presentRequest(arg))
- return 0;
return 2;
}
-int cmd_quit(char *arg)
+int cmd_quit(const char *arg)
{
printf("See you later, alligator.\n");
+ xmalloc_trav ("");
exit(0);
return 0;
}
-int cmd_cancel(char *arg)
+int cmd_cancel(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
Z_TriggerResourceControlRequest *req =
printf("Session not initialized yet\n");
return 0;
}
+ if (only_z3950())
+ return 0;
if (!ODR_MASK_GET(session->options, Z_Options_triggerResourceCtrl))
{
printf("Target doesn't support cancel (trigger resource ctrl)\n");
return 2;
}
-int send_scanrequest(char *string, int pp, int num)
+int send_scanrequest(const char *query, int pp, int num, const char *term)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
Z_ScanRequest *req = apdu->u.scanRequest;
+ int oid[OID_SIZE];
- if (!(req->termListAndStartPoint =
- p_query_scan(out, protocol, &req->attributeSet, string)))
+ if (only_z3950())
+ return 0;
+ if (queryType == QueryType_CCL2RPN)
+ {
+ oident bib1;
+ int error, pos;
+ struct ccl_rpn_node *rpn;
+
+ rpn = ccl_find_str (bibset, query, &error, &pos);
+ if (error)
+ {
+ printf("CCL ERROR: %s\n", ccl_err_msg(error));
+ return -1;
+ }
+ bib1.proto = PROTO_Z3950;
+ bib1.oclass = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
+ req->attributeSet = oid_ent_to_oid (&bib1, oid);
+ if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn)))
+ {
+ printf("Couldn't convert CCL to Scan term\n");
+ return -1;
+ }
+ ccl_rpn_delete (rpn);
+ }
+ else
+ {
+ YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
+
+ if (!(req->termListAndStartPoint =
+ yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query)))
+ {
+ const char *pqf_msg;
+ size_t off;
+ int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ printf("%*s^\n", off+7, "");
+ printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
+ yaz_pqf_destroy (pqf_parser);
+ return -1;
+ }
+ yaz_pqf_destroy (pqf_parser);
+ }
+ if (term && *term)
{
- printf("Prefix query error\n");
- return -1;
+ if (req->termListAndStartPoint->term &&
+ req->termListAndStartPoint->term->which == Z_Term_general &&
+ req->termListAndStartPoint->term->u.general)
+ {
+ req->termListAndStartPoint->term->u.general->buf =
+ (unsigned char *) odr_strdup(out, term);
+ req->termListAndStartPoint->term->u.general->len =
+ req->termListAndStartPoint->term->u.general->size =
+ strlen(term);
+ }
}
req->referenceId = set_refid (out);
req->num_databaseNames = num_databaseNames;
return 2;
}
-int send_sortrequest(char *arg, int newset)
+int send_sortrequest(const char *arg, int newset)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
Z_SortRequest *req = apdu->u.sortRequest;
Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
odr_malloc (out, sizeof(*sksl));
char setstring[32];
- char sort_string[32], sort_flags[32];
- int off;
- int oid[OID_SIZE];
- oident bib1;
+ if (only_z3950())
+ return 0;
if (setnumber >= 0)
- sprintf (setstring, "%d", setnumber);
+ sprintf (setstring, "%d", setnumber);
else
- sprintf (setstring, "default");
+ sprintf (setstring, "default");
req->referenceId = set_refid (out);
-#ifdef ASN_COMPILED
req->num_inputResultSetNames = 1;
req->inputResultSetNames = (Z_InternationalString **)
- odr_malloc (out, sizeof(*req->inputResultSetNames));
+ odr_malloc (out, sizeof(*req->inputResultSetNames));
req->inputResultSetNames[0] = odr_strdup (out, setstring);
-#else
- req->inputResultSetNames =
- (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames));
- req->inputResultSetNames->num_strings = 1;
- req->inputResultSetNames->strings =
- (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings));
- req->inputResultSetNames->strings[0] =
- odr_strdup (out, setstring);
-#endif
if (newset && setnumber >= 0)
- sprintf (setstring, "%d", ++setnumber);
+ sprintf (setstring, "%d", ++setnumber);
req->sortedResultSetName = odr_strdup (out, setstring);
- req->sortSequence = sksl;
- sksl->num_specs = 0;
- sksl->specs = (Z_SortKeySpec **)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 = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks));
- Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk));
-
- arg += off;
- sksl->specs[sksl->num_specs++] = sks;
- sks->sortElement = (Z_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 = (Z_AttributeElement *)odr_malloc (out, sizeof(*el));
- sk->which = Z_SortKey_sortAttributes;
- sk->u.sortAttributes =
- (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes));
- sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid);
- sk->u.sortAttributes->list =
- (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
- sk->u.sortAttributes->list->num_attributes = 1;
- sk->u.sortAttributes->list->attributes =
- (Z_AttributeElement **)odr_malloc (out,
- sizeof(*sk->u.sortAttributes->list->attributes));
- sk->u.sortAttributes->list->attributes[0] = el;
- el->attributeSet = 0;
- el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType));
- *el->attributeType = atoi (sort_string);
- el->which = Z_AttributeValue_numeric;
- el->value.numeric = (int *)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_strdup (out, sort_string);
- }
- sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation));
- *sks->sortRelation = Z_SortRelation_ascending;
- sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity));
- *sks->caseSensitivity = Z_SortCase_caseSensitive;
-
-#ifdef ASN_COMPILED
- sks->which = Z_SortKeySpec_null;
- sks->u.null = odr_nullval ();
-#else
- sks->missingValueAction = NULL;
-#endif
-
- for (i = 0; sort_flags[i]; i++)
- {
- switch (sort_flags[i])
- {
- case 'a':
- case 'A':
- case '>':
- *sks->sortRelation = Z_SortRelation_descending;
- break;
- case 'd':
- case 'D':
- case '<':
- *sks->sortRelation = Z_SortRelation_ascending;
- 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)
+ req->sortSequence = yaz_sort_spec (out, arg);
+ if (!req->sortSequence)
{
printf ("Missing sort specifications\n");
- return -1;
+ return -1;
}
send_apdu(apdu);
return 2;
{
if (t->term->which == Z_Term_general)
{
- printf("%.*s (%d)\n", t->term->u.general->len, t->term->u.general->buf,
- t->globalOccurrences ? *t->globalOccurrences : -1);
- sprintf(last_scan, "%.*s", t->term->u.general->len,
+ printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
+ sprintf(last_scan_line, "%.*s", t->term->u.general->len,
t->term->u.general->buf);
}
else
- printf("Term type not general.\n");
+ printf("Term (not general)");
+ if (t->globalOccurrences)
+ printf (" (%d)\n", *t->globalOccurrences);
+ else
+ printf ("\n");
}
void process_scanResponse(Z_ScanResponse *res)
print_refid (res->referenceId);
printf("%d entries", *res->numberOfEntriesReturned);
if (res->positionOfTerm)
- printf (", position=%d", *res->positionOfTerm);
+ printf (", position=%d", *res->positionOfTerm);
printf ("\n");
if (*res->scanStatus != Z_Scan_success)
printf("Scan returned code %d\n", *res->scanStatus);
if (!res->entries)
return;
if ((entries = res->entries->entries))
- num_entries = res->entries->num_entries;
+ num_entries = res->entries->num_entries;
for (i = 0; i < num_entries; i++)
{
int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1;
- if (entries[i]->which == Z_Entry_termInfo)
- {
- printf("%c ", i + 1 == pos_term ? '*' : ' ');
- display_term(entries[i]->u.termInfo);
- }
- else
- display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
+ if (entries[i]->which == Z_Entry_termInfo)
+ {
+ printf("%c ", i + 1 == pos_term ? '*' : ' ');
+ display_term(entries[i]->u.termInfo);
+ }
+ else
+ display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
}
if (res->entries->nonsurrogateDiagnostics)
- display_diagrecs (res->entries->nonsurrogateDiagnostics,
- res->entries->num_nonsurrogateDiagnostics);
+ display_diagrecs (res->entries->nonsurrogateDiagnostics,
+ res->entries->num_nonsurrogateDiagnostics);
}
void process_sortResponse(Z_SortResponse *res)
switch (*res->sortStatus)
{
case Z_SortStatus_success:
- printf ("success"); break;
+ printf ("success"); break;
case Z_SortStatus_partial_1:
- printf ("partial"); break;
+ printf ("partial"); break;
case Z_SortStatus_failure:
- printf ("failure"); break;
+ printf ("failure"); break;
default:
- printf ("unknown (%d)", *res->sortStatus);
+ printf ("unknown (%d)", *res->sortStatus);
}
printf ("\n");
print_refid (res->referenceId);
-#ifdef ASN_COMPILED
if (res->diagnostics)
display_diagrecs(res->diagnostics,
- res->num_diagnostics);
-#else
- if (res->diagnostics)
- display_diagrecs(res->diagnostics->diagRecs,
- res->diagnostics->num_diagRecs);
-#endif
+ res->num_diagnostics);
}
void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res)
{
printf("Got deleteResultSetResponse status=%d\n",
- *res->deleteOperationStatus);
+ *res->deleteOperationStatus);
if (res->deleteListStatuses)
{
- int i;
- for (i = 0; i < res->deleteListStatuses->num; i++)
- {
- printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id,
- *res->deleteListStatuses->elements[i]->status);
- }
+ int i;
+ for (i = 0; i < res->deleteListStatuses->num; i++)
+ {
+ printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id,
+ *res->deleteListStatuses->elements[i]->status);
+ }
}
}
-int cmd_sort_generic(char *arg, int newset)
+int cmd_sort_generic(const char *arg, int newset)
{
if (!conn)
{
printf("Session not initialized yet\n");
return 0;
}
+ if (only_z3950())
+ return 0;
if (!ODR_MASK_GET(session->options, Z_Options_sort))
{
printf("Target doesn't support sort\n");
{
if (send_sortrequest(arg, newset) < 0)
return 0;
- return 2;
+ return 2;
}
return 0;
}
-int cmd_sort(char *arg)
+int cmd_sort(const char *arg)
{
return cmd_sort_generic (arg, 0);
}
-int cmd_sort_newset (char *arg)
+int cmd_sort_newset (const char *arg)
{
return cmd_sort_generic (arg, 1);
}
-int cmd_scan(char *arg)
+int cmd_scan(const char *arg)
{
+ if (only_z3950())
+ return 0;
if (!conn)
{
- printf("Session not initialized yet\n");
- return 0;
+ try_reconnect();
+
+ if (!conn) {
+ printf("Session not initialized yet\n");
+ return 0;
+ }
}
if (!ODR_MASK_GET(session->options, Z_Options_scan))
{
}
if (*arg)
{
- if (send_scanrequest(arg, 1, 20) < 0)
+ strcpy (last_scan_query, arg);
+ if (send_scanrequest(arg, 1, 20, 0) < 0)
return 0;
}
else
- if (send_scanrequest(last_scan, 1, 20) < 0)
+ {
+ if (send_scanrequest(last_scan_query, 1, 20, last_scan_line) < 0)
return 0;
+ }
return 2;
}
-int cmd_schema(char *arg)
+int cmd_schema(const char *arg)
{
- if (!arg || !*arg)
- {
- schema = VAL_NONE;
- return 1;
- }
- schema = oid_getvalbyname (arg);
- if (schema == VAL_NONE)
- {
- printf ("unknown schema\n");
- return 0;
- }
+ xfree(schema);
+ schema = 0;
+ if (arg && *arg)
+ schema = xstrdup(arg);
return 1;
}
-int cmd_format(char *arg)
+int cmd_format(const char *arg)
{
+ oid_value nsyntax;
if (!arg || !*arg)
{
printf("Usage: format <recordsyntax>\n");
return 0;
}
- recordsyntax = oid_getvalbyname (arg);
- if (recordsyntax == VAL_NONE)
+ nsyntax = oid_getvalbyname (arg);
+ if (strcmp(arg, "none") && nsyntax == VAL_NONE)
{
printf ("unknown record syntax\n");
return 0;
}
+ recordsyntax = nsyntax;
return 1;
}
-int cmd_elements(char *arg)
+int cmd_elements(const char *arg)
{
static Z_ElementSetNames esn;
static char what[100];
if (!arg || !*arg)
{
- elementSetNames = 0;
+ elementSetNames = 0;
return 1;
}
strcpy(what, arg);
return 1;
}
-int cmd_attributeset(char *arg)
+int cmd_attributeset(const char *arg)
{
char what[100];
if (!arg || !*arg)
{
- printf("Usage: attributeset <setname>\n");
- return 0;
+ printf("Usage: attributeset <setname>\n");
+ return 0;
}
sscanf(arg, "%s", what);
if (p_query_attset (what))
{
- printf("Unknown attribute set name\n");
- return 0;
+ printf("Unknown attribute set name\n");
+ return 0;
}
return 1;
}
-int cmd_querytype (char *arg)
+int cmd_querytype (const char *arg)
{
if (!strcmp (arg, "ccl"))
queryType = QueryType_CCL;
else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn"))
queryType = QueryType_Prefix;
-#if CCL2RPN
else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn"))
queryType = QueryType_CCL2RPN;
-#endif
+ else if (!strcmp(arg, "cql"))
+ queryType = QueryType_CQL;
else
{
printf ("Querytype must be one of:\n");
printf (" prefix - Prefix query\n");
printf (" ccl - CCL query\n");
-#if CCL2RPN
printf (" ccl2rpn - CCL query converted to RPN\n");
-#endif
+ printf (" cql - CQL\n");
return 0;
}
return 1;
}
-int cmd_refid (char *arg)
+int cmd_refid (const char *arg)
{
xfree (refid);
refid = NULL;
if (*arg)
{
- refid = (char *) xmalloc (strlen(arg)+1);
- strcpy (refid, arg);
+ refid = (char *) xmalloc (strlen(arg)+1);
+ strcpy (refid, arg);
}
return 1;
}
-int cmd_close(char *arg)
+int cmd_close(const char *arg)
{
Z_APDU *apdu;
Z_Close *req;
if (!conn)
+ return 0;
+ if (only_z3950())
return 0;
apdu = zget_APDU(out, Z_APDU_close);
return 2;
}
-static void initialize(void)
+int cmd_packagename(const 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)))
- {
- fprintf(stderr, "failed to allocate ODR streams\n");
- exit(1);
- }
- setvbuf(stdout, 0, _IONBF, 0);
- if (apdu_file)
- odr_setprint(print, apdu_file);
+ xfree (esPackageName);
+ esPackageName = NULL;
+ if (*arg)
+ esPackageName = xstrdup(arg);
+ return 1;
+}
-#if CCL2RPN
- bibset = ccl_qual_mk ();
- inf = fopen ("default.bib", "r");
- if (inf)
- {
- ccl_qual_file (bibset, inf);
- fclose (inf);
- }
-#endif
- cmd_base("Default");
+int cmd_proxy(const char* arg)
+{
+ xfree (yazProxy);
+ yazProxy = NULL;
+ if (*arg)
+ yazProxy = xstrdup (arg);
+ return 1;
}
-static int client(int wait)
+int cmd_marccharset(const 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, "1|2 <item>"},
- {"update", cmd_update, "<item>"},
- /* Server Admin Functions */
- {"adm-reindex", cmd_adm_reindex, "<database-name>"},
- {"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
- {"adm-create", cmd_adm_create, "<database-name>"},
- {"adm-delete", cmd_adm_delete, "('database'|'index')<object-name>"},
- {"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>"},
- {"adm-refresh", cmd_adm_refresh, "<database-name>"},
- {"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;
+ char l1[30];
- while (1)
+ *l1 = 0;
+ if (sscanf(arg, "%29s", l1) < 1)
+ return 1;
+ xfree (marcCharset);
+ marcCharset = 0;
+ if (strcmp(l1, "-"))
+ marcCharset = xstrdup(l1);
+ return 1;
+}
+
+int cmd_charset(const char* arg)
+{
+ char l1[30], l2[30];
+
+ *l1 = *l2 = 0;
+ if (sscanf(arg, "%29s %29s", l1, l2) < 1)
{
- int res;
-#ifdef USE_SELECT
- fd_set input;
-#endif
- char line[1024], word[1024], arg[1024];
-
-#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)
+ printf("Current negotiation character set is `%s'\n",
+ negotiationCharset ? negotiationCharset: "none");
+ printf("Current output character set is `%s'\n",
+ outputCharset ? outputCharset: "none");
+ return 1;
+ }
+ xfree (negotiationCharset);
+ negotiationCharset = NULL;
+ if (*l1 && strcmp(l1, "-"))
+ {
+ negotiationCharset = xstrdup(l1);
+ printf ("Character set negotiation : %s\n", negotiationCharset);
+ }
+ else
+ printf ("Character set negotiation disabled\n");
+ if (*l2)
+ {
+ xfree (outputCharset);
+ outputCharset = 0;
+ if (!strcmp(l2, "auto") && codeset)
{
- perror("select");
- exit(1);
- }
- if (!res)
- continue;
- if (!wait && FD_ISSET(0, &input))
-#else
- if (!wait)
-#endif
- {
-#if HAVE_READLINE_READLINE_H
- char* line_in;
- line_in=readline(C_PROMPT);
- if (!line_in)
- break;
-#if HAVE_READLINE_HISTORY_H
- if (*line_in)
- add_history(line_in);
-#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
- if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
+ if (codeset)
{
- strcpy(word, last_cmd);
- *arg = '\0';
- }
- 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 */
- {
- 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 ("output charset: %s\n", codeset);
+ outputCharset = xstrdup(codeset);
+
+
}
- if (res < 2)
- {
- continue;
- }
- }
- wait = 0;
- if (conn
-#ifdef USE_SELECT
- && FD_ISSET(cs_fileno(conn), &input)
-#endif
- )
- {
- do
+ else
+ printf ("No codeset found on this system\n");
+ }
+ else if (strcmp(l2, "-"))
+ outputCharset = xstrdup(l2);
+ else
+ printf ("Output charset conversion disabled\n");
+ }
+ if (outputCharset && negotiationCharset)
+ {
+ odr_set_charset (out, negotiationCharset, outputCharset);
+ odr_set_charset (in, outputCharset, negotiationCharset);
+ }
+ else
+ {
+ odr_set_charset (out, 0, 0);
+ odr_set_charset (in, 0, 0);
+ }
+ return 1;
+}
+
+int cmd_lang(const char* arg)
+{
+ 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(const char* arg)
+{
+ /* first should open the file and read one line at a time.. */
+ FILE* includeFile;
+ char line[1024], *cp;
+
+ 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);
+
+ 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(const char* args)
+{
+ if(strlen(args))
+ system(args);
+ else
+ system(getenv("SHELL"));
+
+ printf("\n");
+ return 1;
+}
+
+int cmd_set_berfile(const char *arg)
+{
+ if (ber_file && ber_file != stdout && ber_file != stderr)
+ fclose(ber_file);
+ if (!strcmp(arg, ""))
+ ber_file = 0;
+ else if (!strcmp(arg, "-"))
+ ber_file = stdout;
+ else
+ ber_file = fopen(arg, "a");
+ return 1;
+}
+
+int cmd_set_apdufile(const char *arg)
+{
+ if(apdu_file && apdu_file != stderr && apdu_file != stderr)
+ fclose(apdu_file);
+ if (!strcmp(arg, ""))
+ apdu_file = 0;
+ else if (!strcmp(arg, "-"))
+ apdu_file = stderr;
+ else
+ {
+ apdu_file = fopen(arg, "a");
+ if (!apdu_file)
+ perror("unable to open apdu log file");
+ }
+ if (apdu_file)
+ odr_setprint(print, apdu_file);
+ return 1;
+}
+
+int cmd_set_cclfile(const char* arg)
+{
+ FILE *inf;
+
+ bibset = ccl_qual_mk ();
+ inf = fopen (arg, "r");
+ if (!inf)
+ perror("unable to open CCL file");
+ else
+ {
+ ccl_qual_file (bibset, inf);
+ fclose (inf);
+ }
+ strcpy(ccl_fields,arg);
+ return 0;
+}
+
+int cmd_set_auto_reconnect(const char* arg)
+{
+ if(strlen(arg)==0) {
+ auto_reconnect = ! auto_reconnect;
+ } else if(strcmp(arg,"on")==0) {
+ auto_reconnect = 1;
+ } else if(strcmp(arg,"off")==0) {
+ auto_reconnect = 0;
+ } else {
+ printf("Error use on or off\n");
+ return 1;
+ }
+
+ if (auto_reconnect)
+ printf("Set auto reconnect enabled.\n");
+ else
+ printf("Set auto reconnect disabled.\n");
+
+ return 0;
+}
+
+int cmd_set_marcdump(const char* arg)
+{
+ if(marc_file && marc_file != stderr) { /* don't close stdout*/
+ fclose(marc_file);
+ }
+
+ if (!strcmp(arg, ""))
+ marc_file = 0;
+ else if (!strcmp(arg, "-"))
+ marc_file = stderr;
+ else
+ {
+ marc_file = fopen(arg, "a");
+ if (!marc_file)
+ perror("unable to open marc log file");
+ }
+ return 1;
+}
+
+int cmd_set_proxy(const 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(const 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,(enum oid_class) 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))
+ {
+ oidclass=oid_classes[i].oclass;
+ break;
+ }
+ }
+
+ 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 (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(const char* arg)
+{
+#if HAVE_READLINE_HISTORY_H
+ if(strlen(arg)>1)
+ add_history(arg);
+#else
+ fprintf(stderr,"Not compiled with the readline/history module\n");
+#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;
+ int i;
+
+ 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);
+ }
+#if HAVE_READLINE_READLINE_H
+ rl_attempted_completion_function = (CPPFunction*)readline_completer;
+#endif
+
+
+ for(i=0; i<maxOtherInfosSupported; ++i) {
+ extraOtherInfos[i].oidval = -1;
+ }
+
+ source_rcfile();
+}
+
+
+#if HAVE_GETTIMEOFDAY
+struct timeval tv_start, tv_end;
+#endif
+
+#if HAVE_XML2
+static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
+{
+ int i;
+
+ printf ("Received SRW SearchRetrieve Response\n");
+
+ for (i = 0; i<res->num_diagnostics; i++)
+ {
+ printf ("SRW diagnostic %d %s\n",
+ *res->diagnostics[i].code,
+ yaz_diag_srw_str(*res->diagnostics[i].code));
+
+ if (res->diagnostics[i].details)
+ printf ("Details: %s\n", res->diagnostics[i].details);
+ }
+ if (res->numberOfRecords)
+ printf ("Number of hits: %d\n", *res->numberOfRecords);
+ for (i = 0; i<res->num_records; i++)
+ {
+ Z_SRW_record *rec = res->records + i;
+
+ if (rec->recordPosition)
+ {
+ printf ("pos=%d", *rec->recordPosition);
+ setno = *rec->recordPosition + 1;
+ }
+ if (rec->recordSchema)
+ printf (" schema=%s", rec->recordSchema);
+ printf ("\n");
+ if (rec->recordData_buf && rec->recordData_len)
+ {
+ fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+ printf ("\n");
+ }
+ }
+}
+
+static void http_response(Z_HTTP_Response *hres)
+{
+ int ret = -1;
+ const char *content_type = z_HTTP_header_lookup(hres->headers,
+ "Content-Type");
+ const char *connection_head = z_HTTP_header_lookup(hres->headers,
+ "Connection");
+ if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
+ {
+ Z_SOAP *soap_package = 0;
+ ODR o = odr_createmem(ODR_DECODE);
+ Z_SOAP_Handler soap_handlers[2] = {
+ {"http://www.loc.gov/zing/srw/v1.0/", 0,
+ (Z_SOAP_fun) yaz_srw_codec},
+ {0, 0, 0}
+ };
+ ret = z_soap_codec(o, &soap_package,
+ &hres->content_buf, &hres->content_len,
+ soap_handlers);
+ if (!ret && soap_package->which == Z_SOAP_generic &&
+ soap_package->u.generic->no == 0)
+ {
+ Z_SRW_PDU *sr = soap_package->u.generic->p;
+ if (sr->which == Z_SRW_searchRetrieve_response)
+ handle_srw_response(sr->u.response);
+ else
+ ret = -1;
+ }
+ else if (!ret && (soap_package->which == Z_SOAP_fault
+ || soap_package->which == Z_SOAP_error))
+ {
+ printf ("HTTP Error Status=%d\n", hres->code);
+ printf ("SOAP Fault code %s\n",
+ soap_package->u.fault->fault_code);
+ printf ("SOAP Fault string %s\n",
+ soap_package->u.fault->fault_string);
+ }
+ else
+ ret = -1;
+ odr_destroy(o);
+ }
+ if (ret)
+ {
+ if (hres->code != 200)
+ {
+ printf ("HTTP Error Status=%d\n", hres->code);
+ }
+ else
+ {
+ printf ("Decoding of SRW package failed\n");
+ }
+ close_session();
+ }
+ if (!strcmp(hres->version, "1.0"))
+ {
+ /* HTTP 1.0: only if Keep-Alive we stay alive.. */
+ if (!connection_head || strcmp(connection_head, "Keep-Alive"))
+ close_session();
+ }
+ else
+ {
+ /* HTTP 1.1: only if no close we stay alive .. */
+ if (connection_head && !strcmp(connection_head, "close"))
+ close_session();
+ }
+}
+#endif
+
+void wait_and_handle_response()
+{
+ int reconnect_ok = 1;
+ int res;
+ char *netbuffer= 0;
+ int netbufferlen = 0;
+ Z_GDU *gdu;
+
+ while(conn)
+ {
+ res = cs_get(conn, &netbuffer, &netbufferlen);
+ if (reconnect_ok && res <= 0 && protocol == PROTO_HTTP)
+ {
+ cs_close(conn);
+ conn = 0;
+ cmd_open(0);
+ reconnect_ok = 0;
+ if (conn)
{
- 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",
- *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);
- }
+ char *buf_out;
+ int len_out;
+
+ buf_out = odr_getbuf(out, &len_out, 0);
+
+ cs_put(conn, buf_out, len_out);
+
+ odr_reset(out);
+ continue;
}
- while (conn && cs_more(conn));
}
+ else if (res <= 0)
+ {
+ printf("Target closed connection\n");
+ close_session();
+ break;
+ }
+ odr_reset(out);
+ odr_reset(in); /* release APDU from last round */
+ record_last = 0;
+ odr_setbuf(in, netbuffer, res, 0);
+
+ if (!z_GDU(in, &gdu, 0, 0))
+ {
+ FILE *f = ber_file ? ber_file : stdout;
+ odr_perror(in, "Decoding incoming APDU");
+ fprintf(f, "[Near %d]\n", odr_offset(in));
+ fprintf(f, "Packet dump:\n---------\n");
+ odr_dumpBER(f, netbuffer, res);
+ fprintf(f, "---------\n");
+ if (apdu_file)
+ z_GDU(print, &gdu, 0, 0);
+ close_session ();
+ break;
+ }
+ if (ber_file)
+ odr_dumpBER(ber_file, netbuffer, res);
+ if (apdu_file && !z_GDU(print, &gdu, 0, 0))
+ {
+ odr_perror(print, "Failed to print incoming APDU");
+ odr_reset(print);
+ continue;
+ }
+ if (gdu->which == Z_GDU_Z3950)
+ {
+ Z_APDU *apdu = gdu->u.z3950;
+ 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",
+ *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);
+ close_session ();
+ }
+ }
+#if HAVE_XML2
+ else if (gdu->which == Z_GDU_HTTP_Response)
+ {
+ http_response(gdu->u.HTTP_Response);
+ }
+#endif
+ if (conn && !cs_more(conn))
+ break;
+ }
+ if (conn)
+ {
+#if HAVE_GETTIMEOFDAY
+ 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(const 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;
+}
+
+
+int cmd_set_otherinfo(const char* args)
+{
+ char oid[101], otherinfoString[101];
+ int otherinfoNo;
+ int sscan_res;
+ int oidval;
+
+ sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oid, otherinfoString);
+ if(sscan_res==1) {
+ /* reset this otherinfo */
+ if(otherinfoNo>=maxOtherInfosSupported) {
+ printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+ }
+ extraOtherInfos[otherinfoNo].oidval = -1;
+ if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value);
+ return 0;
+ }
+ if (sscan_res<3) {
+ printf("Error in set_otherinfo command \n");
+ return 0;
+ }
+
+ if(otherinfoNo>=maxOtherInfosSupported) {
+ printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+ }
+
+
+ oidval = oid_getvalbyname (oid);
+ if(oidval == -1 ) {
+ printf("Error in set_otherinfo command unknown oid %s \n",oid);
+ return 0;
+ }
+ extraOtherInfos[otherinfoNo].oidval = oidval;
+ if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].value = strdup(otherinfoString);
+
+ return 0;
+}
+
+int cmd_list_otherinfo(const char* args)
+{
+ int i;
+
+ if(strlen(args)>0) {
+ i = atoi(args);
+ if( i >= maxOtherInfosSupported ) {
+ printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported);
+ return 0;
+ }
+
+ if(extraOtherInfos[i].oidval != -1)
+ printf(" otherinfo %d %s %s\n",
+ i,
+ yaz_z3950_oid_value_to_str(
+ (enum oid_value) extraOtherInfos[i].oidval,
+ CLASS_RECSYN),
+ extraOtherInfos[i].value);
+
+ } else {
+ for(i=0; i<maxOtherInfosSupported; ++i) {
+ if(extraOtherInfos[i].oidval != -1)
+ printf(" otherinfo %d %s %s\n",
+ i,
+ yaz_z3950_oid_value_to_str(
+ (enum oid_value) extraOtherInfos[i].oidval,
+ CLASS_RECSYN),
+ extraOtherInfos[i].value);
+ }
+
+ }
+ return 0;
+}
+
+
+int cmd_list_all(const char* args) {
+ int i;
+
+ /* connection options */
+ if(conn) {
+ printf("Connected to : %s\n",last_open_command);
+ } else {
+ if(last_open_command)
+ printf("Not connected to : %s\n",last_open_command);
+ else
+ printf("Not connected : \n");
+
+ }
+ if(yazProxy) printf("using proxy : %s\n",yazProxy);
+
+ printf("auto_reconnect : %s\n",auto_reconnect?"on":"off");
+
+ if (!auth) {
+ printf("Authentication : none\n");
+ } else {
+ switch(auth->which) {
+ case Z_IdAuthentication_idPass:
+ printf("Authentication : IdPass\n");
+ printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:"");
+ printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:"");
+ printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:"");
+ break;
+ case Z_IdAuthentication_open:
+ printf("Authentication : psOpen\n");
+ printf(" Open string : %s\n",auth->u.open);
+ break;
+ default:
+ printf("Authentication : Unknown\n");
+ }
+ }
+ if (negotiationCharset)
+ printf("Neg. Character set : `%s'\n", negotiationCharset);
+
+ /* bases */
+ printf("Bases : ");
+ for (i = 0; i<num_databaseNames; i++) printf("%s ",databaseNames[i]);
+ printf("\n");
+
+ /* Query options */
+ printf("CCL file : %s\n",ccl_fields);
+ printf("Query type : %s\n",query_type_as_string(queryType));
+
+ printf("Named Result Sets : %s\n",setnumber==-1?"off":"on");
+
+ /* piggy back options */
+ printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber);
+
+ /* print present related options */
+ printf("Format : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN));
+ printf("Schema : %s\n",schema);
+ printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:"");
+
+ /* loging options */
+ printf("APDU log : %s\n",apdu_file?"on":"off");
+ printf("Record log : %s\n",marc_file?"on":"off");
+
+ /* other infos */
+ printf("Other Info: \n");
+ cmd_list_otherinfo("");
+
+ return 0;
+}
+
+int cmd_clear_otherinfo(const char* args)
+{
+ if(strlen(args)>0) {
+ int otherinfoNo;
+ otherinfoNo = atoi(args);
+ if( otherinfoNo >= maxOtherInfosSupported ) {
+ printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+ return 0;
+ }
+
+ if(extraOtherInfos[otherinfoNo].oidval != -1) {
+ /* only clear if set. */
+ extraOtherInfos[otherinfoNo].oidval=-1;
+ free(extraOtherInfos[otherinfoNo].value);
+ }
+ } else {
+ int i;
+
+ for(i=0; i<maxOtherInfosSupported; ++i) {
+ if (extraOtherInfos[i].oidval!=-1 ) {
+ extraOtherInfos[i].oidval=-1;
+ free(extraOtherInfos[i].value);
+ }
+ }
+ }
+ return 0;
+}
+
+static int cmd_help (const char *line);
+
+typedef char *(*completerFunctionType)(const char *text, int state);
+
+static struct {
+ char *cmd;
+ int (*fun)(const char *arg);
+ char *ad;
+ completerFunctionType rl_completerfunction;
+ int complete_filenames;
+ char **local_tabcompletes;
+} cmd_array[] = {
+ {"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, "<action> <recid> [<file>]",NULL,0,NULL},
+ {"packagename", cmd_packagename, "<packagename>",NULL,0,NULL},
+ {"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0,NULL},
+ {"charset", cmd_charset, "<nego_charset> <output_charset>",NULL,0,NULL},
+ {"marccharset", cmd_marccharset, "<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_berfile", cmd_set_berfile, "<filename>",NULL,1,NULL},
+ {"set_marcdump", cmd_set_marcdump," <filename>",NULL,1,NULL},
+ {"set_cclfile", cmd_set_cclfile," <filename>",NULL,1,NULL},
+ {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL},
+ {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,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},
+ {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL},
+ {"list_all",cmd_list_all,"",NULL,0,NULL},
+ {"clear_otherinfo",cmd_clear_otherinfo,"",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 (const char *line)
+{
+ int i;
+ char topic[21];
+
+ *topic = 0;
+ sscanf (line, "%20s", topic);
+
+ if (*topic == 0)
+ printf("Commands:\n");
+ for (i = 0; cmd_array[i].cmd; i++)
+ if (*topic == 0 || strcmp (topic, cmd_array[i].cmd) == 0)
+ printf(" %s %s\n", cmd_array[i].cmd, cmd_array[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(const 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_array[i].cmd; i++) {
+ if (!strncmp(cmd_array[i].cmd, command, strlen(command))) {
+ break;
+ }
+ }
+
+ if(!cmd_array[i].cmd) {
+ fprintf(stderr,"Unknown command %s\n",command);
+ return 1;
}
+
+
+ if(!cmd_array[i].local_tabcompletes)
+ cmd_array[i].local_tabcompletes = (char **) calloc(1,sizeof(char**));
+
+ num_of_tabs=0;
+
+ tabslist = cmd_array[i].local_tabcompletes;
+ for(;tabslist && *tabslist;tabslist++) {
+ num_of_tabs++;
+ }
+
+ cmd_array[i].local_tabcompletes = (char **)
+ realloc(cmd_array[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**));
+ tabslist=cmd_array[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 = arg;
+ char* lastnonspace=NULL;
+
+ for(;*p; ++p) {
+ if(!isspace(*p)) {
+ lastnonspace = p;
+ }
+ }
+ if(lastnonspace)
+ *(++lastnonspace) = 0;
+ }
+
+ for (i = 0; cmd_array[i].cmd; i++)
+ if (!strncmp(cmd_array[i].cmd, word, strlen(word)))
+ {
+ res = (*cmd_array[i].fun)(arg);
+ break;
+ }
+
+ if (!cmd_array[i].cmd) /* dump our help-screen */
+ {
+ printf("Unknown command: %s.\n", word);
+ printf("use help for list of commands\n");
+ /* cmd_help (""); */
+ res = 1;
+ }
+
+ if(apdu_file) fflush(apdu_file);
+
+ if (res >= 2)
+ wait_and_handle_response();
+
+ if(apdu_file)
+ fflush(apdu_file);
+ if(marc_file)
+ fflush(marc_file);
+}
+
+
+char *command_generator(const char *text, int state)
+{
+ static int idx;
+ if (state==0) {
+ idx = 0;
+ }
+ for( ; cmd_array[idx].cmd; ++idx) {
+ if (!strncmp(cmd_array[idx].cmd,text,strlen(text))) {
+ ++idx; /* skip this entry on the next run */
+ return strdup(cmd_array[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;
+ }
+
+ for (i = 0; cmd_array[i].cmd; i++) {
+ if (!strncmp(cmd_array[i].cmd, word, strlen(word))) {
+ break;
+ }
+ }
+
+ if(!cmd_array[i].cmd) return NULL;
+
+ curret_global_list = cmd_array[i].local_tabcompletes;
+
+ completerToUse = cmd_array[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_array[i].complete_filenames)
+ rl_attempted_completion_over = 1;
+ return res;
+ } else {
+ if(!cmd_array[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);
+ }
+}
+
+static void show_version(void)
+{
+ char vstr[20];
+
+ yaz_version(vstr, 0);
+ printf ("YAZ version: %s\n", YAZ_VERSION);
+ if (strcmp(vstr, YAZ_VERSION))
+ printf ("YAZ DLL/SO: %s\n", vstr);
+ exit(0);
}
int main(int argc, char **argv)
{
char *prog = *argv;
+ char *open_command = 0;
+ char *auth_command = 0;
char *arg;
int ret;
- int opened = 0;
+
+#if HAVE_LOCALE_H
+ if (!setlocale(LC_CTYPE, ""))
+ fprintf (stderr, "setlocale failed\n");
+#endif
+#if HAVE_LANGINFO_H
+#ifdef CODESET
+ codeset = nl_langinfo(CODESET);
+#endif
+#endif
- while ((ret = options("a:m:v:", argv, argc, &arg)) != -2)
+ while ((ret = options("k:c:a:b:m:v:p:u:t:V", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
- if (!opened)
- {
- initialize ();
- if (cmd_open (arg) == 2)
- opened = 1;
- }
+ if (!open_command)
+ {
+ 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")))
+ if (!(marc_file = fopen (arg, "a")))
{
perror (arg);
exit (1);
}
break;
+ case 't':
+ outputCharset = xstrdup(arg);
+ break;
+ case 'c':
+ strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+ ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ break;
+ case 'b':
+ if (!strcmp(arg, "-"))
+ ber_file=stderr;
+ else
+ ber_file=fopen(arg, "a");
+ break;
case 'a':
if (!strcmp(arg, "-"))
apdu_file=stderr;
else
apdu_file=fopen(arg, "a");
break;
- case 'v':
- log_init (log_mask_str(arg), "", NULL);
- 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), "", 0);
+ break;
+ case 'V':
+ show_version();
+ break;
default:
- fprintf (stderr, "Usage: %s [-m <marclog>] [ -m <apdulog>] "
- "[<server-addr>]\n",
+ fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
+ "[-b berdump] [-c cclfields]\n [-p <proxy-addr>] [-u <auth>] "
+ "[-k size] [-V] [<server-addr>]\n",
prog);
exit (1);
- }
+ }
+ }
+ 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);
}
- if (!opened)
- initialize ();
- return client (opened);
+ client ();
+ exit (0);
}
-
+/*
+ * Local variables:
+ * tab-width: 8
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=8 fdm=marker
+ * vim<600: sw=4 ts=8
+ */
projects / yaz-moved-to-github.git / blobdiff