X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=ad25df698d715a66d0d81aac60a63da1b24a9a6f;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=38f566b301759e2e09fe90bf062ce31f107261f0;hpb=babf401143ef8da84a8dd137ac6425b9c4c482ba;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.h b/src/pazpar2.h index 38f566b..ad25df6 100644 --- a/src/pazpar2.h +++ b/src/pazpar2.h @@ -1,7 +1,5 @@ -/* $Id: pazpar2.h,v 1.43 2007-06-18 11:10:20 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + 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 @@ -14,20 +12,14 @@ 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 @@ -37,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "relevance.h" #include "reclists.h" #include "eventl.h" -#include "config.h" +#include "pazpar2_config.h" #include "parameters.h" #include "http.h" @@ -96,16 +88,20 @@ struct database_retrievalmap { // for that session struct session_database { - pp2_charset_t pct; struct database *database; struct setting **settings; +#ifdef RETIRED yaz_marc_t yaz_marc; +#endif struct database_retrievalmap *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 @@ -125,9 +121,9 @@ struct session_watchentry { // 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) @@ -140,15 +136,15 @@ struct session { 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; @@ -158,7 +154,7 @@ struct statistics { struct hitsbytarget { char *id; - char *name; + const char *name; int hits; int diagnostic; int records; @@ -166,50 +162,48 @@ struct hitsbytarget { int connected; }; -struct hitsbytarget *hitsbytarget(struct session *s, int *count); +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, int 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); -char *session_setting_oneval(struct session_database *db, int offset); - -void start_http_listener(void); -void start_proxy(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); -xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec); +xmlDoc *normalize_record(struct session_database *sdb, struct session *se, + 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); -int pazpar2_process(int debug, int daemon, - 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 */ +