projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using the ICU wrapper from YAZ rather than its own.
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
3db2f9a
..
528fef4
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-34,19
+34,8
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef WIN32
-#include <winsock.h>
-typedef int socklen_t;
-#endif
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
#include <signal.h>
#include <signal.h>
-#include <ctype.h>
#include <assert.h>
#include <yaz/log.h>
#include <assert.h>
#include <yaz/log.h>
@@
-95,8
+84,7
@@
static int connection_is_idle(struct connection *co)
if (!ZOOM_connection_is_idle(link))
return 0;
event = ZOOM_connection_peek_event(link);
if (!ZOOM_connection_is_idle(link))
return 0;
event = ZOOM_connection_peek_event(link);
- if (event == ZOOM_EVENT_NONE ||
- event == ZOOM_EVENT_END)
+ if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END)
return 1;
else
return 0;
return 1;
else
return 0;
@@
-410,16
+398,7
@@
static int connection_connect(struct connection *con)
if (sru && *sru)
strcpy(ipport, "http://");
strcat(ipport, host->ipport);
if (sru && *sru)
strcpy(ipport, "http://");
strcat(ipport, host->ipport);
- /* deal with SRU path here because databaseName option is not read in
- ZOOM in SRU mode */
- if (sru && *sru)
- {
- if (*sdb->database->databases[0])
- {
- strcat(ipport, "/");
- strcat(ipport, sdb->database->databases[0]);
- }
- }
+
ZOOM_connection_connect(link, ipport, 0);
con->link = link;
ZOOM_connection_connect(link, ipport, 0);
con->link = link;