X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=4f14b74094d1f9a0e2b9bedfab73c54ae50a3ba0;hb=3c6797554c9c8a595d25616587839b1400c5e3b7;hp=38f566b301759e2e09fe90bf062ce31f107261f0;hpb=babf401143ef8da84a8dd137ac6425b9c4c482ba;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 38f566b..4f14b74 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.h,v 1.43 2007-06-18 11:10:20 adam Exp $
+/* $Id: pazpar2.h,v 1.50 2007-09-10 16:25:50 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -96,7 +96,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;
@@ -104,8 +103,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
 
@@ -158,7 +160,7 @@ struct statistics {
 
 struct hitsbytarget {
     char *id;
-    char *name;
+    const char *name;
     int hits;
     int diagnostic;
     int records;
@@ -166,22 +168,23 @@ 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);
 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);
 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);
 void start_proxy(void);
@@ -191,7 +194,8 @@ 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,