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
Minor include updates to make Windows happy
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
e0ac407
..
8abd5a2
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-1,20
+1,27
@@
/*
/*
- * Copyright (c) 1995-2005, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.266 2005-01-09 21:52:48 adam Exp $
+ * $Id: client.c,v 1.269 2005-01-16 22:12:39 adam Exp $
*/
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
*/
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+#include <time.h>
+#include <ctype.h>
#if HAVE_LOCALE_H
#include <locale.h>
#endif
#if HAVE_LOCALE_H
#include <locale.h>
#endif
-
#if HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#if HAVE_LANGINFO_H
#include <langinfo.h>
#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#if HAVE_OPENSSL_SSL_H
#include <openssl/bio.h>
#if HAVE_OPENSSL_SSL_H
#include <openssl/bio.h>
@@
-25,15
+32,11
@@
#include <openssl/err.h>
#endif
#include <openssl/err.h>
#endif
-#include <time.h>
-#include <ctype.h>
-
#ifdef WIN32
#include <io.h>
#ifdef WIN32
#include <io.h>
+#include <windows.h>
#define S_ISREG(x) (x & _S_IFREG)
#define S_ISDIR(x) (x & _S_IFDIR)
#define S_ISREG(x) (x & _S_IFREG)
#define S_ISDIR(x) (x & _S_IFDIR)
-#else
-#include <unistd.h>
#endif
#include <yaz/yaz-util.h>
#endif
#include <yaz/yaz-util.h>
@@
-62,7
+65,6
@@
#include <readline/history.h>
#endif
#include <readline/history.h>
#endif
-#include <sys/stat.h>
#include "admin.h"
#include "tabcomplete.h"
#include "admin.h"
#include "tabcomplete.h"
@@
-1253,11
+1255,11
@@
static int send_srw(Z_SRW_PDU *sr)
#endif
#if HAVE_XML2
#endif
#if HAVE_XML2
-static int send_SRW_scanRequest(const char *arg, int num, int pos)
+static int send_SRW_scanRequest(const char *arg, int pos, int num)
{
Z_SRW_PDU *sr = 0;
{
Z_SRW_PDU *sr = 0;
- /* regular request .. */
+ /* regular requestse .. */
sr = yaz_srw_get(out, Z_SRW_scan_request);
switch(queryType)
sr = yaz_srw_get(out, Z_SRW_scan_request);
switch(queryType)
@@
-2856,8
+2858,16
@@
int cmd_scan(const char *arg)
cmd_open(0);
if (!conn)
return 0;
cmd_open(0);
if (!conn)
return 0;
- if (send_SRW_scanRequest(arg, 20, 0) < 0)
- return 0;
+ if (*arg)
+ {
+ if (send_SRW_scanRequest(arg, scan_position, 20) < 0)
+ return 0;
+ }
+ else
+ {
+ if (send_SRW_scanRequest(last_scan_line, 1, 20) < 0)
+ return 0;
+ }
return 2;
#else
return 0;
return 2;
#else
return 0;
@@
-3531,6
+3541,8
@@
static void handle_srw_scan_term(Z_SRW_scanTerm *term)
printf(" %s", term->whereInList);
if (term->value && term->displayTerm)
printf(" %s", term->value);
printf(" %s", term->whereInList);
if (term->value && term->displayTerm)
printf(" %s", term->value);
+
+ strcpy(last_scan_line, term->value);
printf("\n");
}
printf("\n");
}