X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp_command.c;h=1e9d4f681a048fb95577f1705b49b5231d12d05c;hb=d5ffc2f6e667c1d849bf7579add8435664e678c5;hp=ffc9b81699a685ec5bb6d804ee3170d3bde3903c;hpb=a09d10bb2d1e817d8f1e0de404a47c8ff3759103;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index ffc9b81..1e9d4f6 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.53 2007-06-15 06:45:39 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.
@@ -20,7 +20,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  */
 
 /*
- * $Id: http_command.c,v 1.53 2007-06-15 06:45:39 adam Exp $
+ * $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $
  */
 
 #include <stdio.h>
@@ -139,20 +139,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);
 }
 
@@ -243,10 +246,15 @@ static void cmd_init(struct http_channel *c)
 {
     unsigned int sesid;
     char buf[1024];
+    const char *clear = http_argbyname(c->request, "clear");
     struct http_session *s = http_session_create();
     struct http_response *rs = c->response;
 
     yaz_log(YLOG_DEBUG, "HTTP Session init");
+    if (!clear || *clear == '0')
+        session_init_databases(s->psession);
+    else
+        yaz_log(YLOG_LOG, "No databases preloaded");
     sesid = make_sessionid();
     s->session_id = sesid;
     if (process_settings(s->psession, c->request, c->response) < 0)
@@ -281,13 +289,13 @@ static int cmp_ht(const void *p1, const void *p2)
 }
 
 // This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static void targets_termlist(WRBUF wrbuf, struct session *se, int num)
