projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8cd73b
)
Strip #-suffix for ZOOM URLs PAZ-892
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 2 Sep 2013 10:39:51 +0000
(12:39 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 2 Sep 2013 10:39:51 +0000
(12:39 +0200)
src/connection.c
patch
|
blob
|
history
diff --git
a/src/connection.c
b/src/connection.c
index
465693e
..
710d436
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-411,6
+411,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
const char *charset;
const char *sru;
const char *sru_version = 0;
const char *charset;
const char *sru;
const char *sru_version = 0;
+ WRBUF w;
struct session_database *sdb = client_get_database(con->client);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
struct session_database *sdb = client_get_database(con->client);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
@@
-471,26
+472,19
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
return -1;
}
return -1;
}
+ w = wrbuf_alloc();
if (sru && *sru && !strstr(con->url, "://"))
if (sru && *sru && !strstr(con->url, "://"))
- {
- WRBUF w = wrbuf_alloc();
wrbuf_puts(w, "http://");
wrbuf_puts(w, "http://");
- wrbuf_puts(w, con->url);
- ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
- wrbuf_destroy(w);
- }
- else if (strchr(con->url, '#'))
+ if (strchr(con->url, '#'))
{
const char *cp = strchr(con->url, '#');
{
const char *cp = strchr(con->url, '#');
- WRBUF w = wrbuf_alloc();
wrbuf_write(w, con->url, cp - con->url);
wrbuf_write(w, con->url, cp - con->url);
- ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
- wrbuf_destroy(w);
}
else
}
else
- {
- ZOOM_connection_connect(con->link, con->url, 0);
- }
+ wrbuf_puts(w, con->url);
+
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+
con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
@@
-499,6
+493,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
+ wrbuf_destroy(w);
return 0;
}
return 0;
}