projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
session_shared: Simplify ttl conditional
[metaproxy-moved-to-github.git]
/
src
/
filter_zoom.cpp
diff --git
a/src/filter_zoom.cpp
b/src/filter_zoom.cpp
index
547c09f
..
0d5349a
100644
(file)
--- a/
src/filter_zoom.cpp
+++ b/
src/filter_zoom.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 2005-2012 Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-231,6
+231,7
@@
yf::Zoom::Backend::~Backend()
xsltFreeStylesheet(xsp);
ZOOM_connection_destroy(m_connection);
ZOOM_resultset_destroy(m_resultset);
xsltFreeStylesheet(xsp);
ZOOM_connection_destroy(m_connection);
ZOOM_resultset_destroy(m_resultset);
+ wrbuf_destroy(m_apdu_wrbuf);
}
}
@@
-278,6
+279,7
@@
void yf::Zoom::Backend::connect(std::string zurl,
void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
int *error, char **addinfo, ODR odr)
{
void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
int *error, char **addinfo, ODR odr)
{
+ ZOOM_resultset_destroy(m_resultset);
m_resultset = ZOOM_connection_search(m_connection, q);
get_zoom_error(error, addinfo, odr);
if (*error == 0)
m_resultset = ZOOM_connection_search(m_connection, q);
get_zoom_error(error, addinfo, odr);
if (*error == 0)
@@
-710,6
+712,7
@@
bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
fclose(file);
package.log("zoom", YLOG_LOG, "content file: %s", fname);
xfree(fname);
fclose(file);
package.log("zoom", YLOG_LOG, "content file: %s", fname);
xfree(fname);
+ wrbuf_destroy(w);
}
return true;
}
}
return true;
}
@@
-1190,8
+1193,6
@@
Z_Records *yf::Zoom::Frontend::get_records(Package &package,
Z_NamePlusRecord *npr = 0;
const char *addinfo;
Z_NamePlusRecord *npr = 0;
const char *addinfo;
- package.log("zoom", YLOG_LOG, "Inspecting record at position %d",
- start + i);
int sur_error = ZOOM_record_error(recs[i], 0 /* msg */,
&addinfo, 0 /* diagset */);
int sur_error = ZOOM_record_error(recs[i], 0 /* msg */,
&addinfo, 0 /* diagset */);