joerg/z3950
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extend response listener by total result count

Browse source
This commit is contained in:
Jörg Prante 2017-11-30 17:42:07 +01:00
parent 832c86a73d
commit d8972929bb
6 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = z3950 name = z3950
version = 1.0.0 version = 1.0.1
xbib-cql.version = 1.1.0 xbib-cql.version = 1.1.0

2
z3950/src/main/java/org/xbib/io/iso23950/ResponseListener.java
View file

@ -8,5 +8,5 @@ import java.io.IOException;
@FunctionalInterface @FunctionalInterface
public interface ResponseListener { public interface ResponseListener {
void onResponse(int status, int recordCount, long elapsedMillis) throws IOException; void onResponse(int status, int total, int returned, long elapsedMillis) throws IOException;
} }

16
z3950/src/main/java/org/xbib/io/iso23950/ZClient.java
View file

@ -251,9 +251,9 @@ public class ZClient implements AutoCloseable {
logger.log(Level.WARNING, MessageFormat.format("search was not a success [{0}]", query)); logger.log(Level.WARNING, MessageFormat.format("search was not a success [{0}]", query));
} else { } else {
if (responseListener == null) { if (responseListener == null) {
responseListener = (status, recordCount, elapsedMillis) -> { responseListener = (status, total, returned, elapsedMillis) -> {
logger.log(Level.INFO, MessageFormat.format("[{0}ms] [{1}] [{2}]", logger.log(Level.INFO, MessageFormat.format("[{0}ms] [{1}] [{2}] [{3}]",
elapsedMillis, recordCount, query)); elapsedMillis, total, returned, query));
}; };
} }
if (search.getCount() > 0) { if (search.getCount() > 0) {
@ -266,7 +266,7 @@ public class ZClient implements AutoCloseable {
// avoid condition 13 "Present request out-of-range" // avoid condition 13 "Present request out-of-range"
length = search.getCount(); length = search.getCount();
} }
present.execute(this, offset, length, responseListener, recordListener); present.execute(this, offset, length, search.getCount(), responseListener, recordListener);
} }
} }
return search.getCount(); return search.getCount();
@ -284,9 +284,9 @@ public class ZClient implements AutoCloseable {
logger.log(Level.WARNING, MessageFormat.format("search was not a success [{0}]", query)); logger.log(Level.WARNING, MessageFormat.format("search was not a success [{0}]", query));
} else { } else {
if (responseListener == null) { if (responseListener == null) {
responseListener = (status, recordCount, elapsedMillis) -> { responseListener = (status, total, returned, elapsedMillis) -> {
logger.log(Level.INFO, MessageFormat.format("[{0}ms] [{1}] [{2}]", logger.log(Level.INFO, MessageFormat.format("[{0}ms] [{1}] [{2}] [{3}]",
elapsedMillis, recordCount, query)); elapsedMillis, total, returned, query));
}; };
} }
if (search.getCount() > 0) { if (search.getCount() > 0) {
@ -300,7 +300,7 @@ public class ZClient implements AutoCloseable {
// avoid condition 13 "Present request out-of-range" // avoid condition 13 "Present request out-of-range"
length = search.getCount(); length = search.getCount();
} }
present.execute(this, offset, length, responseListener, recordListener); present.execute(this, offset, length, search.getCount(), responseListener, recordListener);
} }
} }
return search.getCount(); return search.getCount();

4
z3950/src/main/java/org/xbib/io/iso23950/operations/PresentOperation.java
View file

