X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=30de3d8689703925bf1cf5aef857278e99f9f08f;hb=755488849f522cda43edb0b9f5dab497bb923791;hp=3ab415ca5e9ababc67c2f60ae6e9a0cef3149ff9;hpb=9547e5055922e3279bcd349fc6094e583e559f44;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 3ab415c..30de3d8 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -114,7 +114,8 @@ int http_session_use(int delta)
     g_http_sessions += delta;
     sessions = g_http_sessions;
     yaz_mutex_leave(g_http_session_mutex);
-    yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions);
+    yaz_log(YLOG_DEBUG, "%s http_sessions=%d", delta == 0 ? "" :
+            (delta > 0 ? "INC" : "DEC"), sessions);
     return sessions;
 
 }
@@ -274,8 +275,8 @@ static void error(struct http_response *rs,
     rs->msg = nmem_strdup(c->nmem, msg);
     strcpy(rs->code, http_status);
 
-    wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX "<error code=\"%d\" msg=\"%s\">", (int) code,
-               msg);
+    wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX
+                 "<error code=\"%d\" msg=\"%s\">", (int) code, msg);
     if (addinfo)
         wrbuf_xmlputs(text, addinfo);
     wrbuf_puts(text, "</error>");
@@ -481,8 +482,9 @@ static void cmd_init(struct http_channel *c)
     wrbuf_puts(c->wrbuf, "</session>"
                "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>");
 
-    wrbuf_printf(c->wrbuf, "<keepAlive>%d</keepAlive>\n", 1000 * ((s->psession->service->session_timeout >= 20) ?
-                                                                  (s->psession->service->session_timeout - 10) : 50));
+    wrbuf_printf(c->wrbuf, "<keepAlive>%d</keepAlive>\n",
+                 1000 * ((s->psession->service->session_timeout >= 20) ?
+                         (s->psession->service->session_timeout - 10) : 50));
     response_close(c, "init");
 }
 
@@ -515,7 +517,7 @@ static void cmd_settings(struct http_channel *c)
         if (!doc)
         {
             error(rs, PAZPAR2_MALFORMED_SETTING, 0);
-            release_session(c,s);
+            release_session(c, s);
             return;
         }
         root_n = xmlDocGetRootElement(doc);
@@ -524,7 +526,7 @@ static void cmd_settings(struct http_channel *c)
         if (ret)
         {
             error(rs, PAZPAR2_MALFORMED_SETTING, 0);
-            release_session(c,s);
+            release_session(c, s);
             return;
         }
     }
@@ -538,7 +540,8 @@ static void cmd_settings(struct http_channel *c)
     release_session(c, s);
 }
 
-static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status)
+static void termlist_response(struct http_channel *c, struct http_session *s,
+                              const char *cmd_status)
 {
     struct http_request *rq = c->request;
     const char *name    = http_argbyname(rq, "name");
@@ -577,7 +580,7 @@ static void termlist_result_ready(void *data)
         session_log(s->psession, c->http_sessions->log_level,
                     "termlist watch released");
         termlist_response(c, s, status);
-        release_session(c,s);
+        release_session(c, s);
     }
 }
 
@@ -644,8 +647,10 @@ size_t session_get_memory_status(struct session *session);
 static void session_status(struct http_channel *c, struct http_session *s)
 {
     size_t session_nmem;
-    wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n", s->activity_counter);
-    wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n", nmem_total(s->nmem) );
+    wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n",
+                 s->activity_counter);
+    wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n",
+                 nmem_total(s->nmem) );
     session_nmem = session_get_memory_status(s->psession);
     wrbuf_printf(c->wrbuf, "<session_nmem>%zu</session_nmem>\n", session_nmem);
 }
@@ -653,24 +658,12 @@ static void session_status(struct http_channel *c, struct http_session *s)
 static void cmd_service(struct http_channel *c)
 {
     struct http_session *s = locate_session(c);
-    xmlNode *xml_node;
     if (!s)
         return;
 
     response_open_command(c, 0);
-    xml_node = s->psession->service->xml_node;
-    if (xml_node)
-    {
-        xmlNode *tmp = xmlCopyNode(xml_node, 1);
-        xmlBufferPtr buf = xmlBufferCreate();
-
-        xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
-
-        wrbuf_write(c->wrbuf, (const char *) buf->content, buf->use);
-        xmlBufferFree(buf);
-        xmlFreeNode(tmp);
-    }
-
+    if (s->psession->service->xml_node)
+        wrbuf_puts(c->wrbuf, s->psession->service->xml_node);
     response_close(c, 0);
     release_session(c, s);
 }
@@ -687,8 +680,6 @@ static void cmd_session_status(struct http_channel *c)
     release_session(c, s);
 }
 
-int sessions_count(void);
-int clients_count(void);
 #ifdef HAVE_RESULTSETS_COUNT
 int resultsets_count(void);
 #else
