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
More consistent ICU info. Update URLs to ICU info
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
e77e35c
..
445dc52
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-5,6
+5,9
@@
/** \file client.c
* \brief yaz-client program
*/
/** \file client.c
* \brief yaz-client program
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-284,7
+287,7
@@
int send_apdu(Z_APDU *a)
do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
- fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn)));
+ fprintf(stderr, "cs_put: %s\n", cs_errmsg(cs_errno(conn)));
close_session();
return 0;
}
close_session();
return 0;
}
@@
-2280,6
+2283,22
@@
static int only_z3950(void)
return 0;
}
return 0;
}
+static int is_SRW(void)
+{
+ if (!conn)
+ {
+ printf("Not connected yet\n");
+ return 1;
+ }
+ if (protocol == PROTO_HTTP && yaz_matchstr(sru_method, "solr"))
+ {
+ printf("Not supported by SRW\n");
+ return 1;
+ }
+ return 0;
+}
+
+
static int cmd_update_common(const char *arg, int version);
static int cmd_update(const char *arg)
static int cmd_update_common(const char *arg, int version);
static int cmd_update(const char *arg)
@@
-2887,6
+2906,8
@@
static int cmd_find(const char *arg)
static int cmd_facets(const char *arg)
{
static int cmd_facets(const char *arg)
{
+ /* TODO Wrong odr. Loosing memory */
+ ODR odr = odr_createmem(ODR_ENCODE);
int size = 0;
if (!*arg)
{
int size = 0;
if (!*arg)
{
@@
-2895,15
+2916,9
@@
static int cmd_facets(const char *arg)
return 0;
}
size = strlen(arg);
return 0;
}
size = strlen(arg);
-/*
- MOVE to non-usage of it?
- if (only_z3950() && !yaz_matchstr(sru_method, "solr")) {
- // We are not Z39.50 and not SOLR (I think)
- printf("WARN: Currently supported for Z39.50 and SOLR.\n");
+ if (is_SRW()) {
+ printf("WARN: No supported for SRW/SRU.\n");
}
}
-ยบ/
- /* TODO Wrong odr. Loosing memory */
- ODR odr = odr_createmem(ODR_ENCODE);
facet_list = yaz_pqf_parse_facet_list(odr, arg);
if (!facet_list)
facet_list = yaz_pqf_parse_facet_list(odr, arg);
if (!facet_list)
@@
-4303,6
+4318,9
@@
static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
}
if (res->numberOfRecords)
printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
}
if (res->numberOfRecords)
printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
+ if (res->facetList) {
+ display_facets(res->facetList);
+ }
for (i = 0; i<res->num_records; i++)
handle_srw_record(res->records + i);
}
for (i = 0; i<res->num_records; i++)
handle_srw_record(res->records + i);
}