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
Version 4.2.5
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
71432b4
..
4cf2207
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-13,7
+13,6
@@
#include <stdlib.h>
#include <assert.h>
#include <time.h>
#include <stdlib.h>
#include <assert.h>
#include <time.h>
-#include <ctype.h>
#ifndef WIN32
#include <signal.h>
#endif
#ifndef WIN32
#include <signal.h>
#endif
@@
-49,7
+48,6
@@
#include <yaz/comstack.h>
#include <yaz/oid_db.h>
#include <yaz/comstack.h>
#include <yaz/oid_db.h>
-#define NO_OID 1
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
@@
-109,6
+107,7
@@
static int largeSetLowerBound = 1;
static int mediumSetPresentNumber = 0;
static Z_ElementSetNames *elementSetNames = 0;
static Z_FacetList *facet_list = 0;
static int mediumSetPresentNumber = 0;
static Z_ElementSetNames *elementSetNames = 0;
static Z_FacetList *facet_list = 0;
+static ODR facet_odr = 0;
static Odr_int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
#define RECORDSYNTAX_MAX 20
static Odr_int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
#define RECORDSYNTAX_MAX 20
@@
-285,7
+284,6
@@
int send_apdu(Z_APDU *a)
buf = odr_getbuf(out, &len, 0);
if (ber_file)
odr_dumpBER(ber_file, buf, len);
buf = odr_getbuf(out, &len, 0);
if (ber_file)
odr_dumpBER(ber_file, buf, len);
- /* printf ("sending APDU of size %d\n", len); */
do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
@@
-764,10
+762,6
@@
static 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;
}
- /* TODO Make facet definition survive the open command without crashing */
- /* TODO Fix deallocation */
- facet_list = 0;
-
set_base("");
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
set_base("");
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
@@
-1667,16
+1661,16
@@
static void display_term(Z_Term *term)
switch (term->which)
{
case Z_Term_general:
switch (term->which)
{
case Z_Term_general:
- printf(" %.*s", term->u.general->len, term->u.general->buf);
+ printf("%.*s", term->u.general->len, term->u.general->buf);
break;
case Z_Term_characterString:
break;
case Z_Term_characterString:
- printf(" %s", term->u.characterString);
+ printf("%s", term->u.characterString);
break;
case Z_Term_numeric:
break;
case Z_Term_numeric:
- printf(" " ODR_INT_PRINTF, *term->u.numeric);
+ printf(ODR_INT_PRINTF, *term->u.numeric);
break;
case Z_Term_null:
break;
case Z_Term_null:
- printf(" null");
+ printf("null");
break;
}
}
break;
}
}
@@
-1716,6
+1710,7
@@
static void display_facet(Z_FacetField *facet)
for (term_index = 0 ; term_index < facet->num_terms; term_index++)
{
Z_FacetTerm *facetTerm = facet->terms[term_index];
for (term_index = 0 ; term_index < facet->num_terms; term_index++)
{
Z_FacetTerm *facetTerm = facet->terms[term_index];
+ printf(" ");
display_term(facetTerm->term);
printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
display_term(facetTerm->term);
printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
@@
-2311,22
+2306,6
@@
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)
@@
-2934,21
+2913,17
@@
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 (!facet_odr)
+ facet_odr = odr_createmem(ODR_ENCODE);
+ odr_reset(facet_odr);
+
if (!*arg)
{
facet_list = 0;
printf("Facets cleared.\n");
return 0;
}
if (!*arg)
{
facet_list = 0;
printf("Facets cleared.\n");
return 0;
}
- size = strlen(arg);
- if (is_SRW()) {
- printf("WARN: No supported for SRW/SRU.\n");
- }
- facet_list = yaz_pqf_parse_facet_list(odr, arg);
-
+ facet_list = yaz_pqf_parse_facet_list(facet_odr, arg);
if (!facet_list)
{
printf("Invalid facet list: %s", arg);
if (!facet_list)
{
printf("Invalid facet list: %s", arg);
@@
-2957,7
+2932,6
@@
static int cmd_facets(const char *arg)
return 1;
}
return 1;
}
-
static int cmd_delete(const char *arg)
{
if (only_z3950())
static int cmd_delete(const char *arg)
{
if (only_z3950())
@@
-3067,7
+3041,7
@@
static int parse_show_args(const char *arg_c, char *setstring,
*start = start_position;
if (*end_ptr == '\0')
return 1;
*start = start_position;
if (*end_ptr == '\0')
return 1;
- while (isspace(*(unsigned char *)end_ptr))
+ while (yaz_isspace(*end_ptr))
end_ptr++;
if (*end_ptr != '+')
{
end_ptr++;
if (*end_ptr != '+')
{
@@
-3084,7
+3058,7
@@
static int parse_show_args(const char *arg_c, char *setstring,
}
if (*end_ptr == '\0')
return 1;
}
if (*end_ptr == '\0')
return 1;
- while (isspace(*(unsigned char *)end_ptr))
+ while (yaz_isspace(*end_ptr))
end_ptr++;
if (*end_ptr != '+')
{
end_ptr++;
if (*end_ptr != '+')
{
@@
-4375,9
+4349,8
@@
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) {
+ if (res->facetList)
display_facets(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);
}
@@
-5180,7
+5153,7
@@
static void process_cmd_line(char* line)
for (; *p; ++p)
{
for (; *p; ++p)
{
- if (!isspace(*(unsigned char *) p))
+ if (!yaz_isspace(*p))
lastnonspace = p;
}
if (lastnonspace)
lastnonspace = p;
}
if (lastnonspace)