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;
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");
}
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 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 */
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");
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;
}
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;
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,
}
else
{
+ struct record *r;
response_open_no_status(c, "record");
wrbuf_puts(c->wrbuf, "\n<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
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)
}
- 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);
const char *block = http_argbyname(rq, "block");
const char *sort = http_argbyname(rq, "sort");
const char *block_error = http_argbyname(rq, "report");
+
struct reclist_sortparms *sp;
int status;
int report_error = 0;
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);
status = session_active_clients(s->psession);