+static void targets_termlist(WRBUF wrbuf, struct session *se, int num,
+                             NMEM nmem)
 {
     struct hitsbytarget *ht;
     int count, i;
 
-    if (!(ht = hitsbytarget(se, &count)))
-        return;
+    ht = hitsbytarget(se, &count, nmem);
     qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
     for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
     {
@@ -362,7 +370,7 @@ static void cmd_termlist(struct http_channel *c)
         wrbuf_xmlputs(c->wrbuf, tname);
         wrbuf_puts(c->wrbuf, "\">\n");
         if (!strcmp(tname, "xtargets"))
-            targets_termlist(c->wrbuf, s->psession, num);
+            targets_termlist(c->wrbuf, s->psession, num, c->nmem);
         else
         {
             p = termlist(s->psession, tname, &len);
@@ -404,11 +412,7 @@ static void cmd_bytarget(struct http_channel *c)
 
     if (!s)
         return;
-    if (!(ht = hitsbytarget(s->psession, &count)))
-    {
-        error(rs, PAZPAR2_HITCOUNTS_FAILED, 0);
-        return;
-    }
+    ht = hitsbytarget(s->psession, &count, c->nmem);
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, "<bytarget><status>OK</status>");
 
@@ -454,7 +458,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
             switch (cmd->type)
             {
                 case Metadata_type_generic:
-                    wrbuf_xmlputs(w, md->data.text);
+                    wrbuf_xmlputs(w, md->data.text.disp);
                     break;
                 case Metadata_type_year:
                     wrbuf_printf(w, "%d", md->data.number.min);
@@ -472,7 +476,8 @@ static void write_metadata(WRBUF w, struct conf_service *service,
 static void write_subrecord(struct record *r, WRBUF w,
         struct conf_service *service, int show_details)
 {
-    char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME);
+    const char *name = session_setting_oneval(
+        client_get_database(r->client), PZ_NAME);
 
     wrbuf_puts(w, "<location id=\"");
     wrbuf_xmlputs(w, client_get_database(r->client)->database->url);
@@ -489,22 +494,53 @@ static void write_subrecord(struct record *r, WRBUF w,
 
 static void show_raw_record_error(void *data, const char *addinfo)
 {
-    struct http_channel *c = (struct http_channel *) data;
+    http_channel_observer_t obs = data;
+    struct http_channel *c = http_channel_observer_chan(obs);
     struct http_response *rs = c->response;
 
-    error(rs, PAZPAR2_NOT_IMPLEMENTED, addinfo);
+    http_remove_observer(obs);
+
+    error(rs, PAZPAR2_RECORD_FAIL, addinfo);
 }
 
 static void show_raw_record_ok(void *data, const char *buf, size_t sz)
 {
-    struct http_channel *c = (struct http_channel *) data;
+    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));
+    http_send_response(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_remove(client, data2);
+}
+
+static void cmd_record_ready(void *data);
+
 static void cmd_record(struct http_channel *c)
 {
     struct http_response *rs = c->response;
@@ -515,9 +551,8 @@ 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");
     
-    int id;
-
     if (!s)
         return;
     if (!idstr)
@@ -526,10 +561,13 @@ static void cmd_record(struct http_channel *c)
         return;
     }
     wrbuf_rewind(c->wrbuf);
-    id = atoi(idstr);
-    if (!(rec = show_single(s->psession, id)))
+    if (!(rec = show_single(s->psession, idstr)))
     {
-        error(rs, PAZPAR2_RECORD_MISSING, idstr);
+        if (session_set_watch(s->psession, SESSION_WATCH_RECORD,
+                              cmd_record_ready, c, c) != 0)
+        {
+            error(rs, PAZPAR2_RECORD_MISSING, idstr);
+        }
         return;
     }
     if (offsetstr)
@@ -539,6 +577,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++)
             ;
@@ -547,19 +589,32 @@ static void cmd_record(struct http_channel *c)
             error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
             return;
         }
-        if (client_show_raw(r->client, r->position, syntax, esn, 
-                            c /* data */,
-                            show_raw_record_error,
-                            show_raw_record_ok))
+        else
         {
-            error(rs, PAZPAR2_RECORD_FAIL, "invalid parameters");
-            return;
+            void *data2;
+            http_channel_observer_t obs =
+                http_add_observer(c, r->client, show_raw_reset);
+            int ret = 
+                client_show_raw_begin(r->client, r->position, syntax, esn, 
+                                      obs /* data */,
+                                      show_raw_record_error,
+                                      (binary ? 
+                                       show_raw_record_ok_binary : 
+                                       show_raw_record_ok),
+                                      &data2,
+                                      (binary ? 1 : 0));
+            if (ret == -1)
+            {
+                http_remove_observer(obs);
+                error(rs, PAZPAR2_NO_SESSION, 0);
+                return;
+            }
         }
     }
     else
     {
         wrbuf_puts(c->wrbuf, "<record>\n");
-        wrbuf_printf(c->wrbuf, "<recid>%d</recid>\n", rec->recid);
+        wrbuf_printf(c->wrbuf, "<recid>%s</recid>\n", rec->recid);
         write_metadata(c->wrbuf, service, rec->metadata, 1);
         for (r = rec->records; r; r = r->next)
             write_subrecord(r, c->wrbuf, service, 1);
@@ -569,6 +624,13 @@ static void cmd_record(struct http_channel *c)
     }
 }
 
+static void cmd_record_ready(void *data)
+{
+    struct http_channel *c = (struct http_channel *) data;
+
+    cmd_record(c);
+}
+
 static void show_records(struct http_channel *c, int active)
 {
     struct http_request *rq = c->request;
@@ -627,7 +689,7 @@ static void show_records(struct http_channel *c, int active)
             write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
         if (ccount > 1)
             wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
-        wrbuf_printf(c->wrbuf, "<recid>%d</recid>\n", rec->recid);
+        wrbuf_printf(c->wrbuf, "<recid>%s</recid>\n", rec->recid);
         wrbuf_puts(c->wrbuf, "</hit>\n");
     }
 
@@ -660,8 +722,12 @@ static void cmd_show(struct http_channel *c)
     {
         if (status && (!s->psession->reclist || !s->psession->reclist->num_records))
         {
-            session_set_watch(s->psession, SESSION_WATCH_RECORDS, show_records_ready, c);
-            yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
+            // if there is already a watch/block. we do not block this one
+            if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
+                                  show_records_ready, c, c) != 0)
+            {
+                yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
+            }
             return;
         }
     }