int num;
char **misspelled;
char **suggest;
+ char *passthrough;
};
struct show_raw {
client_get_id(cl), no_active);
if (no_active == 0) {
session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+ session_alert_watch(cl->session, SESSION_WATCH_BYTARGET);
session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF);
}
}
{
client_unlock(cl);
session_alert_watch(se, SESSION_WATCH_SHOW);
+ session_alert_watch(se, SESSION_WATCH_BYTARGET);
session_alert_watch(se, SESSION_WATCH_RECORD);
client_lock(cl);
}
const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf)
{
- int idx;
+ /* int idx; */
struct suggestions *suggestions = cl->suggestions;
- if (!suggestions || suggestions->num == 0) {
+
+ if (!suggestions) {
+ yaz_log(YLOG_DEBUG, "No suggestions found");
+ return "";
+ }
+ if (suggestions->passthrough) {
+ yaz_log(YLOG_DEBUG, "Passthrough Suggestions: \n%s\n", suggestions->passthrough);
+ return suggestions->passthrough;
+ }
+ if (suggestions->num == 0) {
return "";
}
+ /*
for (idx = 0; idx < suggestions->num; idx++) {
wrbuf_printf(wrbuf, "<suggest term=\"%s\"", suggestions->suggest[idx]);
if (suggestions->misspelled[idx] && suggestions->misspelled[idx]) {
else
wrbuf_puts(wrbuf, "/>\n");
}
+ */
return wrbuf_cstr(wrbuf);
}
}
-struct suggestions* client_suggestions_create(const char* suggestions_string) {
+struct suggestions* client_suggestions_create(const char* suggestions_string)
+{
+ int i;
+ NMEM nmem;
+ struct suggestions *suggestions;
if (suggestions_string == 0)
return 0;
- int i;
- NMEM nmem = nmem_create();
- struct suggestions *suggestions = nmem_malloc(nmem, sizeof(*suggestions));
+ nmem = nmem_create();
+ suggestions = nmem_malloc(nmem, sizeof(*suggestions));
+ yaz_log(YLOG_DEBUG, "client target suggestions: %s", suggestions_string);
+
suggestions->nmem = nmem;
suggestions->num = 0;
suggestions->misspelled = 0;
suggestions->suggest = 0;
+ suggestions->passthrough = nmem_strdup_null(nmem, suggestions_string);
+
if (suggestions_string)
nmem_strsplit_escape2(suggestions->nmem, "\n", suggestions_string, &suggestions->suggest,
&suggestions->num, 1, '\\', 0);
static void client_suggestions_destroy(struct client *cl)
{
- nmem_destroy(cl->suggestions->nmem);
+ NMEM nmem = cl->suggestions->nmem;
cl->suggestions = 0;
+ nmem_destroy(nmem);
}
/*