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
Protect session_watch
[pazpar2-moved-to-github.git]
/
src
/
http_command.c
diff --git
a/src/http_command.c
b/src/http_command.c
index
9bada03
..
422fef1
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-35,7
+35,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "eventl.h"
#include "parameters.h"
#include "eventl.h"
#include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
#include "http.h"
#include "settings.h"
#include "client.h"
#include "http.h"
#include "settings.h"
#include "client.h"
@@
-702,7
+702,7
@@
static void cmd_record(struct http_channel *c)
return;
}
wrbuf_rewind(c->wrbuf);
return;
}
wrbuf_rewind(c->wrbuf);
- if (!(rec = show_single(s->psession, idstr, &prev_r, &next_r)))
+ if (!(rec = show_single_start(s->psession, idstr, &prev_r, &next_r)))
{
if (session_active_clients(s->psession) == 0)
{
{
if (session_active_clients(s->psession) == 0)
{
@@
-732,7
+732,6
@@
static void cmd_record(struct http_channel *c)
if (!r)
{
error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
if (!r)
{
error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
- return;
}
else
{
}
else
{
@@
-780,6
+779,7
@@
static void cmd_record(struct http_channel *c)
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
+ show_single_stop(s->psession, rec);
}
static void cmd_record_ready(void *data)
}
static void cmd_record_ready(void *data)
@@
-824,7
+824,8
@@
static void show_records(struct http_channel *c, int active)
return;
}
return;
}
- rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem);
+
+ rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
@@
-856,6
+857,8
@@
static void show_records(struct http_channel *c, int active)
wrbuf_puts(c->wrbuf, "</hit>\n");
}
wrbuf_puts(c->wrbuf, "</hit>\n");
}
+ show_range_stop(s->psession, rl);
+
wrbuf_puts(c->wrbuf, "</show>\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
wrbuf_puts(c->wrbuf, "</show>\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);