X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=114d2ea704d363dda93377578f7a1302bbfffc7b;hb=1e101aa1bfddbdbad0024f743ff71447cc432a11;hp=848370571eeaa1a844d8d8df2c5e7050b4bc923f;hpb=bdde87cfaf2307da5d3f6fcb911f621a9df114fe;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 8483705..114d2ea 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http_command.c,v 1.21 2007-01-12 23:41:35 quinn Exp $
+ * $Id: http_command.c,v 1.23 2007-01-17 14:21:29 quinn Exp $
  */
 
 #include <stdio.h>
@@ -157,7 +157,7 @@ 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)
+static void targets_termlist(WRBUF wrbuf, struct session *se, int num)
 {
     struct hitsbytarget *ht;
     int count, i;
@@ -165,7 +165,7 @@ static void targets_termlist(WRBUF wrbuf, struct session *se)
     if (!(ht = hitsbytarget(se, &count)))
         return;
     qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
-    for (i = 0; i < count && i < 15; i++)
+    for (i = 0; i < count && i < num; i++)
     {
         wrbuf_puts(wrbuf, "\n<term>\n");
         wrbuf_printf(wrbuf, "<name>%s</name>\n", ht[i].id);
@@ -185,6 +185,8 @@ static void cmd_termlist(struct http_channel *c)
     int len;
     int i;
     char *name = http_argbyname(rq, "name");
+    char *nums = http_argbyname(rq, "num");
+    int num = 15;
     int status;
 
     if (!s)
@@ -196,6 +198,8 @@ static void cmd_termlist(struct http_channel *c)
         name = "subject";
     if (strlen(name) > 255)
         return;
+    if (nums)
+        num = atoi(nums);
 
     wrbuf_rewind(c->wrbuf);
 
@@ -213,12 +217,12 @@ static void cmd_termlist(struct http_channel *c)
 
         wrbuf_printf(c->wrbuf, "\n<list name=\"%s\">\n", tname);
         if (!strcmp(tname, "xtargets"))
-            targets_termlist(c->wrbuf, s->psession);
+            targets_termlist(c->wrbuf, s->psession, num);
         else
         {
             p = termlist(s->psession, tname, &len);
             if (p)
-                for (i = 0; i < len; i++)
+                for (i = 0; i < len && i < num; i++)
                 {
                     wrbuf_puts(c->wrbuf, "\n<term>");
                     wrbuf_printf(c->wrbuf, "<name>%s</name>", p[i]->term);
@@ -291,9 +295,9 @@ static void write_metadata(WRBUF w, struct conf_service *service,
                     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);
+                    wrbuf_printf(w, "%d", md->data.number.min);
+                    if (md->data.number.min != md->data.number.max)
+                        wrbuf_printf(w, "-%d", md->data.number.max);
                     break;
                 default:
                     wrbuf_puts(w, "[can't represent]");
@@ -341,9 +345,10 @@ static void show_records(struct http_channel *c, int active)
     struct http_response *rs = c->response;
     struct http_session *s = locate_session(rq, rs);
     struct record_cluster **rl;
-    NMEM nmem_show;
+    struct reclist_sortparms *sp;
     char *start = http_argbyname(rq, "start");
     char *num = http_argbyname(rq, "num");
+    char *sort = http_argbyname(rq, "sort");
     int startn = 0;
     int numn = 20;
     int total;
@@ -361,9 +366,15 @@ static void show_records(struct http_channel *c, int active)
         startn = atoi(start);
     if (num)
         numn = atoi(num);
+    if (!sort)
+        sort = "relevance";
+    if (!(sp = reclist_parse_sortparms(c->nmem, sort)))
+    {
+        error(rs, "500", "Bad sort parameters", 0);
+        return;
+    }
 
-    nmem_show = nmem_create();
-    rl = show(s->psession, startn, &numn, &total, &total_hits, nmem_show);
+    rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem);
 
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, "<show>\n<status>OK</status>\n");
@@ -393,7 +404,6 @@ static void show_records(struct http_channel *c, int active)
     wrbuf_puts(c->wrbuf, "</show>\n");
     rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
     http_send_response(c);
-    nmem_destroy(nmem_show);
 }
 
 static void show_records_ready(void *data)
@@ -502,7 +512,6 @@ static void cmd_stat(struct http_channel *c)
 static void cmd_info(struct http_channel *c)
 {
     char yaz_version_str[20];
-    struct http_request *rq = c->request;
     struct http_response *rs = c->response;
 
     wrbuf_rewind(c->wrbuf);