X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=97aac8cc35a0a1f15cb0f2df7637d55350bec195;hb=be44b27afe6a19122873361440cfa572d15e7e8b;hp=6442499f64725ccd3d2080482d0093a530f62432;hpb=622742ea43d388e556071680148dffb7f7d8421a;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 6442499..97aac8c 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.37 2007-04-16 21:11:26 quinn Exp $
+/* $Id: http_command.c,v 1.47 2007-06-05 14:09:10 marc 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.37 2007-04-16 21:11:26 quinn Exp $
+ * $Id: http_command.c,v 1.47 2007-06-05 14:09:10 marc Exp $
  */
 
 #include <stdio.h>
@@ -31,7 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <strings.h>
 #include <ctype.h>
 #include <sys/time.h>
-
+#include <yaz/snprintf.h>
 #if HAVE_CONFIG_H
 #include <cconfig.h>
 #endif
@@ -45,13 +45,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "http.h"
 #include "http_command.h"
 #include "settings.h"
+#include "client.h"
 
 // Update this when the protocol changes
 #define PAZPAR2_PROTOCOL_VERSION "1"
 
-extern struct parameters global_parameters;
-extern IOCHAN channel_list;
-
 struct http_session {
     IOCHAN timeout_iochan;     // NOTE: This is NOT associated with a socket
     struct session *psession;
@@ -85,8 +83,8 @@ struct http_session *http_session_create()
     r->timeout_iochan = iochan_create(-1, session_timeout, 0);
     iochan_setdata(r->timeout_iochan, r);
     iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout);
-    r->timeout_iochan->next = channel_list;
-    channel_list = r->timeout_iochan;
+
+    pazpar2_add_channel(r->timeout_iochan);
     return r;
 }
 
@@ -105,31 +103,48 @@ void http_session_destroy(struct http_session *s)
     nmem_destroy(s->nmem);
 }
 
-static void error(struct http_response *rs, char *code, char *msg, char *txt)
+static void error(struct http_response *rs, 
+                  const char *code, const char *msg, const char *extra)
 {
     struct http_channel *c = rs->channel;
-    char tmp[1024];
+    char text[1024];
+    char *sep = extra ? ": " : "";
 
-    if (!txt)
-        txt = msg;
     rs->msg = nmem_strdup(c->nmem, msg);
     strcpy(rs->code, code);
-    sprintf(tmp, "<error code=\"general\">%s</error>", txt);
-    rs->payload = nmem_strdup(c->nmem, tmp);
+
+    yaz_snprintf(text, sizeof(text),
+                 "<error code=\"general\">%s%s%s</error>", msg, sep,
+                 extra ? extra : "");
+
+    yaz_log(YLOG_WARN, "HTTP %s %s%s%s", code, msg, sep,
+            extra ? extra : "");
+    rs->payload = nmem_strdup(c->nmem, text);
     http_send_response(c);
 }
 
 unsigned int make_sessionid()
 {
-    struct timeval t;
-    unsigned int res;
     static int seq = 0;
+    unsigned int res;
 
     seq++;
-    if (gettimeofday(&t, 0) < 0)
-        abort();
-    res = t.tv_sec;
-    res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
+    if (global_parameters.debug_mode)
+        res = seq;
+    else
+    {
+        struct timeval t;
+
+        if (gettimeofday(&t, 0) < 0)
+        {
+            yaz_log(YLOG_WARN|YLOG_ERRNO, "gettimeofday");
+            exit(1);
+        }
+        /* at most 256 sessions per second .. 
+           (long long would be more appropriate)*/
+        res = t.tv_sec;
+        res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
+    }
     return res;
 }
 
@@ -174,8 +189,7 @@ static int process_settings(struct session *se, struct http_request *rq,
             nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num);
             if (num != 2)
             {
-                error(rs, "417", "Malformed setting argument", 0);
-                yaz_log(YLOG_WARN, "Malformed setting: %s", a->name);
+                error(rs, "417", "Malformed setting argument", a->name);
                 return -1;
             }
             setting = res[0];
@@ -205,8 +219,7 @@ static void cmd_init(struct http_channel *c)
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
     sprintf(buf, "<init><status>OK</status><session>%u</session>"
-            "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>"
-            "<id>$Id: http_command.c,v 1.37 2007-04-16 21:11:26 quinn Exp $</id></init>", sesid);
+            "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>", sesid);
     rs->payload = nmem_strdup(c->nmem, buf);
     http_send_response(c);
 }
