X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.h;h=44bd94c2d4817cc1eca0c4ac8dc792b8f7c50a12;hb=f5a8d2cdf270eddfd7bb3be07e4fb4c38dbf807c;hp=d958eaf04b6a2e7009099581363de09ec175ccbb;hpb=e7b239d4c86d0bd72517054aed2887ba246de50f;p=pazpar2-moved-to-github.git

diff --git a/src/session.h b/src/session.h
index d958eaf..44bd94c 100644
--- a/src/session.h
+++ b/src/session.h
@@ -48,6 +48,7 @@ enum pazpar2_error_code {
     PAZPAR2_RECORD_FAIL,
     PAZPAR2_NOT_IMPLEMENTED,
     PAZPAR2_NO_SERVICE,
+    PAZPAR2_ALREADY_BLOCKED,
 
     PAZPAR2_LAST_ERROR
 };
@@ -75,7 +76,9 @@ struct session_database
 #define SESSION_WATCH_SHOW      0
 #define SESSION_WATCH_RECORD    1
 #define SESSION_WATCH_SHOW_PREF 2
-#define SESSION_WATCH_MAX       2
+#define SESSION_WATCH_TERMLIST  3
+#define SESSION_WATCH_BYTARGET  4
+#define SESSION_WATCH_MAX       4
 
 #define SESSION_MAX_TERMLISTS 10
 
@@ -114,6 +117,7 @@ struct session {
     normalize_cache_t normalize_cache;
     YAZ_MUTEX session_mutex;
     unsigned session_id;
+    struct session_sorted_results *sorted_results;
 };
 
 struct statistics {
@@ -137,21 +141,24 @@ struct hitsbytarget {
     const char *state;
     int connected;
     char *settings_xml;
+    char *suggestions_xml;
 };
 
 struct hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem);
 struct session *new_session(NMEM nmem, struct conf_service *service,
                             unsigned session_id);
-void destroy_session(struct session *s);
+void session_destroy(struct session *s);
 void session_init_databases(struct session *s);
 void statistics(struct session *s, struct statistics *stat);
 
-void search_sort(struct session *se, const char *field, int increasing);
+void session_sort(struct session *se, const char *field, int increasing);
 
-enum pazpar2_error_code search(struct session *s, const char *query,
-                               const char *startrecs, const char *maxrecs,
-                               const char *filter, const char *limit,
-                               const char **addinfo);
+enum pazpar2_error_code session_search(struct session *s, const char *query,
+                                       const char *startrecs,
+                                       const char *maxrecs,
+                                       const char *filter, const char *limit,
+                                       const char **addinfo,
+                                       const char *sort_field, int increasing);
 struct record_cluster **show_range_start(struct session *s,
                                          struct reclist_sortparms *sp,
                                          int start,