X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=7fe8df2a6e77e2b29f745786a64358e33de5b638;hp=0b5972493418cfbd3df06353c4a27bcc970aefe7;hb=7057699040b614f56be178f3672b4a2b95301d5f;hpb=e5324215018e129dd19734acd0e683e5af748423 diff --git a/client/client.c b/client/client.c index 0b59724..7fe8df2 100644 --- a/client/client.c +++ b/client/client.c @@ -3,7 +3,25 @@ * See the file LICENSE for details. * * $Log: client.c,v $ - * Revision 1.114 2001-02-21 13:46:53 adam + * Revision 1.120 2001-04-06 12:26:46 adam + * Optional CCL module. Moved atoi_n to marcdisp.h from yaz-util.h. + * + * Revision 1.119 2001/04/05 13:08:48 adam + * New configure options: --enable-module. + * + * Revision 1.118 2001/03/27 14:48:06 adam + * Fixed scan for bad CCL. + * + * Revision 1.117 2001/03/25 21:55:12 adam + * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. + * + * Revision 1.116 2001/03/21 12:43:36 adam + * Implemented cs_create_host. Better error reporting for SSL comstack. + * + * Revision 1.115 2001/03/13 18:10:58 adam + * Added option -c to set CCL config file. + * + * Revision 1.114 2001/02/21 13:46:53 adam * C++ fixes. * * Revision 1.113 2001/02/21 09:41:15 adam @@ -389,11 +407,11 @@ #include -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill #include #endif -#if CCL2RPN +#if YAZ_MODULE_ccl #include #endif @@ -429,7 +447,8 @@ static NMEM session_mem = NULL; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan_line[512] = "0"; static char last_scan_query[512] = "0"; -char* esPackageName = 0; +static char ccl_fields[512] = "default.bib"; +static char* esPackageName = 0; static char last_cmd[100] = "?"; static FILE *marcdump = 0; @@ -443,7 +462,7 @@ typedef enum { static QueryType queryType = QueryType_Prefix; -#if CCL2RPN +#if YAZ_MODULE_ccl static CCL_bibset bibset; /* CCL bibset handle */ #endif @@ -624,7 +643,6 @@ int cmd_open(char *arg) { void *add; char type_and_host[101], base[101]; - char *host = 0; CS_TYPE t; if (conn) @@ -643,44 +661,28 @@ int cmd_open(char *arg) base[0] = '\0'; if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) return 0; - if (strncmp (type_and_host, "tcp:", 4) == 0) - host = type_and_host + 4; - else if (strncmp (type_and_host, "ssl:", 4) == 0) - { -#if HAVE_OPENSSL_SSL_H - t = ssl_type; -#else - printf ("SSL not supported\n"); -#endif - host = type_and_host + 4; - } - else - host = type_and_host; - if (*base) - cmd_base (base); - protocol = PROTO_Z3950; - if (!(conn = cs_create(t, 1, protocol))) - { - perror("cs_create"); - return 0; - } - if (!(add = cs_straddr(conn, host))) + conn = cs_create_host(type_and_host, 1, &add); + if (!conn) { - perror(arg); - return 0; + printf ("Couldn't create comstack\n"); + return 0; } printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { - perror("connect"); + printf ("error = %s\n", cs_strerror(conn)); + if (conn->cerrno == CSYSERR) + perror("system"); cs_close(conn); conn = 0; return 0; } printf("Ok.\n"); send_initRequest(); + if (*base) + cmd_base (base); return 2; } @@ -1023,7 +1025,7 @@ static int send_searchRequest(char *arg) Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; int oid[OID_SIZE]; -#if CCL2RPN +#if YAZ_MODULE_ccl struct ccl_rpn_node *rpn = NULL; int error, pos; #endif @@ -1031,7 +1033,7 @@ static int send_searchRequest(char *arg) Z_RPNQuery *RPNquery; Odr_oct ccl_query; -#if CCL2RPN +#if YAZ_MODULE_ccl if (queryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); @@ -1099,7 +1101,7 @@ static int send_searchRequest(char *arg) ccl_query.buf = (unsigned char*) arg; ccl_query.len = strlen(arg); break; -#if CCL2RPN +#if YAZ_MODULE_ccl case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); @@ -1318,7 +1320,7 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) } } -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill const char *get_ill_element (void *clientData, const char *element) { @@ -1382,14 +1384,9 @@ static Z_External *create_external_itemRequest() } return r; } -#else -static Z_External *create_external_itemRequest() -{ - return 0; -} #endif -#ifdef ASN_COMPILED +#ifdef YAZ_MODULE_ill static Z_External *create_external_ILL_APDU(int which) { struct ill_get_ctl ctl; @@ -1445,11 +1442,6 @@ static Z_External *create_external_ILL_APDU(int which) } return r; } -#else -static Z_External *create_external_ILLRequest() -{ - return 0; -} #endif @@ -1500,7 +1492,7 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill if (!strcmp (type, "item") || !strcmp(type, "2")) { printf ("using item-request\n"); @@ -1513,6 +1505,17 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) 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 = + "\n" + " request\n" + " 000200\n" + " 1212 \n" + ""; + 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; @@ -1524,7 +1527,7 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) 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; @@ -1875,9 +1878,9 @@ 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 use_rpn = 1; +#if YAZ_MODULE_ccl int oid[OID_SIZE]; -#if CCL2RPN if (queryType == QueryType_CCL2RPN) { oident bib1; @@ -1888,7 +1891,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) if (error) { printf("CCL ERROR: %s\n", ccl_err_msg(error)); - return 0; + return -1; } use_rpn = 0; bib1.proto = PROTO_Z3950; @@ -1898,7 +1901,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) { printf("Couldn't convert CCL to Scan term\n"); - return 0; + return -1; } ccl_rpn_delete (rpn); } @@ -2299,7 +2302,7 @@ int cmd_querytype (char *arg) queryType = QueryType_CCL; else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) queryType = QueryType_Prefix; -#if CCL2RPN +#if YAZ_MODULE_ccl else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; #endif @@ -2308,7 +2311,7 @@ int cmd_querytype (char *arg) printf ("Querytype must be one of:\n"); printf (" prefix - Prefix query\n"); printf (" ccl - CCL query\n"); -#if CCL2RPN +#if YAZ_MODULE_ccl printf (" ccl2rpn - CCL query converted to RPN\n"); #endif return 0; @@ -2357,7 +2360,7 @@ int cmd_packagename(char* arg) { static void initialize(void) { -#if CCL2RPN +#if YAZ_MODULE_ccl FILE *inf; #endif nmem_init(); @@ -2372,9 +2375,9 @@ static void initialize(void) if (apdu_file) odr_setprint(print, apdu_file); -#if CCL2RPN +#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); - inf = fopen ("default.bib", "r"); + inf = fopen (ccl_fields, "r"); if (inf) { ccl_qual_file (bibset, inf); @@ -2624,7 +2627,7 @@ int main(int argc, char **argv) int ret; int opened = 0; - while ((ret = options("a:m:v:", argv, argc, &arg)) != -2) + while ((ret = options("c:a:m:v:", argv, argc, &arg)) != -2) { switch (ret) { @@ -2643,6 +2646,10 @@ int main(int argc, char **argv) exit (1); } break; + case 'c': + strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; + break; case 'a': if (!strcmp(arg, "-")) apdu_file=stderr; @@ -2654,7 +2661,7 @@ int main(int argc, char **argv) break; default: fprintf (stderr, "Usage: %s [-m ] [ -a ] " - "[]\n", + "[-c cclfields] []\n", prog); exit (1); }