@@ -245,13 +258,33 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num)
     qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
     for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
     {
-        wrbuf_puts(wrbuf, "\n<term>\n");
-        wrbuf_printf(wrbuf, "<id>%s</id>\n", ht[i].id);
-        wrbuf_printf(wrbuf, "<name>%s</name>\n", ht[i].name);
+
+        // do only print terms which have display names
+    
+        wrbuf_puts(wrbuf, "<term>\n");
+
+        //wrbuf_printf(wrbuf, "<id>%s</id>\n", ht[i].id);
+        wrbuf_puts(wrbuf, "<id>");
+        wrbuf_xmlputs(wrbuf, ht[i].id);
+        wrbuf_puts(wrbuf, "</id>\n");
+        
+        wrbuf_puts(wrbuf, "<name>");
+        if (!ht[i].name || !ht[i].name[0])
+            wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
+        else
+            wrbuf_xmlputs(wrbuf, ht[i].name);
+        wrbuf_puts(wrbuf, "</name>\n");
+        
         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");
+        
+        //wrbuf_printf(wrbuf, "<state>%s</state>\n", ht[i].state);
+        wrbuf_puts(wrbuf, "<state>");
+        wrbuf_xmlputs(wrbuf, ht[i].state);
+        wrbuf_puts(wrbuf, "</state>\n");
+        
+        wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", 
+                     ht[i].diagnostic);
+        wrbuf_puts(wrbuf, "</term>\n");
     }
 }
 
@@ -282,8 +315,8 @@ static void cmd_termlist(struct http_channel *c)
 
     wrbuf_rewind(c->wrbuf);
 
-    wrbuf_puts(c->wrbuf, "<termlist>");
-    wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>", status);
+    wrbuf_puts(c->wrbuf, "<termlist>\n");
+    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
     while (*name)
     {
         char tname[256];
@@ -294,27 +327,37 @@ static void cmd_termlist(struct http_channel *c)
         strncpy(tname, name, tp - name);
         tname[tp - name] = '\0';
 
-        wrbuf_printf(c->wrbuf, "\n<list name=\"%s\">\n", tname);
+        wrbuf_puts(c->wrbuf, "<list name=\"");
+        wrbuf_xmlputs(c->wrbuf, tname);
+        wrbuf_puts(c->wrbuf, "\">\n");
         if (!strcmp(tname, "xtargets"))
             targets_termlist(c->wrbuf, s->psession, num);
         else
         {
             p = termlist(s->psession, tname, &len);
             if (p)
-                for (i = 0; i < len && i < num; 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>");
-                }
+                for (i = 0; i < len && i < num; i++){
+                    // prevnt sending empty term elements
+                    if (!p[i]->term || !p[i]->term[0])
+                        continue;
+
+                    wrbuf_puts(c->wrbuf, "<term>");
+                    wrbuf_puts(c->wrbuf, "<name>");
+                    wrbuf_xmlputs(c->wrbuf, p[i]->term);
+                    wrbuf_puts(c->wrbuf, "</name>");
+                        
+                    wrbuf_printf(c->wrbuf, 
+                                 "<frequency>%d</frequency>", 
+                                 p[i]->frequency);
+                    wrbuf_puts(c->wrbuf, "</term>\n");
+               }
         }
-        wrbuf_puts(c->wrbuf, "\n</list>");
+        wrbuf_puts(c->wrbuf, "</list>\n");
         name = tp;
         if (*name == ',')
             name++;
     }
-    wrbuf_puts(c->wrbuf, "</termlist>");
+    wrbuf_puts(c->wrbuf, "</termlist>\n");
     rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
 }
@@ -341,11 +384,21 @@ static void cmd_bytarget(struct http_channel *c)
     for (i = 0; i < count; i++)
     {
         wrbuf_puts(c->wrbuf, "\n<target>");
-        wrbuf_printf(c->wrbuf, "<id>%s</id>\n", ht[i].id);
+
+        //wrbuf_printf(c->wrbuf, "<id>%s</id>\n", ht[i].id);
+        wrbuf_puts(c->wrbuf, "<id>");
+        wrbuf_xmlputs(c->wrbuf, ht[i].id);
+        wrbuf_puts(c->wrbuf, "</id>\n");
+
         wrbuf_printf(c->wrbuf, "<hits>%d</hits>\n", ht[i].hits);
         wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
         wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
-        wrbuf_printf(c->wrbuf, "<state>%s</state>\n", ht[i].state);
+
+        //wrbuf_printf(c->wrbuf, "<state>%s</state>\n", ht[i].state);
+        wrbuf_puts(c->wrbuf, "<state>");
+        wrbuf_xmlputs(c->wrbuf, ht[i].state);
+        wrbuf_puts(c->wrbuf, "</state\n");
+
         wrbuf_puts(c->wrbuf, "</target>");
     }
 
