projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add const modifier for two ICU utils
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
732acfc
..
d1443ab
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-435,8
+435,8
@@
static int process_initResponse(Z_InitResponse *res)
else
{
/* Peek at any private Init-diagnostic APDUs */
else
{
/* Peek at any private Init-diagnostic APDUs */
- printf("### NAUGHTY: External is '%.*s'\n",
- sat->len, sat->buf);
+ printf("yaz-client ignoring unrecognised userInformationField: %d-octet External '%.*s'\n",
+ (int) sat->len, sat->len, sat->buf);
}
}
odr_reset(print);
}
}
odr_reset(print);
@@
-706,10
+706,6
@@
int session_connect(const char *arg)
}
#endif
protocol = conn->protocol;
}
#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)
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
@@
-722,7
+718,10
@@
int session_connect(const char *arg)
printf("OK.\n");
cs_print_session_info(conn);
if (basep && *basep)
printf("OK.\n");
cs_print_session_info(conn);
if (basep && *basep)
- set_base (basep);
+ set_base(basep);
+ else if (protocol == PROTO_Z3950)
+ set_base("Default");
+
if (protocol == PROTO_Z3950)
{
send_initRequest(type_and_host);
if (protocol == PROTO_Z3950)
{
send_initRequest(type_and_host);
@@
-739,9
+738,13
@@
int cmd_open(const char *arg)
strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
+
+ set_base("");
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
queryType = QueryType_CQL;
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
queryType = QueryType_CQL;
+
+
return r;
}
return r;
}
@@
-1212,11
+1215,7
@@
static int send_srw(Z_SRW_PDU *sr)
const char *charset = negotiationCharset;
const char *host_port = cur_host;
Z_GDU *gdu;
const char *charset = negotiationCharset;
const char *host_port = cur_host;
Z_GDU *gdu;
- char *path = 0;
-
- path = (char *) odr_malloc(out, 2+strlen(databaseNames[0]));
- *path = '/';
- strcpy(path+1, databaseNames[0]);
+ char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]);
gdu = z_get_HTTP_Request_host_path(out, host_port, path);
gdu = z_get_HTTP_Request_host_path(out, host_port, path);
@@
-3899,9
+3898,10
@@
static void initialize(const char *rc_file)
cmd_format("usmarc");
cmd_format("usmarc");
+ file_history = file_history_new();
+
source_rc_file(rc_file);
source_rc_file(rc_file);
- file_history = file_history_new();
file_history_load(file_history);
file_history_trav(file_history, 0, add_to_readline_history);
}
file_history_load(file_history);
file_history_trav(file_history, 0, add_to_readline_history);
}
@@
-4008,6
+4008,12
@@
static void http_response(Z_HTTP_Response *hres)
int ret = -1;
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
int ret = -1;
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
+
+ if (hres->code != 200)
+ {
+ printf("HTTP Error Status=%d\n", hres->code);
+ }
+
if (!yaz_srw_check_content_type(hres))
printf("Content type does not appear to be XML\n");
else
if (!yaz_srw_check_content_type(hres))
printf("Content type does not appear to be XML\n");
else
@@
-4035,12
+4041,14
@@
static void http_response(Z_HTTP_Response *hres)
printf("Got update response. Status: %s\n",
sr->u.update_response->operationStatus);
else
printf("Got update response. Status: %s\n",
sr->u.update_response->operationStatus);
else
+ {
+ printf("Decoding of SRW package failed\n");
ret = -1;
ret = -1;
+ }
}
else if (soap_package && (soap_package->which == Z_SOAP_fault
|| soap_package->which == Z_SOAP_error))
{
}
else if (soap_package && (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",
printf("SOAP Fault code %s\n",
soap_package->u.fault->fault_code);
printf("SOAP Fault string %s\n",
@@
-4057,17
+4065,7
@@
static void http_response(Z_HTTP_Response *hres)
odr_destroy(o);
}
if (ret)
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();
- }
+ close_session(); /* close session on error */
else
{
if (!strcmp(hres->version, "1.0"))
else
{
if (!strcmp(hres->version, "1.0"))