X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=4a9c26a0c0b1dfbd3c0aeba7c5e70ae34b2522bd;hb=384d5cac78251cf68841040384ca0fa8912178c7;hp=0e69b2c18d9709ea39c069c358e172c730e7a4c2;hpb=4d488222cc06d4329916b4c8365cd9ac7c534455;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.h b/src/pazpar2.h index 0e69b2c..4a9c26a 100644 --- a/src/pazpar2.h +++ b/src/pazpar2.h @@ -1,7 +1,5 @@ -/* $Id: pazpar2.h,v 1.40 2007-06-13 08:04:03 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2010 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 @@ -14,31 +12,23 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #ifndef PAZPAR2_H #define PAZPAR2_H - -#include - -#include -#include - #include #include #include #include #include "termlists.h" -#include "relevance.h" #include "reclists.h" -#include "eventl.h" -#include "config.h" -#include "parameters.h" +#include "pazpar2_config.h" +#include "http.h" struct record; struct client; @@ -55,9 +45,15 @@ enum pazpar2_error_code { PAZPAR2_HITCOUNTS_FAILED, PAZPAR2_RECORD_MISSING, PAZPAR2_NO_TARGETS, - PAZPAR2_CONFIG_TARGET + PAZPAR2_CONFIG_TARGET, + PAZPAR2_RECORD_FAIL, + PAZPAR2_NOT_IMPLEMENTED, + PAZPAR2_NO_SERVICE, + + PAZPAR2_LAST_ERROR }; +struct host; // Represents a (virtual) database on a host struct database { struct host *host; @@ -65,42 +61,26 @@ struct database { char **databases; int errors; struct zr_explain *explain; + int num_settings; struct setting **settings; struct database *next; }; -struct database_criterion_value { - char *value; - struct database_criterion_value *next; -}; - -struct database_criterion { - char *name; - struct database_criterion_value *values; - struct database_criterion *next; -}; - -// Normalization filter. Turns incoming record into internal representation -// Simple sequence of stylesheets run in series. -struct database_retrievalmap { - xsltStylesheet *stylesheet; - struct database_retrievalmap *next; -}; // Represents a database as viewed from one session, possibly with settings overriden // for that session struct session_database { - pp2_charset_t pct; struct database *database; + int num_settings; struct setting **settings; - yaz_marc_t yaz_marc; - struct database_retrievalmap *map; + normalize_record_t map; struct session_database *next; }; -#define SESSION_WATCH_RECORDS 0 -#define SESSION_WATCH_MAX 0 +#define SESSION_WATCH_SHOW 0 +#define SESSION_WATCH_RECORD 1 +#define SESSION_WATCH_MAX 1 #define SESSION_MAX_TERMLISTS 10 @@ -112,11 +92,17 @@ struct named_termlist struct termlist *termlist; }; +struct session_watchentry { + void *data; + http_channel_observer_t obs; + session_watchfun fun; +}; + // 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) @@ -124,84 +110,76 @@ struct session { struct named_termlist termlists[SESSION_MAX_TERMLISTS]; struct relevance *relevance; struct reclist *reclist; - struct { - void *data; - session_watchfun fun; - } watchlist[SESSION_WATCH_MAX + 1]; - int expected_maxrecs; - int total_hits; + struct session_watchentry watchlist[SESSION_WATCH_MAX + 1]; + Odr_int total_hits; int total_records; int total_merged; + int number_of_warnings_unknown_elements; + int number_of_warnings_unknown_metadata; + normalize_cache_t normalize_cache; }; 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; - int num_hits; + Odr_int num_hits; int num_records; }; struct hitsbytarget { char *id; - char *name; - int hits; + const char *name; + Odr_int hits; int diagnostic; int records; const char *state; int connected; + WRBUF settings_xml; }; -struct hitsbytarget *hitsbytarget(struct session *s, int *count); -int select_targets(struct session *se, struct database_criterion *crit); -struct session *new_session(NMEM nmem); +struct hitsbytarget *hitsbytarget(struct session *s, int *count, 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 *startrecs, const char *maxrecs, + 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, int id); + int *num, int *total, Odr_int *sumhits, NMEM nmem_show); +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); -void session_set_watch(struct session *s, int what, session_watchfun fun, void *data); +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); -char *session_setting_oneval(struct session_database *db, int offset); - -void start_http_listener(void); -void start_proxy(void); -//void start_zproxy(void); +const char *session_setting_oneval(struct session_database *db, int offset); void pazpar2_add_channel(IOCHAN c); void pazpar2_event_loop(void); int host_getaddrinfo(struct host *host); -xmlDoc *normalize_record(struct session_database *sdb, Z_External *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); -int pazpar2_process(int debug, - void (*work)(void *data), void *data, - const char *pidfile, const char *uid); - - #endif /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +