projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document num parameter for termlist
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
0b61662
..
1c95feb
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-190,7
+190,7
@@
void add_facet(struct session *s, const char *type, const char *value, int count
s->num_termlists = i + 1;
}
s->num_termlists = i + 1;
}
- session_log(s, YLOG_DEBUG, "Session: facets for %s: %s norm:%s (%d)",
+ session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)",
type, value, wrbuf_cstr(facet_wrbuf), count);
termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf),
count);
type, value, wrbuf_cstr(facet_wrbuf), count);
termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf),
count);
@@
-476,7
+476,7
@@
void session_alert_watch(struct session *s, int what)
session_leave(s);
session_log(s, YLOG_DEBUG,
session_leave(s);
session_log(s, YLOG_DEBUG,
- "session_alert_watch: %d calling function: %p", what, fun);
+ "Alert Watch: %d calling function: %p", what, fun);
fun(data);
}
else
fun(data);
}
else
@@
-489,14
+489,10
@@
static void select_targets_callback(void *context, struct session_database *db)
struct session *se = (struct session*) context;
struct client *cl = client_create();
struct client_list *l;
struct session *se = (struct session*) context;
struct client *cl = client_create();
struct client_list *l;
- const char *maxrecs = session_setting_oneval(db, PZ_MAXRECS);
client_set_database(cl, db);
client_set_session(cl, se);
client_set_database(cl, db);
client_set_session(cl, se);
- if (*maxrecs)
- client_set_maxrecs(cl, atoi(maxrecs));
-
l = xmalloc(sizeof(*l));
l->client = cl;
l->next = se->clients;
l = xmalloc(sizeof(*l));
l->client = cl;
l->next = se->clients;
@@
-553,7
+549,7
@@
int session_is_preferred_clients_ready(struct session *s)
for (l = s->clients; l; l = l->next)
if (client_is_active_preferred(l->client))
res++;
for (l = s->clients; l; l = l->next)
if (client_is_active_preferred(l->client))
res++;
- session_log(s, YLOG_DEBUG, "Session has %d active preferred clients.", res);
+ session_log(s, YLOG_DEBUG, "Has %d active preferred clients.", res);
return res == 0;
}
return res == 0;
}
@@
-731,7
+727,7
@@
void destroy_session(struct session *se)
{
struct session_database *sdb;
{
struct session_database *sdb;
- session_log(se, YLOG_DEBUG, "Pazpar2 session destroy");
+ session_log(se, YLOG_DEBUG, "Destroying");
session_remove_clients(se);
for (sdb = se->databases; sdb; sdb = sdb->next)
session_remove_clients(se);
for (sdb = se->databases; sdb; sdb = sdb->next)
@@
-756,7
+752,7
@@
struct session *new_session(NMEM nmem, struct conf_service *service,
sprintf(tmp_str, "session#%u", session_id);
session->session_id = session_id;
sprintf(tmp_str, "session#%u", session_id);
session->session_id = session_id;
- session_log(session, YLOG_DEBUG, "New session");
+ session_log(session, YLOG_DEBUG, "New");
session->service = service;
session->relevance = 0;
session->total_hits = 0;
session->service = service;
session->relevance = 0;
session->total_hits = 0;
@@
-1501,7
+1497,7
@@
void session_log(struct session *s, int level, const char *fmt, ...)
va_start(ap, fmt);
yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
va_start(ap, fmt);
yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
- yaz_log(level, "%u %s", s->session_id, buf);
+ yaz_log(level, "Session (%u): %s", s->session_id, buf);
va_end(ap);
}
va_end(ap);
}