X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ir-tcl.c;h=c6e789b67ca0a037bcff01e1508623b9d0c58475;hb=0b673e359cca2fdb88719de3d20d5488ead9fefb;hp=591914d76fa6118e981b1f8ccdb962e23af1060b;hpb=1dacbb936d32d0fc313535d511f7ccdefa0078dc;p=ir-tcl-moved-to-github.git diff --git a/ir-tcl.c b/ir-tcl.c index 591914d..c6e789b 100644 --- a/ir-tcl.c +++ b/ir-tcl.c @@ -1,11 +1,43 @@ /* * IR toolkit for tcl/tk - * (c) Index Data 1995-1998 + * (c) Index Data 1995-2001 * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: ir-tcl.c,v $ - * Revision 1.106 1998-05-20 12:25:35 adam + * Revision 1.117 2001-03-26 11:39:34 adam + * Fixed bug in ir_deleteDiags - crash when receiving multiple diags. + * + * Revision 1.116 2001/02/09 11:58:04 adam + * Updated for Tcl8.1 and higher where internal encoding is UTF-8. + * + * Revision 1.115 2000/09/13 12:18:49 adam + * Logging utility patch (YAZ version 1.7). + * + * Revision 1.114 1999/05/17 20:37:41 adam + * Fixed problem with ASN code. + * + * Revision 1.113 1999/04/20 10:01:46 adam + * Modified calls to ODR encoders/decoders (name argument). + * + * Revision 1.112 1999/03/22 06:51:34 adam + * Implemented sort. + * + * Revision 1.111 1999/02/11 11:30:09 adam + * Updated for WIN32. + * + * Revision 1.110 1998/10/20 15:15:31 adam + * Changed scan response handler. + * + * Revision 1.109 1998/10/13 21:23:26 adam + * Fixed searchStatus method. + * + * Revision 1.108 1998/10/12 11:48:08 adam + * Removed printf call. + * + * Revision 1.107 1998/06/10 13:00:46 adam + * Added ir-version command. + * + * Revision 1.106 1998/05/20 12:25:35 adam * Fixed bug that occurred in rare cases when encoding of incoming * records failed. * @@ -379,7 +411,7 @@ #include #include -#ifdef WINDOWS +#ifdef WIN32 #else #include @@ -476,6 +508,17 @@ static void delete_IR_record (IrTcl_RecordList *rl) xfree (rl->elements); } +static void purge_IR_records (IrTcl_SetObj *setobj) +{ + IrTcl_RecordList *rl; + while ((rl = setobj->record_list)) + { + setobj->record_list = rl->next; + delete_IR_record (rl); + xfree (rl); + } +} + static IrTcl_RecordList *new_IR_record (IrTcl_SetObj *setobj, int no, int which, const char *elements) @@ -657,13 +700,14 @@ int ir_tcl_named_bits (struct ir_named_entry *tab, Odr_bitmask *ob, ODR_MASK_ZERO (ob); for (no = 0; no < argc; no++) { + int ok = 0; for (ti = tab; ti->name; ti++) - if (!strcmp (argv[no], ti->name)) + if (!strcmp(argv[no], "@all") || !strcmp (argv[no], ti->name)) { ODR_MASK_SET (ob, ti->pos); - break; + ok = 1; } - if (!ti->name) + if (!ok) { Tcl_AppendResult (interp, "bad bit mask ", argv[no], NULL); return ir_tcl_error_exec (interp, argc, argv); @@ -1331,11 +1375,11 @@ static int do_logLevel (void *o, Tcl_Interp *interp, if (argc <= 2) return TCL_OK; if (argc == 3) - log_init (log_mask_str (argv[2]), "", NULL); + yaz_log_init (yaz_log_mask_str (argv[2]), "", NULL); else if (argc == 4) - log_init (log_mask_str (argv[2]), argv[3], NULL); + yaz_log_init (yaz_log_mask_str (argv[2]), argv[3], NULL); else if (argc == 5) - log_init (log_mask_str (argv[2]), argv[3], argv[4]); + yaz_log_init (yaz_log_mask_str (argv[2]), argv[3], argv[4]); return TCL_OK; } @@ -1994,7 +2038,11 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv) Odr_oct ccl_query; IrTcl_SetObj *obj = o; IrTcl_Obj *p; - int r; + int r, code; +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + Tcl_DString ds; +#endif + char *query_str; if (argc <= 0) return TCL_OK; @@ -2007,16 +2055,23 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv) NULL); return TCL_ERROR; } - logf (LOG_DEBUG, "search %s %s", *argv, argv[2]); +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + query_str = Tcl_UtfToExternalDString(0, argv[2], -1, &ds); +#else + query_str = argv[2]; +#endif + logf (LOG_DEBUG, "search %s %s", *argv, query_str); if (!obj->set_inher.num_databaseNames) { Tcl_AppendResult (interp, "no databaseNames", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } if (!p->cs_link) { Tcl_AppendResult (interp, "not connected", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest); req = apdu->u.searchRequest; @@ -2081,11 +2136,12 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv) { Z_RPNQuery *RPNquery; - RPNquery = p_query_rpn (p->odr_out, p->protocol_type, argv[2]); + RPNquery = p_query_rpn (p->odr_out, p->protocol_type, query_str); if (!RPNquery) { Tcl_AppendResult (interp, "query syntax error", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } query.which = Z_Query_type_1; query.u.type_1 = RPNquery; @@ -2103,18 +2159,19 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv) bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; - rpn = ccl_find_str(p->bibset, argv[2], &error, &pos); + rpn = ccl_find_str(p->bibset, query_str, &error, &pos); if (error) { Tcl_AppendResult (interp, "ccl syntax error ", ccl_err_msg(error), NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } #if 0 ccl_pr_tree (rpn, stderr); fprintf (stderr, "\n"); #endif - assert((RPNquery = ccl_rpn_query(rpn))); + RPNquery = ccl_rpn_query(p->odr_out, rpn); RPNquery->attributeSetId = oid_getoidbyent (&bib1); query.which = Z_Query_type_1; query.u.type_1 = RPNquery; @@ -2124,16 +2181,22 @@ static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv) { query.which = Z_Query_type_2; query.u.type_2 = &ccl_query; - ccl_query.buf = (unsigned char *) argv[2]; - ccl_query.len = strlen (argv[2]); + ccl_query.buf = (unsigned char *) query_str; + ccl_query.len = strlen (query_str); } else { Tcl_AppendResult (interp, "invalid query method ", obj->set_inher.queryType, NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } - return ir_tcl_send_APDU (interp, p, apdu, "search", *argv); + code = ir_tcl_send_APDU (interp, p, apdu, "search", *argv); + out: +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + Tcl_DStringFree (&ds); +#endif + return code; } /* @@ -2197,6 +2260,36 @@ static int do_presentResponse (void *o, Tcl_Interp *interp, } /* + * do_sortResponse: add sort response handler + */ +static int do_sortResponse (void *o, Tcl_Interp *interp, + int argc, char **argv) +{ + IrTcl_SetObj *obj = o; + + if (argc == 0) + { + obj->sortResponse = NULL; + return TCL_OK; + } + else if (argc == -1) + return ir_tcl_strdel (interp, &obj->sortResponse); + if (argc == 3) + { + xfree (obj->sortResponse); + if (argv[2][0]) + { + if (ir_tcl_strdup (interp, &obj->sortResponse, argv[2]) + == TCL_ERROR) + return TCL_ERROR; + } + else + obj->sortResponse = NULL; + } + return TCL_OK; +} + +/* * do_resultCount: Get number of hits */ static int do_resultCount (void *o, Tcl_Interp *interp, @@ -2239,6 +2332,35 @@ static int do_presentStatus (void *o, Tcl_Interp *interp, } /* + * do_sortStatus: Get sort status (after sort response) + */ +static int do_sortStatus (void *o, Tcl_Interp *interp, + int argc, char **argv) +{ + IrTcl_SetObj *obj = o; + char *res; + + if (argc <= 0) + { + obj->sortStatus = Z_SortStatus_failure; + return TCL_OK; + } + switch (obj->sortStatus) + { + case Z_SortStatus_success: + res = "success"; break; + case Z_SortStatus_partial_1: + res = "partial"; break; + case Z_SortStatus_failure: + res = "failure"; break; + default: + res = "unknown"; break; + } + Tcl_AppendElement (interp, res); + return TCL_OK; +} + +/* * do_nextResultSetPosition: Get next result set position * (after search/present response) */ @@ -2620,7 +2742,7 @@ static int do_getExplain (void *o, Tcl_Interp *interp, int argc, char **argv) return TCL_OK; assert (rl->u.dbrec.buf); odr_setbuf (p->odr_in, rl->u.dbrec.buf, rl->u.dbrec.size, 0); - if (!(*etype->fun)(p->odr_in, (char **) &rr, 0)) + if (!(*etype->fun)(p->odr_in, (char **) &rr, 0, 0)) return TCL_OK; if (etype->what != Z_External_explainRecord) @@ -2907,6 +3029,171 @@ static int do_saveFile (void *o, Tcl_Interp *interp, } +/* ------------------------------------------------------- */ +/* + * do_sort: Do sort request + */ +static int do_sort (void *o, Tcl_Interp *interp, int argc, char **argv) +{ + Z_SortRequest *req; + Z_APDU *apdu; + IrTcl_SetObj *obj = o; + IrTcl_Obj *p; + char sort_string[64], sort_flags[64]; + char *arg; + int off; + Z_SortKeySpecList *sksl; + int oid[OID_SIZE]; + oident bib1; + + if (argc <= 0) + return TCL_OK; + + p = obj->parent; + assert (argc > 1); + if (argc != 3) + { + Tcl_AppendResult (interp, wrongArgs, *argv, " ", argv[1], "query\"", + NULL); + return TCL_ERROR; + } + logf (LOG_DEBUG, "sort %s %s", *argv, argv[2]); + if (!p->cs_link) + { + Tcl_AppendResult (interp, "not connected", NULL); + return ir_tcl_error_exec (interp, argc, argv); + } + apdu = zget_APDU (p->odr_out, Z_APDU_sortRequest); + sksl = (Z_SortKeySpecList *) odr_malloc (p->odr_out, sizeof(*sksl)); + req = apdu->u.sortRequest; + + set_referenceId (p->odr_out, &req->referenceId, + obj->set_inher.referenceId); + +#ifdef ASN_COMPILED + req->num_inputResultSetNames = 1; + req->inputResultSetNames = (Z_InternationalString **) + odr_malloc (p->odr_out, sizeof(*req->inputResultSetNames)); + req->inputResultSetNames[0] = obj->setName; +#else + req->inputResultSetNames = + (Z_StringList *)odr_malloc (p->odr_out, + sizeof(*req->inputResultSetNames)); + req->inputResultSetNames->num_strings = 1; + req->inputResultSetNames->strings = + (char **)odr_malloc (p->odr_out, + sizeof(*req->inputResultSetNames->strings)); + req->inputResultSetNames->strings[0] = obj->setName; +#endif + + req->sortedResultSetName = (char *) obj->setName; + + + req->sortSequence = sksl; + sksl->num_specs = 0; + sksl->specs = (Z_SortKeySpec **) + odr_malloc (p->odr_out, sizeof(sksl->specs) * 20); + + bib1.proto = PROTO_Z3950; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + arg = argv[2]; + while ((sscanf (arg, "%63s %63s%n", sort_string, sort_flags, &off)) == 2 + && off > 1) + { + int i; + char *sort_string_sep; + Z_SortKeySpec *sks = (Z_SortKeySpec *) + odr_malloc (p->odr_out, sizeof(*sks)); + Z_SortKey *sk = (Z_SortKey *) + odr_malloc (p->odr_out, sizeof(*sk)); + + arg += off; + sksl->specs[sksl->num_specs++] = sks; + sks->sortElement = (Z_SortElement *) + odr_malloc (p->odr_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 (p->odr_out, sizeof(*el)); + sk->which = Z_SortKey_sortAttributes; + sk->u.sortAttributes = + (Z_SortAttributes *) + odr_malloc (p->odr_out, sizeof(*sk->u.sortAttributes)); + sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); + sk->u.sortAttributes->list = + (Z_AttributeList *) + odr_malloc (p->odr_out, sizeof(*sk->u.sortAttributes->list)); + sk->u.sortAttributes->list->num_attributes = 1; + sk->u.sortAttributes->list->attributes = + (Z_AttributeElement **)odr_malloc (p->odr_out, + sizeof(*sk->u.sortAttributes->list->attributes)); + sk->u.sortAttributes->list->attributes[0] = el; + el->attributeSet = 0; + el->attributeType = (int *) + odr_malloc (p->odr_out, sizeof(*el->attributeType)); + *el->attributeType = atoi (sort_string); + el->which = Z_AttributeValue_numeric; + el->value.numeric = (int *) + odr_malloc (p->odr_out, sizeof(*el->value.numeric)); + *el->value.numeric = atoi (sort_string_sep + 1); + } + else + { + sk->which = Z_SortKey_sortField; + sk->u.sortField = (char *)odr_malloc (p->odr_out, strlen(sort_string)+1); + strcpy (sk->u.sortField, sort_string); + } + sks->sortRelation = (int *) + odr_malloc (p->odr_out, sizeof(*sks->sortRelation)); + *sks->sortRelation = Z_SortRelation_ascending; + sks->caseSensitivity = (int *) + odr_malloc (p->odr_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) + { + printf ("Missing sort specifications\n"); + return -1; + } + return ir_tcl_send_APDU (interp, p, apdu, "sort", *argv); +} + static IrTcl_Method ir_set_method_tab[] = { { "search", do_search, NULL}, { "searchResponse", do_searchResponse, NULL}, @@ -2929,6 +3216,9 @@ static IrTcl_Method ir_set_method_tab[] = { { "responseStatus", do_responseStatus, NULL}, { "loadFile", do_loadFile, NULL}, { "saveFile", do_saveFile, NULL}, + { "sort", do_sort, NULL }, + { "sortResponse", do_sortResponse, NULL}, + { "sortStatus", do_sortStatus, NULL}, { NULL, NULL} }; @@ -3114,10 +3404,16 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv) Z_APDU *apdu; IrTcl_ScanObj *obj = o; IrTcl_Obj *p = obj->parent; + char *start_term; + int code; #if CCL2RPN oident bib1; struct ccl_rpn_node *rpn; int pos; + int r; +#endif +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + Tcl_DString ds; #endif if (argc <= 0) @@ -3128,16 +3424,23 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv) " scanQuery\"", NULL); return TCL_ERROR; } - logf (LOG_DEBUG, "scan %s %s", *argv, argv[2]); +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + start_term = Tcl_UtfToExternalDString(0, argv[2], -1, &ds); +#else + start_term = argv[2]; +#endif + logf (LOG_DEBUG, "scan %s %s", *argv, start_term); if (!p->set_inher.num_databaseNames) { Tcl_AppendResult (interp, "no databaseNames", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } if (!p->cs_link) { Tcl_AppendResult (interp, "not connected", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest); @@ -3150,25 +3453,30 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv) #if !CCL2RPN if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, p->protocol_type, - &req->attributeSet, argv[2]))) + &req->attributeSet, start_term))) { Tcl_AppendResult (interp, "query syntax error", NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } #else - rpn = ccl_find_str(p->bibset, argv[2], &r, &pos); + rpn = ccl_find_str(p->bibset, start_term, &r, &pos); if (r) { Tcl_AppendResult (interp, "ccl syntax error ", ccl_err_msg(r), NULL); - return ir_tcl_error_exec (interp, argc, argv); + code = ir_tcl_error_exec (interp, argc, argv); + goto out; } bib1.proto = p->protocol_type; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; req->attributeSet = oid_getoidbyent (&bib1); - if (!(req->termListAndStartPoint = ccl_scan_query (rpn))) - return TCL_ERROR; + if (!(req->termListAndStartPoint = ccl_scan_query (p->odr_out, rpn))) + { + code = TCL_ERROR; + goto out; + } #endif req->stepSize = &obj->stepSize; req->numberOfTermsRequested = &obj->numberOfTermsRequested; @@ -3179,7 +3487,12 @@ static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv) logf (LOG_DEBUG, "preferredPositionInResponse=%d", *req->preferredPositionInResponse); - return ir_tcl_send_APDU (interp, p, apdu, "scan", *argv); + code = ir_tcl_send_APDU (interp, p, apdu, "scan", *argv); + out: +#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) + Tcl_DStringFree (&ds); +#endif + return code; } /* @@ -3334,7 +3647,6 @@ static int do_scanLine (void *obj, Tcl_Interp *interp, int argc, char **argv) " position\"", NULL); return TCL_ERROR; } - printf ("argv[2]=%s\n", argv[2]); if (Tcl_GetInt (interp, argv[2], &i) == TCL_ERROR) return TCL_ERROR; if (!p->entries_flag || !p->entries || i >= p->num_entries || i < 0) @@ -3462,11 +3774,11 @@ static int ir_log_init_proc (ClientData clientData, Tcl_Interp *interp, return TCL_OK; } if (argc == 2) - log_init (log_mask_str (argv[1]), "", NULL); + yaz_log_init (yaz_log_mask_str (argv[1]), "", NULL); else if (argc == 3) - log_init (log_mask_str (argv[1]), argv[2], NULL); + yaz_log_init (yaz_log_mask_str (argv[1]), argv[2], NULL); else - log_init (log_mask_str (argv[1]), argv[2], argv[3]); + yaz_log_init (yaz_log_mask_str (argv[1]), argv[2], argv[3]); return TCL_OK; } @@ -3483,12 +3795,24 @@ static int ir_log_proc (ClientData clientData, Tcl_Interp *interp, " level string\"", NULL); return TCL_OK; } - mask = log_mask_str_x (argv[1], 0); + mask = yaz_log_mask_str_x (argv[1], 0); logf (LOG_DEBUG, "%s", argv[2]); return TCL_OK; } +/* + * ir_version: log ir version + */ +static int ir_version (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + Tcl_AppendElement (interp, IR_TCL_VERSION); + Tcl_AppendElement (interp, YAZ_VERSION); + return TCL_OK; +} + + /* ------------------------------------------------------- */ static void ir_initResponse (void *obj, Z_InitResponse *initrs) { @@ -3542,7 +3866,7 @@ static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num) { int i; for (i = 0; i<*dst_num; i++) - xfree (dst_list[i]->addinfo); + xfree ((*dst_list)[i].addinfo); xfree (*dst_list); *dst_list = NULL; *dst_num = 0; @@ -3613,7 +3937,7 @@ static void ir_handleDBRecord (IrTcl_Obj *p, IrTcl_RecordList *rl, odr_setbuf (p->odr_in, (char*) oe->u.octet_aligned->buf, oe->u.octet_aligned->len, 0); - if (!(*etype->fun)(p->odr_in, (char **) &rr, 0)) + if (!(*etype->fun)(p->odr_in, (char **) &rr, 0, 0)) { rl->u.dbrec.type = VAL_NONE; return; @@ -3753,11 +4077,13 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs, logf (LOG_DEBUG, "Search response, no object!"); return; } - setobj->searchStatus = searchrs->searchStatus ? 1 : 0; + setobj->searchStatus = *searchrs->searchStatus; get_referenceId (&setobj->set_inher.referenceId, searchrs->referenceId); setobj->resultCount = *searchrs->resultCount; if (searchrs->presentStatus) setobj->presentStatus = *searchrs->presentStatus; + else + setobj->presentStatus = Z_RES_NONE; if (searchrs->nextResultSetPosition) setobj->nextResultSetPosition = *searchrs->nextResultSetPosition; @@ -3846,7 +4172,6 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs, Z_Entry **ze; scanobj->entries_flag = 1; -#ifdef ASN_COMPILED if (scanrs->entries) { scanobj->num_entries = scanrs->entries->num_entries; @@ -3854,15 +4179,6 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs, sizeof(*scanobj->entries)); ze = scanrs->entries->entries; } -#else - if (scanrs->entries->which == Z_ListEntries_entries) - { - scanobj->num_entries = scanrs->entries->u.entries->num_entries; - scanobj->entries = ir_tcl_malloc (scanobj->num_entries * - sizeof(*scanobj->entries)); - ze = scanrs->entries->u.entries->entries; - } -#endif for (i=0; inum_entries; i++, ze++) { scanobj->entries[i].which = (*ze)->which; @@ -3894,22 +4210,46 @@ static void ir_scanResponse (void *o, Z_ScanResponse *scanrs, break; } } -#ifdef ASN_COMPILED if (scanrs->entries->nonsurrogateDiagnostics) ir_handleDiags (&scanobj->nonSurrogateDiagnosticList, &scanobj->nonSurrogateDiagnosticNum, scanrs->entries->nonsurrogateDiagnostics, scanrs->entries->num_nonsurrogateDiagnostics); + } +} + + +static void ir_sortResponse (void *o, Z_SortResponse *sortrs, + IrTcl_SetObj *setobj) +{ + IrTcl_Obj *p = o; + + logf (LOG_DEBUG, "Received sortResponse"); + + if (!setobj) + return; + + purge_IR_records (setobj); + + get_referenceId (&p->set_inher.referenceId, sortrs->referenceId); + + setobj->sortStatus = *sortrs->sortStatus; + + ir_deleteDiags (&setobj->nonSurrogateDiagnosticList, + &setobj->nonSurrogateDiagnosticNum); +#ifdef ASN_COMPILED + if (sortrs->diagnostics) + ir_handleDiags (&setobj->nonSurrogateDiagnosticList, + &setobj->nonSurrogateDiagnosticNum, + sortrs->diagnostics, + sortrs->num_diagnostics); #else - if (scanrs->entries->which == Z_ListEntries_nonSurrogateDiagnostics) - ir_handleDiags (&scanobj->nonSurrogateDiagnosticList, - &scanobj->nonSurrogateDiagnosticNum, - scanrs->entries->u.nonSurrogateDiagnostics-> - diagRecs, - scanrs->entries->u.nonSurrogateDiagnostics-> - num_diagRecs); + if (sortrs->diagnostics) + ir_handleDiags (&setobj->nonSurrogateDiagnosticList, + &setobj->nonSurrogateDiagnosticNum, + sortrs->diagnostics->diagRecs, + sortrs->diagnostics->num_diagRecs); #endif - } } /* @@ -3989,7 +4329,7 @@ static void ir_select_read (ClientData clientData) p->apduOffset = -1; odr_setbuf (p->odr_in, p->buf_in, r, 0); logf (LOG_DEBUG, "cs_get ok, total size %d", r); - if (!z_APDU (p->odr_in, &apdu, 0)) + if (!z_APDU (p->odr_in, &apdu, 0, 0)) { logf (LOG_DEBUG, "cs_get failed: %s", odr_errmsg (odr_geterror (p->odr_in))); @@ -4044,6 +4384,13 @@ static void ir_select_read (ClientData clientData) apdu_call = ((IrTcl_ScanObj *) cmd_info.clientData)->scanResponse; break; + case Z_APDU_sortResponse: + p->eventType = "sort"; + ir_sortResponse (p, apdu->u.sortResponse, + (IrTcl_SetObj *) cmd_info.clientData); + apdu_call = ((IrTcl_SetObj *) + cmd_info.clientData)->sortResponse; + break; default: logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which); @@ -4203,6 +4550,8 @@ EXPORT (int,Irtcl_Init) (Tcl_Interp *interp) (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); Tcl_CreateCommand (interp, "ir-log", ir_log_proc, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); + Tcl_CreateCommand (interp, "ir-version", ir_version, (ClientData) NULL, + (Tcl_CmdDeleteProc *) NULL); nmem_init (); return TCL_OK; }