@@ -730,17 +721,20 @@ static void cmd_server_status(struct http_channel *c)
     xmalloc_trav(0);
 }
 
-static void bytarget_response(struct http_channel *c, struct http_session *s, const char *cmd_status) {
+static void bytarget_response(struct http_channel *c, struct http_session *s,
+                              const char *cmd_status)
+{
     int count, i;
-    struct hitsbytarget *ht;
     struct http_request *rq = c->request;
     const char *settings = http_argbyname(rq, "settings");
     int version = get_version(rq);
-    ht = get_hitsbytarget(s->psession, &count, c->nmem);
+    struct hitsbytarget *ht = get_hitsbytarget(s->psession, &count, c->nmem);
+
     if (!cmd_status)
         /* Old protocol, always ok */
         response_open_ok(c, "bytarget");
-    else {
+    else
+    {
         /* New protocol, OK or WARNING (...)*/
         response_open_command(c, "bytarget");
         wrbuf_printf(c->wrbuf, "<status>%s</status>", cmd_status);
@@ -765,7 +759,8 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
         }
 
         wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", ht[i].hits);
-        wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+        wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n",
+                     ht[i].diagnostic);
         if (ht[i].diagnostic)
         {
             wrbuf_puts(c->wrbuf, "<message>");
@@ -777,10 +772,13 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
             wrbuf_puts(c->wrbuf, "</addinfo>\n");
         }
 
-        wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records - ht[i].filtered);
-        if (version >= 2) {
+        wrbuf_printf(c->wrbuf, "<records>%d</records>\n",
+                     ht[i].records - ht[i].filtered);
+        if (version >= 2)
+        {
             wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
-            wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", ht[i].approximation);
+            wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+                         "</approximation>\n", ht[i].approximation);
         }
         wrbuf_puts(c->wrbuf, "<state>");
         wrbuf_xmlputs(c->wrbuf, ht[i].state);
@@ -791,7 +789,8 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
             wrbuf_puts(c->wrbuf, ht[i].settings_xml);
             wrbuf_puts(c->wrbuf, "</settings>\n");
         }
-        if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) {
+        if (ht[i].suggestions_xml && ht[i].suggestions_xml[0])
+        {
             wrbuf_puts(c->wrbuf, "<suggestions>");
             wrbuf_puts(c->wrbuf, ht[i].suggestions_xml);
             wrbuf_puts(c->wrbuf, "</suggestions>");
@@ -856,10 +855,9 @@ static void cmd_bytarget(struct http_channel *c)
             }
             else if (report_status)
                 status_message = "WARNING (Already blocked on bytarget)";
-            else {
+            else
                 session_log(s->psession, YLOG_WARN, "Ignoring bytarget block."
                             " Return current result.");
-            }
         }
         else
         {
@@ -874,7 +872,8 @@ static void cmd_bytarget(struct http_channel *c)
 }
 
 static void write_metadata(WRBUF w, struct conf_service *service,
-                           struct record_metadata **ml, int full, int indent)
+                           struct record_metadata **ml, unsigned flags,
+                           int indent)
 {
     int imeta;
 
@@ -882,7 +881,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
     {
         struct conf_metadata *cmd = &service->metadata[imeta];
         struct record_metadata *md;
-        if (!cmd->brief && !full)
+        if (!cmd->brief && !(flags & 1))
             continue;
         for (md = ml[imeta]; md; md = md->next)
         {
@@ -902,7 +901,10 @@ static void write_metadata(WRBUF w, struct conf_service *service,
             switch (cmd->type)
             {
                 case Metadata_type_generic:
-                    wrbuf_xmlputs(w, md->data.text.disp);
+                    if (md->data.text.snippet && (flags & 2))
+                        wrbuf_puts(w, md->data.text.snippet);
+                    else
+                        wrbuf_xmlputs(w, md->data.text.disp);
                     break;
                 case Metadata_type_year:
                     wrbuf_printf(w, "%d", md->data.number.min);
@@ -919,7 +921,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)
+                            struct conf_service *service, unsigned flags,
+                            int indent)
 {
     const char *name = session_setting_oneval(
         client_get_database(r->client), PZ_NAME);
@@ -936,7 +939,7 @@ static void write_subrecord(struct record *r, WRBUF w,
     wrbuf_printf(w,  "%u", r->checksum);
     wrbuf_puts(w, "\">\n");
 
-    write_metadata(w, service, r->metadata, show_details, 2);
+    write_metadata(w, service, r->metadata, flags, indent);
     wrbuf_puts(w, " </location>\n");
 }
 
@@ -999,6 +1002,8 @@ static void show_record(struct http_channel *c, struct http_session *s)
     const char *offsetstr = http_argbyname(rq, "offset");
     const char *binarystr = http_argbyname(rq, "binary");
     const char *checksumstr = http_argbyname(rq, "checksum");
+    const char *snippets = http_argbyname(rq, "snippets");
+    unsigned flags = (snippets && *snippets == '1') ? 3 : 1;
 
     if (!s)
         return;
@@ -1092,9 +1097,9 @@ static void show_record(struct http_channel *c, struct http_session *s)
         }
         wrbuf_printf(c->wrbuf, " <activeclients>%d</activeclients>\n",
                      session_active_clients(s->psession));
-        write_metadata(c->wrbuf, service, rec->metadata, 1, 1);
+        write_metadata(c->wrbuf, service, rec->metadata, flags, 1);
         for (r = rec->records; r; r = r->next)
-            write_subrecord(r, c->wrbuf, service, 2);
+            write_subrecord(r, c->wrbuf, service, flags, 2);
         response_close(c, "record");
     }
     show_single_stop(s->psession, rec);
@@ -1109,21 +1114,23 @@ static void cmd_record_ready(void *data)
         session_log(s->psession, c->http_sessions->log_level,
                     "record watch released");
         show_record(c, s);
-        release_session(c,s);
+        release_session(c, s);
     }
 }
 
 static void cmd_record(struct http_channel *c)
 {
     struct http_session *s = locate_session(c);
-    if (s) {
+    if (s)
+    {
         show_record(c, s);
-        release_session(c,s);
+        release_session(c, s);
     }
 }
 
 
-static void show_records(struct http_channel *c, struct http_session *s, int active)
+static void show_records(struct http_channel *c, struct http_session *s,
+                         int active)
 {
     struct http_request *rq = c->request;
     struct http_response *rs = c->response;
@@ -1133,6 +1140,8 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
     const char *num = http_argbyname(rq, "num");
     const char *sort = http_argbyname(rq, "sort");
     int version = get_version(rq);
+    const char *snippets = http_argbyname(rq, "snippets");
+    unsigned flags = (snippets && *snippets == '1') ? 2 : 0;
 
     int startn = 0;
     int numn = 20;
@@ -1154,9 +1163,8 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
         numn = atoi(num);
 
     service = s->psession->service;
-    if (!sort) {
+    if (!sort)
         sort = service->default_sort;
-    }
     if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
@@ -1173,9 +1181,10 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
     wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);
     wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
     wrbuf_printf(c->wrbuf, "<total>" ODR_INT_PRINTF "</total>\n", total_hits);
-    if (version >= 2) {
-        wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", approx_hits);
-    }
+    if (version >= 2)
+        wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+                     "</approximation>\n", approx_hits);
+
     wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
     wrbuf_printf(c->wrbuf, "<num>%d</num>\n", numn);
 
