projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning: ‘struct relevance’ declared inside parameter list
[pazpar2-moved-to-github.git]
/
src
/
http_command.c
diff --git
a/src/http_command.c
b/src/http_command.c
index
56e1f63
..
1273b8b
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-263,9
+263,9
@@
static const char *get_msg(enum pazpar2_error_code code)
return "No error";
}
return "No error";
}
-static void error(struct http_response *rs,
- enum pazpar2_error_code code,
- const char *addinfo)
+static void error2(struct http_response *rs,
+ enum pazpar2_error_code code,
+ const char *addinfo, const char *addinfo2)
{
struct http_channel *c = rs->channel;
WRBUF text = wrbuf_alloc();
{
struct http_channel *c = rs->channel;
WRBUF text = wrbuf_alloc();
@@
-278,7
+278,14
@@
static void error(struct http_response *rs,
wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX
"<error code=\"%d\" msg=\"%s\">", (int) code, msg);
if (addinfo)
wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX
"<error code=\"%d\" msg=\"%s\">", (int) code, msg);
if (addinfo)
+ {
wrbuf_xmlputs(text, addinfo);
wrbuf_xmlputs(text, addinfo);
+ if (addinfo2)
+ {
+ wrbuf_xmlputs(text, ": ");
+ wrbuf_xmlputs(text, addinfo2);
+ }
+ }
wrbuf_puts(text, "</error>");
yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status,
wrbuf_puts(text, "</error>");
yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status,
@@
-288,6
+295,13
@@
static void error(struct http_response *rs,
http_send_response(c);
}
http_send_response(c);
}
+static void error(struct http_response *rs,
+ enum pazpar2_error_code code,
+ const char *addinfo)
+{
+ error2(rs, code, addinfo, 0);
+}
+
static void response_open_command(struct http_channel *c, const char *command)
{
wrbuf_rewind(c->wrbuf);
static void response_open_command(struct http_channel *c, const char *command)
{
wrbuf_rewind(c->wrbuf);
@@
-872,7
+886,8
@@
static void cmd_bytarget(struct http_channel *c)
}
static void write_metadata(WRBUF w, struct conf_service *service,
}
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;
{
int imeta;
@@
-880,7
+895,7
@@
static void write_metadata(WRBUF w, struct conf_service *service,
{
struct conf_metadata *cmd = &service->metadata[imeta];
struct record_metadata *md;
{
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)
{
continue;
for (md = ml[imeta]; md; md = md->next)
{
@@
-900,7
+915,10
@@
static void write_metadata(WRBUF w, struct conf_service *service,
switch (cmd->type)
{
case Metadata_type_generic:
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);
break;
case Metadata_type_year:
wrbuf_printf(w, "%d", md->data.number.min);
@@
-917,7
+935,8
@@
static void write_metadata(WRBUF w, struct conf_service *service,
}
static void write_subrecord(struct record *r, WRBUF w,
}
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);
{
const char *name = session_setting_oneval(
client_get_database(r->client), PZ_NAME);
@@
-934,7
+953,7
@@
static void write_subrecord(struct record *r, WRBUF w,
wrbuf_printf(w, "%u", r->checksum);
wrbuf_puts(w, "\">\n");
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");
}
wrbuf_puts(w, " </location>\n");
}
@@
-997,6
+1016,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 *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;
if (!s)
return;
@@
-1090,9
+1111,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));
}
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)
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);
response_close(c, "record");
}
show_single_stop(s->psession, rec);
@@
-1133,6
+1154,8
@@
static void show_records(struct http_channel *c, struct http_session *s,
const char *num = http_argbyname(rq, "num");
const char *sort = http_argbyname(rq, "sort");
int version = get_version(rq);
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;
int startn = 0;
int numn = 20;
@@
-1187,9
+1210,9
@@
static void show_records(struct http_channel *c, struct http_session *s,
struct conf_service *service = s->psession->service;
wrbuf_puts(c->wrbuf, "<hit>\n");
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++)
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"))
{
wrbuf_printf(c->wrbuf, " <count>%d</count>\n", ccount);
if (strstr(sort, "relevance"))
{
@@
-1352,6
+1375,7
@@
static void cmd_search(struct http_channel *c)
const char *rank = http_argbyname(rq, "rank");
enum pazpar2_error_code code;
const char *addinfo = 0;
const char *rank = http_argbyname(rq, "rank");
enum pazpar2_error_code code;
const char *addinfo = 0;
+ const char *addinfo2 = 0;
struct reclist_sortparms *sp;
struct conf_service *service = 0;
struct reclist_sortparms *sp;
struct conf_service *service = 0;
@@
-1382,10
+1406,10
@@
static void cmd_search(struct http_channel *c)
}
code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
}
code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
- &addinfo, sp, mergekey, rank);
+ &addinfo, &addinfo2, sp, mergekey, rank);
if (code)
{
if (code)
{
- error(rs, code, addinfo);
+ error2(rs, code, addinfo, addinfo2);
release_session(c, s);
return;
}
release_session(c, s);
return;
}