summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e3632ee)
This is the a way fully specify the URL of the torus record to use.
When in use, the udb and realm are not in use (unless %realm and %udb
is given in the torus_url!). Thus, this overrides <torus url=..">
configuration.
int *error,
char **addinfo,
mp::odr &odr,
int *error,
char **addinfo,
mp::odr &odr,
std::string &torus_db,
std::string &realm);
void handle_present(mp::Package &package);
std::string &torus_db,
std::string &realm);
void handle_present(mp::Package &package);
}
else if (!strcmp(name, "realm"))
realm = value;
}
else if (!strcmp(name, "realm"))
realm = value;
+ else if (!strcmp(name, "torus_url"))
+ torus_url = value;
else if (name[0] == 'x' && name[1] == '-')
{
out_names[no_out_args] = name;
else if (name[0] == 'x' && name[1] == '-')
{
out_names[no_out_args] = name;
}
if (torus_db.compare("IR-Explain---1") == 0)
}
if (torus_db.compare("IR-Explain---1") == 0)
- return explain_search(package, database, error, addinfo, odr, torus_db,
- realm);
+ return explain_search(package, database, error, addinfo, odr, torus_url,
+ torus_db, realm);
int *error,
char **addinfo,
mp::odr &odr,
int *error,
char **addinfo,
mp::odr &odr,
std::string &torus_db,
std::string &realm)
{
std::string &torus_db,
std::string &realm)
{
else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
{
else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
{
- std::string torus_url = m_p->torus_searchable_url;
std::string torus_query(query->u.type_104->u.cql);
xmlDoc *doc = mp::get_searchable(package, torus_url, "",
torus_query,
std::string torus_query(query->u.type_104->u.cql);
xmlDoc *doc = mp::get_searchable(package, torus_url, "",
torus_query,
found = url_template.find("%query");
if (found != std::string::npos)
url_template.replace(found, 6, mp::util::uri_encode(query));
found = url_template.find("%query");
if (found != std::string::npos)
url_template.replace(found, 6, mp::util::uri_encode(query));
- else
- {
- if (db.length() == 0)
- {
- package.log("zoom", YLOG_WARN,
- "%query not defined in <torus url=\"..\"");
- return 0;
- }
- }
found = url_template.find("%db");
if (found != std::string::npos)
found = url_template.find("%db");
if (found != std::string::npos)