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
Update logging to match logic
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
3a0fc22
..
74495fc
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-412,16
+412,8
@@
static int prepare_map(struct session *se, struct session_database *sdb)
{
const char *s;
{
const char *s;
- if (sdb->settings[PZ_EMBED_XSLT] &&
- (s = session_setting_oneval(sdb, PZ_EMBED_XSLT)))
- {
- sdb->map = normalize_cache_get(se->normalize_cache,
- se->service, s, 1);
- if (!sdb->map)
- return -1;
- }
- else if (sdb->settings[PZ_XSLT] &&
- (s = session_setting_oneval(sdb, PZ_XSLT)))
+ if (sdb->settings[PZ_XSLT] &&
+ (s = session_setting_oneval(sdb, PZ_XSLT)))
{
char auto_stylesheet[256];
{
char auto_stylesheet[256];
@@
-449,7
+441,7
@@
static int prepare_map(struct session *se, struct session_database *sdb)
}
}
sdb->map = normalize_cache_get(se->normalize_cache,
}
}
sdb->map = normalize_cache_get(se->normalize_cache,
- se->service, s, 0);
+ se->service, s);
if (!sdb->map)
return -1;
}
if (!sdb->map)
return -1;
}
@@
-700,6
+692,8
@@
enum pazpar2_error_code session_search(struct session *se,
se->reclist = 0;
se->settings_modified = 0;
relevance_destroy(&se->relevance);
se->reclist = 0;
se->settings_modified = 0;
relevance_destroy(&se->relevance);
+ if (nmem_total(se->nmem))
+ session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
nmem_reset(se->nmem);
se->total_records = se->total_merged = 0;
se->num_termlists = 0;
nmem_reset(se->nmem);
se->total_records = se->total_merged = 0;
se->num_termlists = 0;
@@
-757,12
+751,12
@@
enum pazpar2_error_code session_search(struct session *se,
&tval);
if (parse_ret == 1 && r == 2)
{
&tval);
if (parse_ret == 1 && r == 2)
{
- session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl));
client_reingest(cl);
}
else if (r)
{
client_reingest(cl);
}
else if (r)
{
- session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl));
client_start_search(cl);
}
no_working++;
client_start_search(cl);
}
no_working++;
@@
-896,6
+890,10
@@
void session_destroy(struct session *se)
normalize_cache_destroy(se->normalize_cache);
relevance_destroy(&se->relevance);
reclist_destroy(se->reclist);
normalize_cache_destroy(se->normalize_cache);
relevance_destroy(&se->relevance);
reclist_destroy(se->reclist);
+ if (nmem_total(se->nmem))
+ session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
+ if (nmem_total(se->session_nmem))
+ session_log(se, YLOG_DEBUG, "NMEN session usage %zd", nmem_total(se->session_nmem));
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);