@@ -1187,9 +1196,9 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
         struct conf_service *service = s->psession->service;
 
         wrbuf_puts(c->wrbuf, "<hit>\n");
-        write_metadata(c->wrbuf, service, rec->metadata, 0, 1);
+        write_metadata(c->wrbuf, service, rec->metadata, flags, 1);
         for (ccount = 0, p = rl[i]->records; p;  p = p->next, ccount++)
-            write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
+            write_subrecord(p, c->wrbuf, service, flags, 2);
         wrbuf_printf(c->wrbuf, " <count>%d</count>\n", ccount);
 	if (strstr(sort, "relevance"))
         {
@@ -1227,7 +1236,7 @@ static void show_records_ready(void *data)
     else {
         /* some error message  */
     }
-    release_session(c,s);
+    release_session(c, s);
 }
 
 static void cmd_show(struct http_channel *c)
@@ -1241,21 +1250,17 @@ static void cmd_show(struct http_channel *c)
     const char *mergekey = http_argbyname(rq, "mergekey");
     const char *rank = http_argbyname(rq, "rank");
     struct conf_service *service = 0;
-
     struct reclist_sortparms *sp;
     int status;
     int report_error = 0;
-    if (block_error && !strcmp("1", block_error)) {
+
+    if (block_error && !strcmp("1", block_error))
         report_error = 1;
-    }
     if (!s)
         return;
-
     service = s->psession->service;
-    if (!sort) {
+    if (!sort)
         sort = service->default_sort;
-    }
-
     if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
     {
         error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
@@ -1268,7 +1273,9 @@ static void cmd_show(struct http_channel *c)
 
     if (block)
     {
-        if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0)
+        if (!strcmp(block, "preferred")
+            && !session_is_preferred_clients_ready(s->psession)
+            && reclist_get_num_records(s->psession->reclist) == 0)
         {
             // if there is already a watch/block. we do not block this one
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
@@ -1373,9 +1380,9 @@ static void cmd_search(struct http_channel *c)
         return;
     }
     service = s->psession->service;
-    if (!sort) {
+    if (!sort)
         sort = service->default_sort;
-    }
+
     if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
     {
         error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");