Changeset 2801 for FCSSimpleEndpoint

Timestamp:

04/11/13 08:54:29 (11 years ago)

Author:

oschonef

Message:

• honor maximumTerms argument in scan operation on fcs.resource

File:

• FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/SimpleEndpointSearchEngineBase.java (modified) (3 diffs)

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/SimpleEndpointSearchEngineBase.java

@@ -140 +140 @@
                 translateFcsScanResource(request.getScanClause());
         if (result != null) {
+            /*
+             * Make sure, we honor the maximumTerms limit, of the client
+             * requests it ...
+             */
+            final int maxTerms
+                = ((result.size() > 0) && (request.getMaximumTerms() > 0))
+                ? Math.min(result.size(), request.getMaximumTerms())
+                : result.size();
+
+            /*
+             * Shall we provide extended resource information ... ?
+             */
             final boolean provideResourceInfo = parseBoolean(
                     request.getExtraRequestData(X_CMD_RESOURCE_INFO));
+
             return new SRUScanResultSet(diagnostics) {
                 private int idx = -1;
@@ -147 +160 @@
                 @Override
                 public boolean nextTerm() {
-                    return (result != null) && (++idx < result.size());
+                    return (result != null) && (++idx < maxTerms);
                 }
 
@@ -419 +432 @@
              * HACK: only output @pid for recursive (= explain) requests.
              * This should be revisited, if we decide to go for the explain
-             * style enumeration of resources. 
+             * style enumeration of resources.
              */
             writer.writeAttribute("pid", resourceInfo.getPid());