#include <stdlib.h>
#include <sys/types.h>
-#include <fcntl.h>
#include "filter_zoom.hpp"
#include <yaz/zoom.h>
#include <yaz/yaz-version.h>
namespace metaproxy_1 {
namespace filter {
- struct Zoom::Searchable : boost::noncopyable {
+ class Zoom::Searchable : boost::noncopyable {
+ public:
std::string authentication;
std::string cfAuth;
std::string cfProxy;
CCL_bibset bibset;
std::string element_transform;
std::string element_raw;
+ std::string proxy;
std::map<std::string,SearchablePtr> s_map;
};
}
{
bibset = ccl_qual_mk();
- srand(time(0));
+ srand((unsigned int) time(0));
}
yf::Zoom::Impl::~Impl()
element_transform = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "element_raw"))
element_raw = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "proxy"))
+ proxy = mp::xml::get_text(attr->children);
else
throw mp::filter::FilterException(
"Bad attribute " + std::string((const char *)
sptr = it->second;
else
{
- xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
+ xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db, m_p->proxy);
if (!doc)
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "record"))
{
+ if (sptr)
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = (char*) odr_malloc(odr, 40 + database.length()),
+ sprintf(*addinfo, "multiple records for udb=%s",
+ database.c_str());
+ xmlFreeDoc(doc);
+ BackendPtr b;
+ return b;
+ }
sptr = m_p->parse_torus_record(ptr);
- break;
}
}
}
sprintf(xx, "%06d", ((unsigned) rand()) % 1000000);
xx[6] = tmp_char;
- int fd = creat(fname, 0666);
- if (fd == -1)
+ FILE *file = fopen(fname, "w");
+ if (!file)
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "create %s", fname);
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
wrbuf_printf(w, "authentication: %s\n", authentication.c_str());
if (proxy.length())
wrbuf_printf(w, "proxy: %s\n", proxy.c_str());
- if (sptr->cfAuth.length())
- wrbuf_printf(w, "cfauth: %s\n", sptr->cfAuth.c_str());
if (sptr->cfProxy.length())
wrbuf_printf(w, "cfproxy: %s\n", sptr->cfProxy.c_str());
- write(fd, wrbuf_buf(w), wrbuf_len(w));
- close(fd);
+ fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file);
+ fclose(file);
yaz_log(YLOG_LOG, "file %s created\n", fname);
xfree(fname);
}
number_to_present = 10000;
ZOOM_record *recs = (ZOOM_record *)
- odr_malloc(odr, number_to_present * sizeof(*recs));
+ odr_malloc(odr, (size_t) number_to_present * sizeof(*recs));
char oid_name_str[OID_STR_MAX];
const char *syntax_name = 0;
b->present(start, number_to_present, recs, error, addinfo, odr);
- Odr_int i = 0;
+ int i = 0;
if (!*error)
{
for (i = 0; i < number_to_present; i++)