X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=1fef304edd0b812863488145512cd689e4130dc4;hb=4e1ce38b96af252361fcb139e29f74ca1b222a8c;hp=c4837a66bf49d6a5cf03f80088908ddb6148b50b;hpb=28589aa29d2c105b8862116b7466110f77bc7b35;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index c4837a6..1fef304 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http_command.c,v 1.5 2007-01-04 02:53:37 quinn Exp $
+ * $Id: http_command.c,v 1.17 2007-01-11 10:03:01 sondberg Exp $
  */
 
 #include <stdio.h>
@@ -11,9 +11,12 @@
 #include <ctype.h>
 #include <sys/time.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 
-#include "command.h"
 #include "util.h"
 #include "eventl.h"
 #include "pazpar2.h"
@@ -96,7 +99,7 @@ unsigned int make_sessionid()
     if (gettimeofday(&t, 0) < 0)
         abort();
     res = t.tv_sec;
-    res = ((res << 8) | (seq & 0xff)) & ((unsigned int) (1 << 31) - 1);
+    res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
     return res;
 }
 
@@ -144,6 +147,34 @@ static void cmd_init(struct http_channel *c)
     http_send_response(c);
 }
 
+// Compares two hitsbytarget nodes by hitcount
+static int cmp_ht(const void *p1, const void *p2)
+{
+    const struct hitsbytarget *h1 = p1;
+    const struct hitsbytarget *h2 = p2;
+    return h2->hits - h1->hits;
+}
+
+// This implements functionality somewhat similar to 'bytarget', but in a termlist form
+static void targets_termlist(WRBUF wrbuf, struct session *se)
+{
+    struct hitsbytarget *ht;
+    int count, i;
+
+    if (!(ht = hitsbytarget(se, &count)))
+        return;
+    qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
+    for (i = 0; i < count && i < 15; i++)
+    {
+        wrbuf_puts(wrbuf, "\n<term>\n");
+        wrbuf_printf(wrbuf, "<name>%s</name>\n", ht[i].id);
+        wrbuf_printf(wrbuf, "<frequency>%d</frequency>\n", ht[i].hits);
+        wrbuf_printf(wrbuf, "<state>%s</state>\n", ht[i].state);
+        wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+        wrbuf_puts(wrbuf, "\n</term>\n");
+    }
+}
+
 static void cmd_termlist(struct http_channel *c)
 {
     struct http_response *rs = c->response;
@@ -153,11 +184,13 @@ static void cmd_termlist(struct http_channel *c)
     int len;
     int i;
     char *name = http_argbyname(rq, "name");
-    int status = session_active_clients(s->psession);
+    int status;
 
     if (!s)
         return;
 
+    status = session_active_clients(s->psession);
+
     if (!name)
         name = "subject";
     if (strlen(name) > 255)
@@ -177,16 +210,21 @@ static void cmd_termlist(struct http_channel *c)
         strncpy(tname, name, tp - name);
         tname[tp - name] = '\0';
 
-        p = termlist(s->psession, tname, &len);
         wrbuf_printf(c->wrbuf, "\n<list name=\"%s\">\n", tname);
-        if (p)
-            for (i = 0; i < len; i++)
-            {
-                wrbuf_puts(c->wrbuf, "\n<term>");
-                wrbuf_printf(c->wrbuf, "<name>%s</name>", p[i]->term);
-                wrbuf_printf(c->wrbuf, "<frequency>%d</frequency>", p[i]->frequency);
-                wrbuf_puts(c->wrbuf, "</term>");
-            }
+        if (!strcmp(tname, "xtargets"))
+            targets_termlist(c->wrbuf, s->psession);
+        else
+        {
+            p = termlist(s->psession, tname, &len);
+            if (p)
+                for (i = 0; i < len; i++)
+                {
+                    wrbuf_puts(c->wrbuf, "\n<term>");
+                    wrbuf_printf(c->wrbuf, "<name>%s</name>", p[i]->term);
+                    wrbuf_printf(c->wrbuf, "<frequency>%d</frequency>", p[i]->frequency);
+                    wrbuf_puts(c->wrbuf, "</term>");
+                }
+        }
         wrbuf_puts(c->wrbuf, "\n</list>");
         name = tp;
         if (*name == ',')
@@ -232,12 +270,76 @@ static void cmd_bytarget(struct http_channel *c)
     http_send_response(c);
 }
 
