From c960335069adabbefef43989d28594ce69cc457f Mon Sep 17 00:00:00 2001 From: Marc Cromme Date: Tue, 5 Jun 2007 13:36:40 +0000 Subject: [PATCH] Changed all wrbuf_printf statements involving strings, like wrbuf_printf(wrbuf, "%s\n", ht[i].id); to the save XML entity-encoded form using wrbuf_xmlputs(..). Left all wrbuf_printf statements involving integers as they are, for example wrbuf_printf(c->wrbuf, "%d\n", stat.num_hits); as these can not go wrong with the 5 XML entities. Tested, and working, Bug #1163 closed. --- src/http_command.c | 65 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/src/http_command.c b/src/http_command.c index 0c660b6..ec50740 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,4 +1,4 @@ -/* $Id: http_command.c,v 1.45 2007-06-04 14:27:48 adam Exp $ +/* $Id: http_command.c,v 1.46 2007-06-05 13:36:40 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.45 2007-06-04 14:27:48 adam Exp $ + * $Id: http_command.c,v 1.46 2007-06-05 13:36:40 marc Exp $ */ #include @@ -258,16 +258,26 @@ 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\n"); - wrbuf_printf(wrbuf, "%s\n", ht[i].id); + wrbuf_puts(wrbuf, "\n"); + + //wrbuf_printf(wrbuf, "%s\n", ht[i].id); + wrbuf_puts(wrbuf, ""); + wrbuf_xmlputs(wrbuf, ht[i].id); + wrbuf_puts(wrbuf, "\n"); + wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].name); wrbuf_puts(wrbuf, "\n"); wrbuf_printf(wrbuf, "%d\n", ht[i].hits); - wrbuf_printf(wrbuf, "%s\n", ht[i].state); + + //wrbuf_printf(wrbuf, "%s\n", ht[i].state); + wrbuf_puts(wrbuf, ""); + wrbuf_xmlputs(wrbuf, ht[i].state); + wrbuf_puts(wrbuf, "\n"); + wrbuf_printf(wrbuf, "%d\n", ht[i].diagnostic); - wrbuf_puts(wrbuf, "\n\n"); + wrbuf_puts(wrbuf, "\n"); } } @@ -362,11 +372,21 @@ static void cmd_bytarget(struct http_channel *c) for (i = 0; i < count; i++) { wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%s\n", ht[i].id); + + //wrbuf_printf(c->wrbuf, "%s\n", ht[i].id); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].id); + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_printf(c->wrbuf, "%d\n", ht[i].hits); wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic); wrbuf_printf(c->wrbuf, "%d\n", ht[i].records); - wrbuf_printf(c->wrbuf, "%s\n", ht[i].state); + + //wrbuf_printf(c->wrbuf, "%s\n", ht[i].state); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].state); + wrbuf_puts(c->wrbuf, "wrbuf, ""); } @@ -389,6 +409,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, for (md = ml[imeta]; md; md = md->next) { wrbuf_printf(w, "\n", cmd->name); + switch (cmd->type) { case Metadata_type_generic: @@ -412,14 +433,14 @@ static void write_subrecord(struct record *r, WRBUF w, { char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME); - wrbuf_printf(w, "client)->database->url); wrbuf_puts(w, "\" "); - wrbuf_printf(w, "name=\""); - + wrbuf_puts(w, "name=\""); wrbuf_xmlputs(w, *name ? name : "Unknown"); - wrbuf_printf(w, "\">"); + wrbuf_puts(w, "\">"); + if (show_details) write_metadata(w, service, r->metadata, 1); wrbuf_puts(w, "\n"); @@ -668,13 +689,23 @@ static void cmd_info(struct http_channel *c) wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, " \n"); - wrbuf_printf(c->wrbuf, " %s\n", VERSION); + wrbuf_puts(c->wrbuf, " \n"); + //wrbuf_printf(c->wrbuf, " %s\n", VERSION); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, VERSION); + wrbuf_puts(c->wrbuf, ""); + yaz_version(yaz_version_str, 0); - wrbuf_printf(c->wrbuf, " %s\n", - YAZ_VERSION, yaz_version_str); - wrbuf_printf(c->wrbuf, " \n"); + //wrbuf_printf(c->wrbuf, " %s\n", + // YAZ_VERSION, yaz_version_str); + wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION); + wrbuf_puts(c->wrbuf, "\">"); + wrbuf_xmlputs(c->wrbuf, yaz_version_str); + wrbuf_puts(c->wrbuf, "\n"); + + wrbuf_puts(c->wrbuf, " \n"); wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); -- 1.7.10.4