* See the file LICENSE for details.
*
* $Log: ir-tcl.c,v $
- * Revision 1.126 2003-11-29 17:24:09 adam
+ * Revision 1.128 2005-03-10 13:54:56 adam
+ * Remove CCL support for scan
+ *
+ * Revision 1.127 2004/05/10 08:38:45 adam
+ * Do not use obsolete YAZ defines
+ *
+ * Revision 1.126 2003/11/29 17:24:09 adam
* Added getXml method (Franck Falcoz)
*
* Revision 1.125 2003/04/29 10:51:23 adam
}
apdu = zget_APDU (p->odr_out, Z_APDU_triggerResourceControlRequest);
req = apdu->u.triggerResourceControlRequest;
- *req->requestedAction = Z_TriggerResourceCtrl_cancel;
+ *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
req->resultSetWanted = &is_false;
return ir_tcl_send_APDU (interp, p, apdu, "triggerResourceControl",
if (argc <= 0)
{
- obj->sortStatus = Z_SortStatus_failure;
+ obj->sortStatus = Z_SortResponse_failure;
return TCL_OK;
}
switch (obj->sortStatus)
{
- case Z_SortStatus_success:
+ case Z_SortResponse_success:
res = "success"; break;
- case Z_SortStatus_partial_1:
+ case Z_SortResponse_partial_1:
res = "partial"; break;
- case Z_SortStatus_failure:
+ case Z_SortResponse_failure:
res = "failure"; break;
default:
res = "unknown"; break;
}
sks->sortRelation = (int *)
odr_malloc (p->odr_out, sizeof(*sks->sortRelation));
- *sks->sortRelation = Z_SortRelation_ascending;
+ *sks->sortRelation = Z_SortKeySpec_ascending;
sks->caseSensitivity = (int *)
odr_malloc (p->odr_out, sizeof(*sks->caseSensitivity));
- *sks->caseSensitivity = Z_SortCase_caseSensitive;
+ *sks->caseSensitivity = Z_SortKeySpec_caseSensitive;
#ifdef ASN_COMPILED
sks->which = Z_SortKeySpec_null;
case 'a':
case 'A':
case '>':
- *sks->sortRelation = Z_SortRelation_descending;
+ *sks->sortRelation = Z_SortKeySpec_descending;
break;
case 'd':
case 'D':
case '<':
- *sks->sortRelation = Z_SortRelation_ascending;
+ *sks->sortRelation = Z_SortKeySpec_ascending;
break;
case 'i':
case 'I':
- *sks->caseSensitivity = Z_SortCase_caseInsensitive;
+ *sks->caseSensitivity = Z_SortKeySpec_caseInsensitive;
break;
case 'S':
case 's':
- *sks->caseSensitivity = Z_SortCase_caseSensitive;
+ *sks->caseSensitivity = Z_SortKeySpec_caseSensitive;
break;
}
}
req->num_databaseNames = p->set_inher.num_databaseNames;
req->databaseNames = p->set_inher.databaseNames;
-#if 1
-/* !CCL2RPN */
if (!(req->termListAndStartPoint =
p_query_scan (p->odr_out, p->protocol_type,
&req->attributeSet, start_term)))
code = ir_tcl_error_exec (interp, argc, argv);
goto out;
}
-#else
- rpn = ccl_find_str(p->bibset, start_term, &r, &pos);
- if (r)
- {
- Tcl_AppendResult (interp, "ccl syntax error ", ccl_err_msg(r), NULL);
- 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 (p->odr_out, rpn)))
- {
- code = TCL_ERROR;
- goto out;
- }
-#endif
req->stepSize = &obj->stepSize;
req->numberOfTermsRequested = &obj->numberOfTermsRequested;
req->preferredPositionInResponse = &obj->preferredPositionInResponse;
if (searchrs->presentStatus)
setobj->presentStatus = *searchrs->presentStatus;
else
- setobj->presentStatus = Z_RES_NONE;
+ setobj->presentStatus = Z_SearchResponse_none;
if (searchrs->nextResultSetPosition)
setobj->nextResultSetPosition = *searchrs->nextResultSetPosition;