#include <unistd.h>
#endif
#include <signal.h>
-#include <ctype.h>
#include <assert.h>
#include <yaz/marcdisp.h>
connection_continue(co);
}
-static int nativesyntax_to_type(struct session_database *sdb, char *type)
+static int nativesyntax_to_type(struct session_database *sdb, char *type, ZOOM_record rec)
{
const char *s = session_setting_oneval(sdb, PZ_NATIVESYNTAX);
return -1;
return 0;
}
- return -1;
+ else /* attempt to deduce structure */
+ {
+ const char *syntax = ZOOM_record_get(rec, "syntax", NULL);
+ if (syntax)
+ {
+ if (!strcmp(syntax, "XML"))
+ {
+ strcpy(type, "xml");
+ return 0;
+ }
+ else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21"))
+ {
+ strcpy(type, "xml; charset=marc8-s");
+ return 0;
+ }
+ else return -1;
+ }
+ else return -1;
+ }
}
static void ingest_raw_record(struct client *cl, ZOOM_record rec)
else
{
struct session_database *sdb = client_get_database(cl);
- nativesyntax_to_type(sdb, type);
+ nativesyntax_to_type(sdb, type, rec);
}
buf = ZOOM_record_get(rec, type, &len);
struct session_database *sdb = client_get_database(cl);
const char *xmlrec;
char type[80];
- nativesyntax_to_type(sdb, type);
+ if (nativesyntax_to_type(sdb, type, rec))
+ yaz_log(YLOG_WARN, "Failed to determine record type");
if ((xmlrec = ZOOM_record_get(rec, type, NULL)))
{
if (ingest_record(cl, xmlrec, cl->record_offset))
if (cl->cqlquery)
{
+ yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery);
ZOOM_query q = ZOOM_query_create();
ZOOM_query_cql(q, cl->cqlquery);
rs = ZOOM_connection_search(link, q);
ZOOM_query_destroy(q);
}
else
+ {
+ yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
rs = ZOOM_connection_search_pqf(link, cl->pquery);
+ }
connection_set_resultset(co, rs);
connection_continue(co);
}
int cerror, cpos;
CCL_bibset ccl_map = prepare_cclmap(cl);
const char *sru = session_setting_oneval(sdb, PZ_SRU);
+ const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
if (!ccl_map)
return -1;
return -1;
}
wrbuf_rewind(se->wrbuf);
+ if (*pqf_prefix)
+ {
+ wrbuf_puts(se->wrbuf, pqf_prefix);
+ wrbuf_puts(se->wrbuf, " ");
+ }
ccl_pquery(se->wrbuf, cn);
xfree(cl->pquery);
cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf));