-/* $Id: http_command.c,v 1.35 2007-04-15 03:26:47 quinn Exp $
+/* $Id: http_command.c,v 1.41 2007-04-23 21:05:23 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
*/
/*
- * $Id: http_command.c,v 1.35 2007-04-15 03:26:47 quinn Exp $
+ * $Id: http_command.c,v 1.41 2007-04-23 21:05:23 adam Exp $
*/
#include <stdio.h>
#include "http.h"
#include "http_command.h"
#include "settings.h"
+#include "client.h"
-extern struct parameters global_parameters;
-extern IOCHAN channel_list;
+// Update this when the protocol changes
+#define PAZPAR2_PROTOCOL_VERSION "1"
struct http_session {
IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket
r->timeout_iochan = iochan_create(-1, session_timeout, 0);
iochan_setdata(r->timeout_iochan, r);
iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout);
- r->timeout_iochan->next = channel_list;
- channel_list = r->timeout_iochan;
+
+ pazpar2_add_channel(r->timeout_iochan);
return r;
}
s->session_id = sesid;
if (process_settings(s->psession, c->request, c->response) < 0)
return;
- sprintf(buf, "<init><status>OK</status><session>%u</session></init>", sesid);
+ sprintf(buf, "<init><status>OK</status><session>%u</session>"
+ "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>", sesid);
rs->payload = nmem_strdup(c->nmem, buf);
http_send_response(c);
}
continue;
for (md = ml[imeta]; md; md = md->next)
{
- wrbuf_printf(w, "<md-%s>", cmd->name);
+ wrbuf_printf(w, "\n<md-%s>", cmd->name);
switch (cmd->type)
{
case Metadata_type_generic:
static void write_subrecord(struct record *r, WRBUF w,
struct conf_service *service, int show_details)
{
- char *name = session_setting_oneval(r->client->database, PZ_NAME);
+ char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME);
- wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">\n",
- r->client->database->database->url,
+ wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
+ client_get_database(r->client)->database->url,
*name ? name : "Unknown");
if (show_details)
write_metadata(w, service, r->metadata, 1);