static file_history_t file_history = 0;
+static char webservice_type[10];
static char sru_method[10] = "soap";
static char sru_version[10] = "1.2";
static char *codeset = 0; /* character set for output */
/* INIT SERVICE ------------------------------- */
-static void send_initRequest(const char* type_and_host)
+static void send_Z3950_initRequest(const char* type_and_host)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
Z_InitRequest *req = apdu->u.initRequest;
}
-/* These two are used only from process_initResponse() */
static void render_initUserInfo(Z_OtherInformation *ui1);
static void render_diag(Z_DiagnosticFormat *diag);
printf(" %s", opt);
}
-static int process_initResponse(Z_InitResponse *res)
+static int process_Z3950_initResponse(Z_InitResponse *res)
{
int ver = 0;
/* save session parameters for later use */
cs_print_session_info(conn);
if (protocol == PROTO_Z3950)
{
- send_initRequest(type_and_host);
+ send_Z3950_initRequest(type_and_host);
return 2;
}
return 0;
}
}
-static int send_deleteResultSetRequest(const char *arg)
+static int send_Z3950_deleteResultSetRequest(const char *arg)
{
char names[8][32];
int i;
/* regular requestse .. */
sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
- switch(queryType)
+ switch (queryType)
{
case QueryType_CQL:
sr->u.scan_request->query_type = Z_SRW_query_type_cql;
return send_srw(sr);
}
+static void encode_SOLR_search(Z_HTTP_Request *hreq, ODR encode,
+ const char *query)
+{
+ char *path;
+ const char *name[10], *value[10];
+ char *uri_args;
+
+ name[0] = "q";
+ value[0] = query;
+ name[1] = 0;
+
+ yaz_array_to_uri(&uri_args, encode, (char **) name, (char **) value);
+
+ path = (char *)
+ odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4);
+
+ hreq->method = "GET";
+
+ if (strchr(hreq->path, '?'))
+ sprintf(path, "%s&%s", hreq->path, uri_args);
+ else
+ sprintf(path, "%s?%s", hreq->path, uri_args);
+ hreq->path = path;
+}
+
+static int send_SOLR_searchRequest(const char *arg)
+{
+ Z_GDU *gdu;
+ char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]);
+
+ gdu = z_get_HTTP_Request_host_path(out, cur_host, path);
+
+ encode_SOLR_search(gdu->u.HTTP_Request, out, arg);
+
+ return send_gdu(gdu);
+}
+
static int send_SRW_searchRequest(const char *arg)
{
Z_SRW_PDU *sr = 0;
/* regular request .. */
sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
- switch(queryType)
+ switch (queryType)
{
case QueryType_CQL:
srw_sr->u.request->query_type = Z_SRW_query_type_cql;
}
}
-static int send_searchRequest(const char *arg)
+static int send_Z3950_searchRequest(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
Z_SearchRequest *req = apdu->u.searchRequest;
}
}
-static int process_searchResponse(Z_SearchResponse *res)
+static int process_Z3950_searchResponse(Z_SearchResponse *res)
{
printf("Received SearchResponse.\n");
print_refid(res->referenceId);
if (res->resultSetStatus)
{
printf("Result Set Status: ");
- switch(*res->resultSetStatus)
+ switch (*res->resultSetStatus)
{
case Z_SearchResponse_subset:
printf("subset"); break;
}
}
-static int process_resourceControlRequest(Z_ResourceControlRequest *req)
+static int process_Z3950_resourceControlRequest(Z_ResourceControlRequest *req)
{
printf("Received ResourceControlRequest.\n");
print_referenceId(1, req->referenceId);
return 0;
}
-static void process_ESResponse(Z_ExtendedServicesResponse *res)
+static void process_Z3950_ESResponse(Z_ExtendedServicesResponse *res)
{
printf("Status: ");
switch (*res->operationStatus)
return r;
}
-static int send_itemorder(const char *type, int itemno,
- const char *xml_buf, int xml_len)
+static int send_Z3950_itemorder(const char *type, int itemno,
+ const char *xml_buf, int xml_len)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
return cmd_update_common(arg, 0);
}
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
char *rec_buf, int rec_len);
#if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
+static int send_SRW_update(int action_no, const char *recid,
char *rec_buf, int rec_len);
#endif
#if YAZ_HAVE_XML2
if (protocol == PROTO_HTTP)
- return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
+ return send_SRW_update(action_no, recid_buf, rec_buf, rec_len);
#endif
- return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len);
+ return send_Z3950_update(version, action_no, recid_buf, rec_buf, rec_len);
}
#if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
- char *rec_buf, int rec_len)
+static int send_SRW_update(int action_no, const char *recid,
+ char *rec_buf, int rec_len)
{
if (!conn)
session_connect(cur_host);
Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request);
Z_SRW_updateRequest *sr = srw->u.update_request;
- switch(action_no)
+ switch (action_no)
{
case Z_IUOriginPartToKeep_recordInsert:
sr->operation = "info:srw/action/1/create";
}
#endif
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
char *rec_buf, int rec_len)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
parse_cmd_doc(&arg, out, &xml_buf, &xml_len);
fflush(stdout);
- send_itemorder(type, itemno, xml_buf, xml_len);
+ send_Z3950_itemorder(type, itemno, xml_buf, xml_len);
return 2;
}
}
if (only_z3950())
return 1;
- send_initRequest(cur_host);
+ send_Z3950_initRequest(cur_host);
return 2;
}
else
{
int r;
+ strcpy(webservice_type, "sru");
r = sscanf(arg, "%9s %9s", sru_method, sru_version);
if (r >= 1)
{
return 0;
}
+static int cmd_webservice(const char *arg)
+{
+ if (!*arg)
+ {
+ printf("Webservice: %s\n", webservice_type);
+ }
+ else
+ {
+ if (!strcmp(arg, "sru"))
+ ;
+ else if (!strcmp(arg, "solr"))
+ ;
+ else
+ {
+ printf("Unknown webservice type\n");
+ return 0;
+ }
+ strcpy(webservice_type, arg);
+ }
+ return 0;
+}
+
+
static int cmd_find(const char *arg)
{
if (!*arg)
session_connect(cur_host);
if (!conn)
return 0;
- if (!send_SRW_searchRequest(arg))
- return 0;
+ if (!strcmp(webservice_type, "solr"))
+ {
+ if (!send_SOLR_searchRequest(arg))
+ return 0;
+ }
+ else
+ {
+ if (!send_SRW_searchRequest(arg))
+ return 0;
+ }
#else
return 0;
#endif
{
if (conn)
{
- if (!send_searchRequest(arg))
+ if (!send_Z3950_searchRequest(arg))
return 0;
wait_and_handle_response(0);
if (conn)
}
else if (conn)
{
- if (!send_searchRequest(arg))
+ if (!send_Z3950_searchRequest(arg))
return 0;
}
else
{
if (only_z3950())
return 0;
- if (!send_deleteResultSetRequest(arg))
+ if (!send_Z3950_deleteResultSetRequest(arg))
return 0;
return 2;
}
return 1;
}
-static int send_presentRequest(const char *arg)
+static int send_Z3950_presentRequest(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
Z_PresentRequest *req = apdu->u.presentRequest;
last_hit_count = 0;
}
-static void process_close(Z_Close *req)
+static void process_Z3950_close(Z_Close *req)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
Z_Close *res = apdu->u.close;
printf("Not connected yet\n");
return 0;
}
- if (!send_presentRequest(arg))
+ if (!send_Z3950_presentRequest(arg))
return 0;
}
return 2;
static int cmd_cancel(const char *arg)
{
- Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
- Z_TriggerResourceControlRequest *req =
- apdu->u.triggerResourceControlRequest;
- bool_t rfalse = 0;
- char command[16];
-
- *command = '\0';
- sscanf(arg, "%15s", command);
-
if (only_z3950())
return 0;
- if (session_initResponse &&
- !ODR_MASK_GET(session_initResponse->options,
- Z_Options_triggerResourceCtrl))
+ else
{
- printf("Target doesn't support cancel (trigger resource ctrl)\n");
- return 0;
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
+ Z_TriggerResourceControlRequest *req =
+ apdu->u.triggerResourceControlRequest;
+ bool_t rfalse = 0;
+ char command[16];
+
+ *command = '\0';
+ sscanf(arg, "%15s", command);
+
+ if (only_z3950())
+ return 0;
+ if (session_initResponse &&
+ !ODR_MASK_GET(session_initResponse->options,
+ Z_Options_triggerResourceCtrl))
+ {
+ printf("Target doesn't support cancel (trigger resource ctrl)\n");
+ return 0;
+ }
+ *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
+ req->resultSetWanted = &rfalse;
+ req->referenceId = set_refid(out);
+
+ send_apdu(apdu);
+ printf("Sent cancel request\n");
+ if (!strcmp(command, "wait"))
+ return 2;
+ return 1;
}
- *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
- req->resultSetWanted = &rfalse;
- req->referenceId = set_refid(out);
-
- send_apdu(apdu);
- printf("Sent cancel request\n");
- if (!strcmp(command, "wait"))
- return 2;
- return 1;
}
static int cmd_cancel_find(const char *arg)
{
- int fres = cmd_find(arg);
+ int fres;
+ if (only_z3950())
+ return 0;
+ fres = cmd_find(arg);
if (fres > 0)
{
return cmd_cancel("");
return fres;
}
-static int send_scanrequest(const char *set, const char *query,
- Odr_int pp, Odr_int num, const char *term)
+static int send_Z3950_scanrequest(const char *set, const char *query,
+ Odr_int pp, Odr_int num, const char *term)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
Z_ScanRequest *req = apdu->u.scanRequest;
printf("\n");
}
-static void process_scanResponse(Z_ScanResponse *res)
+static void process_Z3950_scanResponse(Z_ScanResponse *res)
{
int i;
Z_Entry **entries = NULL;
res->entries->num_nonsurrogateDiagnostics);
}
-static void process_sortResponse(Z_SortResponse *res)
+static void process_Z3950_sortResponse(Z_SortResponse *res)
{
printf("Received SortResponse: status=");
switch (*res->sortStatus)
res->num_diagnostics);
}
-static void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
+static void process_Z3950_deleteResultSetResponse(
+ Z_DeleteResultSetResponse *res)
{
printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
*res->deleteOperationStatus);
if (*arg)
{
strcpy(last_scan_query, arg);
- if (send_scanrequest(set, arg,
- scan_position, scan_size, 0) < 0)
+ if (send_Z3950_scanrequest(set, arg,
+ scan_position, scan_size, 0) < 0)
return 0;
}
else
{
- if (send_scanrequest(set, last_scan_query,
- 1, scan_size, last_scan_line) < 0)
+ if (send_Z3950_scanrequest(set, last_scan_query,
+ 1, scan_size, last_scan_line) < 0)
return 0;
}
return 2;
fprintf(stderr, "failed to allocate ODR streams\n");
exit(1);
}
+
+ strcpy(webservice_type, "sru");
setvbuf(stdout, 0, _IONBF, 0);
if (apdu_file)
handle_srw_scan_term(res->terms + i);
}
+static int decode_SOLR_response(const char *content_buf, int content_len)
+{
+ xmlDocPtr doc = xmlParseMemory(content_buf, content_len);
+ int ret = 0;
+ xmlNodePtr ptr = 0;
+ Odr_int hits = 0;
+ Odr_int start = 0;
+
+ if (!doc)
+ {
+ ret = -1;
+ }
+ if (doc)
+ {
+ xmlNodePtr root = xmlDocGetRootElement(doc);
+ if (!root)
+ {
+ ret = -1;
+ }
+ else if (strcmp((const char *) root->name, "response"))
+ {
+ ret = -1;
+ }
+ else
+ {
+ /** look for result node */
+ for (ptr = root->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "result"))
+ break;
+ }
+ if (!ptr)
+ {
+ ret = -1;
+ }
+ }
+ }
+ if (ptr)
+ { /* got result node */
+ struct _xmlAttr *attr;
+ for (attr = ptr->properties; attr; attr = attr->next)
+ if (attr->children && attr->children->type == XML_TEXT_NODE)
+ {
+ if (!strcmp((const char *) attr->name, "numFound"))
+ {
+ hits = odr_atoi((const char *) attr->children->content);
+ }
+ else if (!strcmp((const char *) attr->name, "start"))
+ {
+ start = odr_atoi((const char *) attr->children->content);
+ }
+ }
+ printf("Number of hits: " ODR_INT_PRINTF "\n", hits);
+ }
+ if (ptr)
+ {
+ xmlNodePtr node;
+ int offset = 0;
+
+ for (node = ptr->children; node; node = node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE)
+ {
+ xmlBufferPtr buf = xmlBufferCreate();
+ xmlNode *tmp = xmlCopyNode(node, 1);
+
+ printf(ODR_INT_PRINTF "\n", start + offset);
+
+ xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
+
+ xmlFreeNode(tmp);
+
+ fwrite(buf->content, 1, buf->use, stdout);
+ xmlBufferFree(buf);
+ offset++;
+ printf("\n");
+ }
+ }
+ }
+ if (doc)
+ xmlFreeDoc(doc);
+ return ret;
+}
+
static void http_response(Z_HTTP_Response *hres)
{
int ret = -1;
if (!yaz_srw_check_content_type(hres))
printf("Content type does not appear to be XML\n");
- else
+ else if (!strcmp(webservice_type, "solr"))
+ {
+ decode_SOLR_response(hres->content_buf, hres->content_len);
+ }
+ else if (!strcmp(webservice_type, "sru"))
{
Z_SOAP *soap_package = 0;
ODR o = odr_createmem(ODR_DECODE);
if (gdu->which == Z_GDU_Z3950)
{
Z_APDU *apdu = gdu->u.z3950;
- switch(apdu->which)
+ switch (apdu->which)
{
case Z_APDU_initResponse:
- process_initResponse(apdu->u.initResponse);
+ process_Z3950_initResponse(apdu->u.initResponse);
break;
case Z_APDU_searchResponse:
- process_searchResponse(apdu->u.searchResponse);
+ process_Z3950_searchResponse(apdu->u.searchResponse);
break;
case Z_APDU_scanResponse:
- process_scanResponse(apdu->u.scanResponse);
+ process_Z3950_scanResponse(apdu->u.scanResponse);
break;
case Z_APDU_presentResponse:
print_refid(apdu->u.presentResponse->referenceId);
*apdu->u.presentResponse->nextResultSetPosition);
break;
case Z_APDU_sortResponse:
- process_sortResponse(apdu->u.sortResponse);
+ process_Z3950_sortResponse(apdu->u.sortResponse);
break;
case Z_APDU_extendedServicesResponse:
printf("Got extended services response\n");
- process_ESResponse(apdu->u.extendedServicesResponse);
+ process_Z3950_ESResponse(apdu->u.extendedServicesResponse);
break;
case Z_APDU_close:
printf("Target has closed the association.\n");
- process_close(apdu->u.close);
+ process_Z3950_close(apdu->u.close);
break;
case Z_APDU_resourceControlRequest:
- process_resourceControlRequest
- (apdu->u.resourceControlRequest);
+ process_Z3950_resourceControlRequest(
+ apdu->u.resourceControlRequest);
break;
case Z_APDU_deleteResultSetResponse:
- process_deleteResultSetResponse(apdu->u.
- deleteResultSetResponse);
+ process_Z3950_deleteResultSetResponse(
+ apdu->u.deleteResultSetResponse);
break;
default:
printf("Received unknown APDU type (%d).\n",
{"init", cmd_init, "", NULL,0,NULL},
{"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
{"url", cmd_url, "<url>", NULL,0,NULL},
+ {"webservice", cmd_webservice, "<type>", NULL,0,NULL},
{"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};
projects / yaz-moved-to-github.git / blobdiff