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 installation info.
[yaz-moved-to-github.git]
/
zoom
/
zoomsh.c
diff --git
a/zoom/zoomsh.c
b/zoom/zoomsh.c
index
2f3897f
..
8ff31b1
100644
(file)
--- a/
zoom/zoomsh.c
+++ b/
zoom/zoomsh.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: zoomsh.c,v 1.1 2001-10-23 21:00:20 adam Exp $
+ * $Id: zoomsh.c,v 1.3 2001-11-06 17:05:19 adam Exp $
*
* ZOOM-C Shell
*/
*
* ZOOM-C Shell
*/
@@
-9,9
+9,6
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#define HAVE_READLINE_READLINE_H 1
-#define HAVE_READLINE_HISTORY_H 1
-
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
@@
-32,7
+29,7
@@
static int next_token (const char **cpp, const char **t_start)
while (*cp == ' ')
cp++;
*t_start = cp;
while (*cp == ' ')
cp++;
*t_start = cp;
- while (*cp && *cp != ' ')
+ while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
{
cp++;
len++;
{
cp++;
len++;
@@
-149,7
+146,7
@@
static void cmd_show (Z3950_connection *c, Z3950_resultset *r,
Z3950_options_set (options, "count", count_str);
for (i = 0; i<MAX_CON; i++)
Z3950_options_set (options, "count", count_str);
for (i = 0; i<MAX_CON; i++)
- Z3950_resultset_records (r[i], 0, 0);
+ Z3950_resultset_records (r[i], 0, atoi(start_str), atoi(count_str));
while (Z3950_event (MAX_CON, c))
;
while (Z3950_event (MAX_CON, c))
;
@@
-178,11
+175,11
@@
static void cmd_search (Z3950_connection *c, Z3950_resultset *r,
Z3950_options options,
const char **args)
{
Z3950_options options,
const char **args)
{
- Z3950_search s;
+ Z3950_query s;
int i;
int i;
- s = Z3950_search_create ();
- if (Z3950_search_prefix (s, *args))
+ s = Z3950_query_create ();
+ if (Z3950_query_prefix (s, *args))
{
fprintf (stderr, "Bad PQF: %s\n", *args);
return;
{
fprintf (stderr, "Bad PQF: %s\n", *args);
return;
@@
-224,7
+221,7
@@
static void cmd_search (Z3950_connection *c, Z3950_resultset *r,
display_records (c[i], r[i], start, count);
}
}
display_records (c[i], r[i], start, count);
}
}
- Z3950_search_destroy (s);
+ Z3950_query_destroy (s);
}
static void cmd_help (Z3950_connection *c, Z3950_resultset *r,
}
static void cmd_help (Z3950_connection *c, Z3950_resultset *r,