@@ -368,6 +421,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
         for (md = ml[imeta]; md; md = md->next)
         {
             wrbuf_printf(w, "\n<md-%s>", cmd->name);
+
             switch (cmd->type)
             {
                 case Metadata_type_generic:
@@ -389,11 +443,16 @@ 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(r->client->database, PZ_NAME);
+    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);
+    wrbuf_puts(w, "\" ");
+
+    wrbuf_puts(w, "name=\"");
+    wrbuf_xmlputs(w,  *name ? name : "Unknown");
+    wrbuf_puts(w, "\">");
 
-    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
-            r->client->database->database->url,
-            *name ? name : "Unknown");
     if (show_details)
         write_metadata(w, service, r->metadata, 1);
     wrbuf_puts(w, "</location>\n");
@@ -425,7 +484,7 @@ static void cmd_record(struct http_channel *c)
         return;
     }
     wrbuf_puts(c->wrbuf, "<record>\n");
-    wrbuf_printf(c->wrbuf, "<recid>%d</recid>", rec->recid);
+    wrbuf_printf(c->wrbuf, "<recid>%d</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);
@@ -545,6 +604,31 @@ static void cmd_ping(struct http_channel *c)
     http_send_response(c);
 }
 
+static int utf_8_valid(const char *str)
+{
+    yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8");
+    if (cd)
+    {
+        /* check that query is UTF-8 encoded */
+        char *inbuf = (char *) str; /* we know iconv does not alter this */
+        size_t inbytesleft = strlen(inbuf);
+
+        size_t outbytesleft = strlen(inbuf) + 10;
+        char *out = xmalloc(outbytesleft);
+        char *outbuf = out;
+        size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+
+        /* if OK, try flushing the rest  */
+        if (r != (size_t) (-1))
+            r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
+        yaz_iconv_close(cd);
+        xfree(out);
+        if (r == (size_t) (-1))
+            return 0;
+    }
+    return 1;
+}
+
 static void cmd_search(struct http_channel *c)
 {
     struct http_request *rq = c->request;
@@ -561,10 +645,15 @@ static void cmd_search(struct http_channel *c)
         error(rs, "417", "Must supply query", 0);
         return;
     }
+    if (!utf_8_valid(query))
+    {
+        error(rs, "417", "Query not UTF-8 encoded", 0);
+        return;
+    }
     res = search(s->psession, query, filter);
     if (res)
     {
-        error(rs, "417", res, res);
+        error(rs, "417", res, 0);
         return;
     }
     rs->payload = "<search><status>OK</status></search>";
@@ -612,13 +701,23 @@ static void cmd_info(struct http_channel *c)
 
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, "<info>\n");
-    wrbuf_printf(c->wrbuf, " <version>\n");
-    wrbuf_printf(c->wrbuf, "  <pazpar2>%s</pazpar2>\n", VERSION);
+    wrbuf_puts(c->wrbuf, " <version>\n");
+    //wrbuf_printf(c->wrbuf, "  <pazpar2>%s</pazpar2>\n", VERSION);
+    wrbuf_puts(c->wrbuf, "<pazpar2>");
+    wrbuf_xmlputs(c->wrbuf, VERSION);
+    wrbuf_puts(c->wrbuf, "</pazpar2>");
+
 
     yaz_version(yaz_version_str, 0);
-    wrbuf_printf(c->wrbuf, "  <yaz compiled=\"%s\">%s</yaz>\n",
-                 YAZ_VERSION, yaz_version_str);
-    wrbuf_printf(c->wrbuf, " </version>\n");
+    //wrbuf_printf(c->wrbuf, "  <yaz compiled=\"%s\">%s</yaz>\n",
+    //             YAZ_VERSION, yaz_version_str);
+    wrbuf_puts(c->wrbuf, "  <yaz compiled=\"");
+    wrbuf_xmlputs(c->wrbuf, YAZ_VERSION);
+    wrbuf_puts(c->wrbuf, "\">");
+    wrbuf_xmlputs(c->wrbuf, yaz_version_str);
+    wrbuf_puts(c->wrbuf, "</yaz>\n");
+
+    wrbuf_puts(c->wrbuf, " </version>\n");
     
     wrbuf_puts(c->wrbuf, "</info>");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
@@ -666,7 +765,7 @@ void http_command(struct http_channel *c)
             break;
         }
     if (!commands[i].name)
-        error(rs, "417", "Unknown command", 0);
+        error(rs, "417", "Unknown command", command);
 
     return;
 }