/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#ifndef PAZPAR2_H
#define PAZPAR2_H
-
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-
#include <yaz/comstack.h>
#include <yaz/pquery.h>
#include <yaz/ccl.h>
{
struct database *database;
struct setting **settings;
+#ifdef RETIRED
yaz_marc_t yaz_marc;
+#endif
struct database_retrievalmap *map;
struct session_database *next;
};
// End-user session
struct session {
+ struct conf_service *service; /* service in use for this session */
struct session_database *databases; // All databases, settings overriden
struct client *clients; // Clients connected for current search
- int requestid;
NMEM session_nmem; // Nmem for session-permanent storage
NMEM nmem; // Nmem for each operation (i.e. search, result set, etc)
WRBUF wrbuf; // Wrbuf for scratch(i.e. search)
int total_hits;
int total_records;
int total_merged;
+ int number_of_warnings_unknown_elements;
+ int number_of_warnings_unknown_metadata;
};
struct statistics {
int num_clients;
int num_no_connection;
int num_connecting;
- int num_initializing;
- int num_searching;
- int num_presenting;
+ int num_working;
int num_idle;
int num_failed;
int num_error;
struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem);
int select_targets(struct session *se, struct database_criterion *crit);
-struct session *new_session(NMEM nmem);
+struct session *new_session(NMEM nmem, struct conf_service *service);
void destroy_session(struct session *s);
void session_init_databases(struct session *s);
int load_targets(struct session *s, const char *fn);
void statistics(struct session *s, struct statistics *stat);
-enum pazpar2_error_code search(struct session *s, char *query,
- char *filter, const char **addinfo);
+enum pazpar2_error_code search(struct session *s, const char *query,
+ const char *filter, const char **addinfo);
struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
int *num, int *total, int *sumhits, NMEM nmem_show);
-struct record_cluster *show_single(struct session *s, const char *id);
+struct record_cluster *show_single(struct session *s, const char *id,
+ struct record_cluster **prev_r,
+ struct record_cluster **next_r);
struct termlist_score **termlist(struct session *s, const char *name, int *num);
int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c);
int session_active_clients(struct session *s);
void session_apply_setting(struct session *se, char *dbname, char *setting, char *value);
const char *session_setting_oneval(struct session_database *db, int offset);
-void start_http_listener(void);
-void start_proxy(void);
-
void pazpar2_add_channel(IOCHAN c);
void pazpar2_event_loop(void);
int host_getaddrinfo(struct host *host);
xmlDoc *normalize_record(struct session_database *sdb, struct session *se,
- Z_External *rec);
-xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec);
+ const char *rec);
+xmlDoc *record_to_xml(struct session_database *sdb, const char *rec);
-struct record *ingest_record(struct client *cl, Z_External *rec,
+struct record *ingest_record(struct client *cl, const char *rec,
int record_no);
void session_alert_watch(struct session *s, int what);
void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+