autoheader generates config.h instead of cconfig.h.

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index 052f025..24928d9 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,7 +1,5 @@
-/* $Id: http_command.c,v 1.62 2007-09-10 16:25:50 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,13 +12,13 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 /*
- * $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>
@@ -33,12 +31,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/time.h>
 #include <yaz/snprintf.h>
 #if HAVE_CONFIG_H
-#include <cconfig.h>
+#include <config.h>
 #endif
 
 #include <yaz/yaz-util.h>
 
-#include "config.h"
 #include "util.h"
 #include "eventl.h"
 #include "pazpar2.h"
@@ -139,20 +136,23 @@ static void error(struct http_response *rs,
                   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);
 }
 
@@ -513,10 +513,27 @@ static void show_raw_record_ok(void *data, const char *buf, size_t sz)
     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);
@@ -531,6 +548,7 @@ static void cmd_record(struct http_channel *c)
     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;
@@ -556,6 +574,10 @@ static void cmd_record(struct http_channel *c)
         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++)
             ;
@@ -566,15 +588,22 @@ static void cmd_record(struct http_channel *c)
         }
         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;
             }
         }