X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=82498ebdf30eb27d2b93b8a0a921b4ba1d8fab13;hb=d2cbbfa12b18301e94bca427cf8bf1b2ea6151b3;hp=d257874855443036dd0af75fc0c1b5282ba5bbff;hpb=2dcca58dcfd42a54b98f413a2bbb8676e05302d4;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.h b/src/pazpar2.h index d257874..82498eb 100644 --- a/src/pazpar2.h +++ b/src/pazpar2.h @@ -1,7 +1,5 @@ -/* $Id: pazpar2.h,v 1.39 2007-06-12 13:02:38 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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,17 +12,15 @@ 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 @@ -37,12 +33,32 @@ 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" struct record; struct client; + +enum pazpar2_error_code { + PAZPAR2_NO_ERROR = 0, + + PAZPAR2_NO_SESSION, + PAZPAR2_MISSING_PARAMETER, + PAZPAR2_MALFORMED_PARAMETER_VALUE, + PAZPAR2_MALFORMED_PARAMETER_ENCODING, + PAZPAR2_MALFORMED_SETTING, + PAZPAR2_HITCOUNTS_FAILED, + PAZPAR2_RECORD_MISSING, + PAZPAR2_NO_TARGETS, + PAZPAR2_CONFIG_TARGET, + PAZPAR2_RECORD_FAIL, + PAZPAR2_NOT_IMPLEMENTED, + + PAZPAR2_LAST_ERROR +}; + // Represents a (virtual) database on a host struct database { struct host *host; @@ -76,7 +92,6 @@ struct database_retrievalmap { // for that session struct session_database { - pp2_charset_t pct; struct database *database; struct setting **settings; yaz_marc_t yaz_marc; @@ -84,8 +99,11 @@ struct session_database 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 @@ -97,6 +115,12 @@ 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 session_database *databases; // All databases, settings overriden @@ -109,14 +133,12 @@ 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]; + struct session_watchentry watchlist[SESSION_WATCH_MAX + 1]; int expected_maxrecs; int total_hits; int total_records; int total_merged; + int number_of_warnings_unknown_elements; }; struct statistics { @@ -135,7 +157,7 @@ struct statistics { struct hitsbytarget { char *id; - char *name; + const char *name; int hits; int diagnostic; int records; @@ -143,42 +165,41 @@ 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); 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); -char *search(struct session *s, char *query, char *filter); +enum pazpar2_error_code search(struct session *s, char *query, + 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 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); +const char *session_setting_oneval(struct session_database *db, int offset); -void start_http_listener(void); +int start_http_listener(void); void start_proxy(void); -//void start_zproxy(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, Z_External *rec); +xmlDoc *normalize_record(struct session_database *sdb, struct session *se, + Z_External *rec); +xmlDoc *record_to_xml(struct session_database *sdb, Z_External *rec); struct record *ingest_record(struct client *cl, Z_External *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 /*