struct mallinfo minfo;
minfo = mallinfo();
wrbuf_printf(wrbuf, " <memory>\n"
- " <arena>%d</arena>\n"
+ " <arena>%d</arena>\n"
" <uordblks>%d</uordblks>\n"
" <fordblks>%d</fordblks>\n"
" <ordblks>%d</ordblks>\n"
" <keepcost>%d</keepcost>\n"
- " <hblks>%d</hblks>\n"
+ " <hblks>%d</hblks>\n"
" <hblkhd>%d</hblkhd>\n"
" <virt>%d</virt>\n"
" <virtuse>%d</virtuse>\n"
- " </memory>\n",
+ " </memory>\n",
minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
}
static YAZ_MUTEX g_http_session_mutex = 0;
static int g_http_sessions = 0;
+int get_version(struct http_request *rq) {
+ const char *version = http_argbyname(rq, "version");
+ int version_no = 0;
+ if (version && strcmp(version, "")) {
+ version_no = atoi(version);
+ }
+ return version_no;
+}
+
+
int http_session_use(int delta)
{
int sessions;
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)
{
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);
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);
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);
return;
}
}
-
+
if (!service)
{
const char *service_name = http_argbyname(c->request, "service");
}
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;
}
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));
response_close(c, "init");
}
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);
xmlNode *root_n;
+ int ret;
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
return;
}
root_n = xmlDocGetRootElement(doc);
-
- settings_read_node_x(root_n, s->psession, apply_local_setting);
-
+ ret = settings_read_node_x(root_n, s->psession, apply_local_setting);
xmlFreeDoc(doc);
+ if (ret)
+ {
+ error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ release_session(c,s);
+ return;
+ }
}
if (process_settings(s->psession, rq, rs) < 0)
{
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");
- const char *nums = http_argbyname(rq, "num");
+ const char *name = http_argbyname(rq, "name");
+ const char *nums = http_argbyname(rq, "num");
+ int version = get_version(rq);
int num = 15;
int status;
}
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
- perform_termlist(c, s->psession, name, num);
+ perform_termlist(c, s->psession, name, num, version);
response_close(c, "termlist");
}
struct http_request *rq = c->request;
const char *report = http_argbyname(rq, "report");
const char *status = 0;
+ struct http_session *s = locate_session(c);
if (report && !strcmp("status", report))
status = "OK";
- struct http_session *s = locate_session(c);
if (s) {
yaz_log(c->http_sessions->log_level, "Session %u termlist watch released", s->session_id);
termlist_response(c, s, status);
const char *report = http_argbyname(rq, "report");
int report_status = 0;
int report_error = 0;
- const char *status_message;
+ const char *status_message = 0;
int active_clients;
if (report && !strcmp("error", report)) {
report_error = 1;
release_session(c, s);
return;
}
- if (report_status) {
+ else if (report_status) {
status_message = "WARNING (Already blocked on termlist)";
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring termlist block. Return current result", s->session_id);
+ }
}
else
{
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);
if (!cmd_status)
/* Old protocol, always ok */
else {
/* New protocol, OK or WARNING (...)*/
response_open_no_status(c, "bytarget");
- wrbuf_printf(c->wrbuf, "<status>%s</status>\n", cmd_status);
+ wrbuf_printf(c->wrbuf, "<status>%s</status>", cmd_status);
}
if (count == 0)
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "</id>\n");
- if (ht[i].name && ht[i].name[0])
+ if (ht[i].name && ht[i].name[0])
{
wrbuf_puts(c->wrbuf, "<name>");
wrbuf_xmlputs(c->wrbuf, ht[i].name);
wrbuf_puts(c->wrbuf, "</addinfo>\n");
}
- wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
-
+ 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_puts(c->wrbuf, "<state>");
wrbuf_xmlputs(c->wrbuf, ht[i].state);
wrbuf_puts(c->wrbuf, "</state>\n");
struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
const char *report = http_argbyname(rq, "report");
- int block_error = 0;
+ int report_error = 0;
int report_status = 0;
const char *status_message = "OK";
+ int no_active;
+
if (report && !strcmp("error", report)) {
- block_error = 1;
+ report_error = 1;
}
if (report && !strcmp("status", report)) {
report_status = 1;
}
- int no_active;
-
if (!s)
return;
bytarget_result_ready, c, c) != 0)
{
yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on bytarget block. Not supported!", s->session_id);
- if (block_error) {
+ if (report_error) {
error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget");
release_session(c, s);
return;
}
- if (report_status) {
+ else if (report_status) {
status_message = "WARNING (Already blocked on bytarget)";
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring bytarget block. Return current result.", s->session_id);
+ }
}
else
{
wrbuf_puts(w, "<location id=\"");
wrbuf_xmlputs(w, client_get_id(r->client));
- wrbuf_puts(w, "\" ");
+ wrbuf_puts(w, "\"\n");
- wrbuf_puts(w, "name=\"");
+ wrbuf_puts(w, " name=\"");
wrbuf_xmlputs(w, *name ? name : "Unknown");
+ wrbuf_puts(w, "\" ");
+
+ wrbuf_puts(w, "checksum=\"");
+ wrbuf_printf(w, "%u", r->checksum);
wrbuf_puts(w, "\">");
write_metadata(w, service, r->metadata, show_details);
struct http_response *rs = c->response;
struct http_request *rq = c->request;
struct record_cluster *rec, *prev_r, *next_r;
- struct record *r;
struct conf_service *service;
const char *idstr = http_argbyname(rq, "id");
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;
}
return;
}
- if (offsetstr)
+ if (offsetstr || checksumstr)
{
- int offset = atoi(offsetstr);
const char *syntax = http_argbyname(rq, "syntax");
const char *esn = http_argbyname(rq, "esn");
int i;
struct record*r = rec->records;
int binary = 0;
const char *nativesyntax = http_argbyname(rq, "nativesyntax");
-
+
if (binarystr && *binarystr != '0')
binary = 1;
- for (i = 0; i < offset && r; r = r->next, i++)
- ;
- if (!r)
+ if (checksumstr)
{
- error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
+ long v = atol(checksumstr);
+ for (i = 0; r; r = r->next)
+ if (v == r->checksum)
+ break;
+ if (!r)
+ error(rs, PAZPAR2_RECORD_FAIL, "no record");
}
else
{
+ int offset = atoi(offsetstr);
+ for (i = 0; i < offset && r; r = r->next, i++)
+ ;
+ if (!r)
+ error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
+ }
+ if (r)
+ {
http_channel_observer_t obs =
http_add_observer(c, r->client, show_raw_reset);
int ret = client_show_raw_begin(r->client, r->position,
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);
}
else
{
+ struct record *r;
response_open_no_status(c, "record");
wrbuf_puts(c->wrbuf, "\n<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_xmlputs(c->wrbuf, next_r->recid);
wrbuf_puts(c->wrbuf, "</nextrecid>\n");
}
- wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n",
+ wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n",
session_active_clients(s->psession));
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
const char *start = http_argbyname(rq, "start");
const char *num = http_argbyname(rq, "num");
const char *sort = http_argbyname(rq, "sort");
+ int version = get_version(rq);
+
int startn = 0;
int numn = 20;
int total;
Odr_int total_hits;
+ Odr_int approx_hits;
int i;
if (!s)
return;
}
-
- rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
+
+ rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits, &approx_hits);
response_open(c, "show");
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);
+ }
wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
wrbuf_printf(c->wrbuf, "<num>%d</num>\n", numn);
struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
const char *sort = http_argbyname(rq, "sort");
- const char *block_error = http_argbyname(rq, "error");
+ const char *block_error = http_argbyname(rq, "report");
+
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)))
{
error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
}
- session_sort(s->psession, sp->name, sp->increasing);
+ session_sort(s->psession, sp->name, sp->increasing, sp->type == Metadata_sortkey_position);
+ /* TODO This was too simple. Will make pazpar2 continuing reseting the session resultset and redo the search. Disable this for now
+ sp->type == Metadata_sortkey_position */
status = session_active_clients(s->psession);
}
else
{
- yaz_log(YLOG_WARN, "Attempt to block multiple times on show (preferred targets) block. Not supported!");
- if (block_error && !strcmp("1", block_error)) {
+ 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)");
release_session(c, s);
return;
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring show(preferred) block. Returning current result.", s->session_id);
+ }
}
}
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
show_records_ready, c, c) != 0)
{
- yaz_log(YLOG_WARN, "Attempt to block multiple times on show block. Not supported!");
- if (block_error && !strcmp("1", block_error)) {
+ yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show block. Not supported!", s->session_id);
+ if (report_error) {
error(rs, PAZPAR2_ALREADY_BLOCKED, "show");
release_session(c, s);
return;
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring show block. Returning current result.", s->session_id);
+ }
}
else
{
wrbuf_puts(c->wrbuf, "</yaz>\n");
wrbuf_puts(c->wrbuf, " </version>\n");
-
+
info_services(c->server, c->wrbuf);
response_close(c, "info");
projects / pazpar2-moved-to-github.git / blobdiff