+static void write_metadata(WRBUF w, struct conf_service *service,
+        struct record_metadata **ml, int full)
+{
+    int imeta;
+
+    for (imeta = 0; imeta < service->num_metadata; imeta++)
+    {
+        struct conf_metadata *cmd = &service->metadata[imeta];
+        struct record_metadata *md;
+        if (!cmd->brief && !full)
+            continue;
+        for (md = ml[imeta]; md; md = md->next)
+        {
+            wrbuf_printf(w, "<md-%s>", cmd->name);
+            switch (cmd->type)
+            {
+                case Metadata_type_generic:
+                    wrbuf_puts(w, md->data.text);
+                    break;
+                case Metadata_type_year:
+                    wrbuf_printf(w, "%d", md->data.year.year1);
+                    if (md->data.year.year1 != md->data.year.year2)
+                        wrbuf_printf(w, "-%d", md->data.year.year2);
+                    break;
+                default:
+                    wrbuf_puts(w, "[can't represent]");
+            }
+            wrbuf_printf(w, "</md-%s>", cmd->name);
+        }
+    }
+}
+
+static void cmd_record(struct http_channel *c)
+{
+    struct http_response *rs = c->response;
+    struct http_request *rq = c->request;
+    struct http_session *s = locate_session(rq, rs);
+    struct record_cluster *rec;
+    struct conf_service *service = global_parameters.server->service;
+    char *idstr = http_argbyname(rq, "id");
+    int id;
+
+    if (!s)
+        return;
+    if (!idstr)
+    {
+        error(rs, "417", "Must supply id", 0);
+        return;
+    }
+    wrbuf_rewind(c->wrbuf);
+    id = atoi(idstr);
+    if (!(rec = show_single(s->psession, id)))
+    {
+        error(rs, "500", "Record missing", 0);
+        return;
+    }
+    wrbuf_puts(c->wrbuf, "<record>\n");
+    wrbuf_printf(c->wrbuf, "<recid>%d</recid>", rec->recid);
+    write_metadata(c->wrbuf, service, rec->metadata, 1);
+    wrbuf_puts(c->wrbuf, "</record>\n");
+    rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+    http_send_response(c);
+}
+
 static void show_records(struct http_channel *c, int active)
 {
     struct http_request *rq = c->request;
     struct http_response *rs = c->response;
     struct http_session *s = locate_session(rq, rs);
-    struct record **rl;
+    struct record_cluster **rl;
     NMEM nmem_show;
     char *start = http_argbyname(rq, "start");
     char *num = http_argbyname(rq, "num");
@@ -274,13 +376,16 @@ static void show_records(struct http_channel *c, int active)
     {
         int ccount;
         struct record *p;
+        struct record_cluster *rec = rl[i];
+        struct conf_service *service = global_parameters.server->service;
 
         wrbuf_puts(c->wrbuf, "<hit>\n");
-        wrbuf_printf(c->wrbuf, "<title>%s</title>\n", rl[i]->title);
-        for (ccount = 1, p = rl[i]->next_cluster; p;  p = p->next_cluster, ccount++)
+        write_metadata(c->wrbuf, service, rec->metadata, 0);
+        for (ccount = 0, p = rl[i]->records; p;  p = p->next, ccount++)
             ;
         if (ccount > 1)
             wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
+        wrbuf_printf(c->wrbuf, "<recid>%d</recid>\n", rec->recid);
         wrbuf_puts(c->wrbuf, "</hit>\n");
     }
 
@@ -303,11 +408,13 @@ static void cmd_show(struct http_channel *c)
     struct http_response *rs = c->response;
     struct http_session *s = locate_session(rq, rs);
     char *block = http_argbyname(rq, "block");
-    int status = session_active_clients(s->psession);
+    int status;
 
     if (!s)
         return;
 
+    status = session_active_clients(s->psession);
+
     if (block)
     {
         if (status && (!s->psession->reclist || !s->psession->reclist->num_records))
@@ -364,11 +471,12 @@ static void cmd_stat(struct http_channel *c)
     struct http_response *rs = c->response;
     struct http_session *s = locate_session(rq, rs);
     struct statistics stat;
-    int clients = session_active_clients(s->psession);
+    int clients;
 
     if (!s)
         return;
 
+    clients = session_active_clients(s->psession);
     statistics(s->psession, &stat);
 
     wrbuf_rewind(c->wrbuf);
@@ -403,6 +511,7 @@ struct {
     { "termlist", cmd_termlist },
     { "exit", cmd_exit },
     { "ping", cmd_ping },
+    { "record", cmd_record },
     {0,0}
 };
 
@@ -413,6 +522,10 @@ void http_command(struct http_channel *c)
     int i;
 
     c->response = rs;
+
+    http_addheader(rs, "Expires", "Thu, 19 Nov 1981 08:52:00 GMT");
+    http_addheader(rs, "Cache-Control", "no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
+
     if (!command)
     {
         error(rs, "417", "Must supply command", 0);