/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ 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
PAZPAR2_CONFIG_TARGET,
PAZPAR2_RECORD_FAIL,
PAZPAR2_NOT_IMPLEMENTED,
+ PAZPAR2_NO_SERVICE,
PAZPAR2_LAST_ERROR
};
-enum pazpar2_database_criterion_type {
- PAZPAR2_STRING_MATCH,
- PAZPAR2_SUBSTRING_MATCH
-};
-
+struct host;
// Represents a (virtual) database on a host
struct database {
struct host *host;
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;
- enum pazpar2_database_criterion_type type;
- struct database_criterion_value *values;
- struct database_criterion *next;
-};
// Represents a database as viewed from one session, possibly with settings overriden
// for that session
struct session_database
{
struct database *database;
+ int num_settings;
struct setting **settings;
normalize_record_t map;
struct session_database *next;
};
-
-
#define SESSION_WATCH_SHOW 0
#define SESSION_WATCH_RECORD 1
#define SESSION_WATCH_MAX 1
struct relevance *relevance;
struct reclist *reclist;
struct session_watchentry watchlist[SESSION_WATCH_MAX + 1];
- int expected_maxrecs;
- int total_hits;
+ 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_idle;
int num_failed;
int num_error;
- int num_hits;
+ Odr_int num_hits;
int num_records;
};
struct hitsbytarget {
char *id;
const char *name;
- int hits;
+ Odr_int hits;
int diagnostic;
int records;
const char *state;
int connected;
+ WRBUF settings_xml;
};
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 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, const char *query,
+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);
+ 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);