-/* $Id: http_command.c,v 1.62 2007-09-10 16:25:50 adam Exp $
+/* $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
*/
/*
- * $Id: http_command.c,v 1.62 2007-09-10 16:25:50 adam Exp $
+ * $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $
*/
#include <stdio.h>
const char *addinfo)
{
struct http_channel *c = rs->channel;
- char text[1024];
+ WRBUF text = wrbuf_alloc();
const char *http_status = "417";
const char *msg = get_msg(code);
-
+
rs->msg = nmem_strdup(c->nmem, msg);
strcpy(rs->code, http_status);
- yaz_snprintf(text, sizeof(text),
- "<error code=\"%d\" msg=\"%s\">%s</error>", (int) code,
- msg, addinfo ? addinfo : "");
+ wrbuf_printf(text, "<error code=\"%d\" msg=\"%s\">", (int) code,
+ msg);
+ if (addinfo)
+ wrbuf_xmlputs(text, addinfo);
+ wrbuf_puts(text, "</error>");
yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status,
msg, addinfo ? ": " : "" , addinfo ? addinfo : "");
- rs->payload = nmem_strdup(c->nmem, text);
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(text));
+ wrbuf_destroy(text);
http_send_response(c);
}
http_send_response(c);
}
-void show_raw_reset(void *data, struct http_channel *c)
+
+static void show_raw_record_ok_binary(void *data, const char *buf, size_t sz)
+{
+ http_channel_observer_t obs = data;
+ struct http_channel *c = http_channel_observer_chan(obs);
+ struct http_response *rs = c->response;
+
+ http_remove_observer(obs);
+
+ wrbuf_write(c->wrbuf, buf, sz);
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+
+ rs->content_type = "application/octet-stream";
+ http_send_response(c);
+}
+
+
+void show_raw_reset(void *data, struct http_channel *c, void *data2)
{
struct client *client = data;
- client_show_raw_reset(client);
+ client_show_raw_remove(client, data2);
}
static void cmd_record_ready(void *data);
struct conf_service *service = global_parameters.server->service;
const char *idstr = http_argbyname(rq, "id");
const char *offsetstr = http_argbyname(rq, "offset");
+ const char *binarystr = http_argbyname(rq, "binary");
if (!s)
return;
const char *esn = http_argbyname(rq, "esn");
int i;
struct record*r = rec->records;
+ int binary = 0;
+
+ if (binarystr && *binarystr != '0')
+ binary = 1;
for (i = 0; i < offset && r; r = r->next, i++)
;
}
else
{
+ void *data2;
http_channel_observer_t obs =
http_add_observer(c, r->client, show_raw_reset);
- if (client_show_raw_begin(r->client, r->position, syntax, esn,
+ int ret =
+ client_show_raw_begin(r->client, r->position, syntax, esn,
obs /* data */,
show_raw_record_error,
- show_raw_record_ok))
+ (binary ?
+ show_raw_record_ok_binary :
+ show_raw_record_ok),
+ &data2,
+ (binary ? 1 : 0));
+ if (ret == -1)
{
http_remove_observer(obs);
- error(rs, PAZPAR2_RECORD_FAIL, "invalid parameters");
+ error(rs, PAZPAR2_NO_SESSION, 0);
return;
}
}