X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=528fef4e6b30d4166bd06b64cd41e6c7da34022d;hb=57b393132b1e795da47e50c13260a1346c8029e9;hp=3db2f9a4cff4aaccc06806941973c58a6a582d29;hpb=c2e616dc27f177a669874eee4b7abf2e59da22b7;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 3db2f9a..528fef4 100644 --- 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 #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#ifdef WIN32 -#include -typedef int socklen_t; -#endif -#if HAVE_NETDB_H -#include -#endif #include -#include #include #include @@ -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 (event == ZOOM_EVENT_NONE || - event == ZOOM_EVENT_END) + if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END) 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); - /* 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;