@ -32,7 +32,7 @@ import java.io.IOException;
*/ */
public class PresentOperation { public class PresentOperation {
public void execute(ZClient client, int offset, int length, public void execute(ZClient client, int offset, int length, int total,
ResponseListener responseListener, RecordListener recordListener) throws IOException { ResponseListener responseListener, RecordListener recordListener) throws IOException {
String resultSetName = client.getResultSetName(); String resultSetName = client.getResultSetName();
String elementSetName = client.getElementSetName(); String elementSetName = client.getElementSetName();
@ -57,7 +57,7 @@ public class PresentOperation {
int nReturned = response.s_numberOfRecordsReturned != null ? response.s_numberOfRecordsReturned.get() : 0; int nReturned = response.s_numberOfRecordsReturned != null ? response.s_numberOfRecordsReturned.get() : 0;
int status = response.s_presentStatus.value != null ? response.s_presentStatus.value.get() : 0; int status = response.s_presentStatus.value != null ? response.s_presentStatus.value.get() : 0;
if (responseListener != null) { if (responseListener != null) {
responseListener.onResponse(status, nReturned, System.currentTimeMillis() - millis); responseListener.onResponse(status, total, nReturned, System.currentTimeMillis() - millis);
} }
if (status == PresentStatus.E_success) { if (status == PresentStatus.E_success) {
for (int n = 0; n < nReturned; n++) { for (int n = 0; n < nReturned; n++) {

2
z3950/src/test/java/org/xbib/io/iso23950/SearchTest.java
View file

@ -32,7 +32,7 @@ public class SearchTest {
.setPreferredRecordSyntax(preferredRecordSyntax) .setPreferredRecordSyntax(preferredRecordSyntax)
.build(); .build();
client.executePQF(query, from, length, client.executePQF(query, from, length,
(status, recordCount, elapsedMillis) -> logger.log(Level.INFO, "records = " + recordCount), (status, total, returned, elapsedMillis) -> logger.log(Level.INFO, "total records = " + total),
record -> logger.log(Level.INFO, "found record " + record)); record -> logger.log(Level.INFO, "found record " + record));
client.close(); client.close();
} catch (NoRecordsReturnedException | MessageSizeTooSmallException e) { } catch (NoRecordsReturnedException | MessageSizeTooSmallException e) {

14
z3950/src/test/java/org/xbib/io/iso23950/ZClientTest.java
View file

@ -23,10 +23,9 @@ public class ZClientTest {
try (ZClient client = ZClient.newZClient(serviceName)) { try (ZClient client = ZClient.newZClient(serviceName)) {
logger.log(Level.INFO, "executing CQL " + serviceName); logger.log(Level.INFO, "executing CQL " + serviceName);
int count = client.executeCQL(query, from, size, int count = client.executeCQL(query, from, size,
(status, recordCount, elapsedMillis) -> (status, total, returned, elapsedMillis) ->
logger.log(Level.INFO, serviceName + " results = " + recordCount), logger.log(Level.INFO, serviceName + " total results = " + total),
record -> record -> logger.log(Level.INFO, "record = " + record));
logger.log(Level.INFO, "record = " + record));
logger.log(Level.INFO, "returned records = " + count); logger.log(Level.INFO, "returned records = " + count);
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e); logger.log(Level.SEVERE, e.getMessage(), e);
@ -43,10 +42,9 @@ public class ZClientTest {
try (ZClient client = ZClient.newZClient(serviceName)) { try (ZClient client = ZClient.newZClient(serviceName)) {
logger.log(Level.INFO, "executing PQF " + serviceName); logger.log(Level.INFO, "executing PQF " + serviceName);
int count = client.executePQF(query, from, size, int count = client.executePQF(query, from, size,
(status, recordCount, elapsedMillis) -> (status, total, returned, elapsedMillis) ->
logger.log(Level.INFO, serviceName + " status = " + status + " results = " + recordCount), logger.log(Level.INFO, serviceName + " status = " + status + " total results = " + total),
record -> record -> logger.log(Level.INFO, "record = " + record.toString(Charset.forName(client.getEncoding()))));
logger.log(Level.INFO, "record = " + record.toString(Charset.forName(client.getEncoding()))));
logger.log(Level.INFO, "returned records = " + count); logger.log(Level.INFO, "returned records = " + count);
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e); logger.log(Level.SEVERE, e.getMessage(), e);