X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=6c5732e7cab6ed79645558b1ace0d95908dc571e;hb=718871f39107d802b59a0fb7f6bc6feefb298c49;hp=aa73f9149e70e89ed56216a58b713798e838077d;hpb=cff44dfd4f1d9a2e21299839d0337d103e074d29;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index aa73f91..6c5732e 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -49,16 +49,16 @@ void print_meminfo(WRBUF wrbuf)
struct mallinfo minfo;
minfo = mallinfo();
wrbuf_printf(wrbuf, " \n"
- " %d\n"
+ " %d\n"
" %d\n"
" %d\n"
" %d\n"
" %d\n"
- " %d\n"
+ " %d\n"
" %d\n"
" %d\n"
" %d\n"
- " \n",
+ " \n",
minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
}
@@ -253,7 +253,7 @@ static const char *get_msg(enum pazpar2_error_code code)
return "No error";
}
-static void error(struct http_response *rs,
+static void error(struct http_response *rs,
enum pazpar2_error_code code,
const char *addinfo)
{
@@ -261,7 +261,7 @@ static void error(struct http_response *rs,
WRBUF text = wrbuf_alloc();
const char *http_status = "417";
const char *msg = get_msg(code);
-
+
rs->msg = nmem_strdup(c->nmem, msg);
strcpy(rs->code, http_status);
@@ -320,7 +320,7 @@ unsigned int make_sessionid(void)
yaz_log(YLOG_WARN|YLOG_ERRNO, "gettimeofday");
exit(1);
}
- /* at most 256 sessions per second ..
+ /* at most 256 sessions per second ..
(long long would be more appropriate)*/
res = t.tv_sec;
res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
@@ -417,8 +417,8 @@ static void cmd_init(struct http_channel *c)
struct http_session *s;
struct http_response *rs = c->response;
struct conf_service *service = 0; /* no service (yet) */
-
- if (r->content_len && content_type &&
+
+ if (r->content_len && content_type &&
!yaz_strcmp_del("text/xml", content_type, "; "))
{
xmlDoc *doc = xmlParseMemory(r->content_buf, r->content_len);
@@ -437,7 +437,7 @@ static void cmd_init(struct http_channel *c)
return;
}
}
-
+
if (!service)
{
const char *service_name = http_argbyname(c->request, "service");
@@ -450,13 +450,13 @@ static void cmd_init(struct http_channel *c)
}
sesid = make_sessionid();
s = http_session_create(service, c->http_sessions, sesid);
-
+
yaz_log(c->http_sessions->log_level, "Session init %u ", sesid);
if (!clear || *clear == '0')
session_init_databases(s->psession);
else
yaz_log(YLOG_LOG, "Session %u init: No databases preloaded", sesid);
-
+
if (process_settings(s->psession, c->request, c->response) < 0)
return;
@@ -469,7 +469,7 @@ static void cmd_init(struct http_channel *c)
}
wrbuf_puts(c->wrbuf, ""
"" PAZPAR2_PROTOCOL_VERSION "");
-
+
wrbuf_printf(c->wrbuf, "%d\n", 1000 * ((s->psession->service->session_timeout >= 20) ?
(s->psession->service->session_timeout - 10) : 50));
response_close(c, "init");
@@ -495,7 +495,7 @@ static void cmd_settings(struct http_channel *c)
if (!s)
return;
- if (rq->content_len && content_type &&
+ if (rq->content_len && content_type &&
!yaz_strcmp_del("text/xml", content_type, "; "))
{
xmlDoc *doc = xmlParseMemory(rq->content_buf, rq->content_len);
@@ -515,7 +515,7 @@ static void cmd_settings(struct http_channel *c)
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
release_session(c,s);
return;
- }
+ }
}
if (process_settings(s->psession, rq, rs) < 0)
{
@@ -715,7 +715,7 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "\n");
- if (ht[i].name && ht[i].name[0])
+ if (ht[i].name && ht[i].name[0])
{
wrbuf_puts(c->wrbuf, "");
wrbuf_xmlputs(c->wrbuf, ht[i].name);
@@ -948,7 +948,7 @@ 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");
-
+
if (!s)
return;
service = s->psession->service;
@@ -979,7 +979,7 @@ static void show_record(struct http_channel *c, struct http_session *s)
struct record*r = rec->records;
int binary = 0;
const char *nativesyntax = http_argbyname(rq, "nativesyntax");
-
+
if (binarystr && *binarystr != '0')
binary = 1;
@@ -1008,8 +1008,8 @@ static void show_record(struct http_channel *c, struct http_session *s)
syntax, esn,
obs /* data */,
show_raw_record_error,
- (binary ?
- show_raw_record_ok_binary :
+ (binary ?
+ show_raw_record_ok_binary :
show_raw_record_ok),
(binary ? 1 : 0),
nativesyntax);
@@ -1039,7 +1039,7 @@ static void show_record(struct http_channel *c, struct http_session *s)
wrbuf_xmlputs(c->wrbuf, next_r->recid);
wrbuf_puts(c->wrbuf, "\n");
}
- wrbuf_printf(c->wrbuf, "%d\n",
+ wrbuf_printf(c->wrbuf, "%d\n",
session_active_clients(s->psession));
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
@@ -1087,7 +1087,7 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
Odr_int total_hits;
Odr_int approx_hits;
int i;
-
+ struct conf_service *service = 0;
if (!s)
return;
@@ -1099,15 +1099,18 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
startn = atoi(start);
if (num)
numn = atoi(num);
- if (!sort)
- sort = "relevance";
- if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+
+ service = s->psession->service;
+ if (!sort) {
+ sort = service->default_sort;
+ }
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
{
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
return;
}
-
+
rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits, &approx_hits);
response_open(c, "show");
@@ -1169,27 +1172,29 @@ static void cmd_show(struct http_channel *c)
const char *block = http_argbyname(rq, "block");
const char *sort = http_argbyname(rq, "sort");
const char *block_error = http_argbyname(rq, "report");
+ struct conf_service *service = 0;
struct reclist_sortparms *sp;
int status;
int report_error = 0;
if (block_error && !strcmp("1", block_error)) {
report_error = 1;
- }
+ }
if (!s)
return;
- if (!sort)
- sort = "relevance";
-
- if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+ service = s->psession->service;
+ if (!sort) {
+ sort = service->default_sort;
+ }
+
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
{
error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
}
- session_sort(s->psession, sp->name, sp->increasing,
- sp->type == Metadata_sortkey_position);
+ session_sort(s->psession, sp->name, sp->increasing, sp->type == Metadata_sortkey_position);
status = session_active_clients(s->psession);
@@ -1208,7 +1213,7 @@ static void cmd_show(struct http_channel *c)
}
else
{
- yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show (preferred targets) block. Not supported!",
+ yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show (preferred targets) block. Not supported!",
s->session_id);
if (report_error) {
error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)");
@@ -1269,11 +1274,14 @@ static void cmd_search(struct http_channel *c)
const char *maxrecs = http_argbyname(rq, "maxrecs");
const char *startrecs = http_argbyname(rq, "startrecs");
const char *limit = http_argbyname(rq, "limit");
+ const char *sort = http_argbyname(rq, "sort");
enum pazpar2_error_code code;
const char *addinfo = 0;
+ struct reclist_sortparms *sp;
if (!s)
return;
+
if (!query)
{
error(rs, PAZPAR2_MISSING_PARAMETER, "query");
@@ -1286,8 +1294,17 @@ static void cmd_search(struct http_channel *c)
release_session(c, s);
return;
}
+ if (!sort)
+ sort = "relevance";
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+ {
+ error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
+ release_session(c, s);
+ return;
+ }
+
code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
- &addinfo, "relevance", 0);
+ &addinfo, sp);
if (code)
{
error(rs, code, addinfo);
@@ -1357,7 +1374,7 @@ static void cmd_info(struct http_channel *c)
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, " \n");
-
+
info_services(c->server, c->wrbuf);
response_close(c, "info");