Changeset 5743 for SRUClient

Timestamp:

10/24/14 14:01:20 (10 years ago)

Author:

Oliver Schonefeld

Message:

• more work-in-progress

Location:

SRUClient/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/client/SRUSimpleClient.java (modified) (13 diffs)
• src/main/java/eu/clarin/sru/client/XmlStreamReaderUtils.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/client/fcs/AbstractClarinFCSRecordDataParser.java (added)
• src/main/java/eu/clarin/sru/client/fcs/ClarinFCSClientBuilder.java (added)
• src/main/java/eu/clarin/sru/client/fcs/ClarinFCSRecordData.java (modified) (2 diffs)
• src/main/java/eu/clarin/sru/client/fcs/ClarinFCSRecordDataParser.java (moved) (moved from SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/ClarinFCSRecordParser.java) (2 diffs)
• src/main/java/eu/clarin/sru/client/fcs/DataViewHits.java (added)
• src/main/java/eu/clarin/sru/client/fcs/DataViewKWIC.java (deleted)
• src/main/java/eu/clarin/sru/client/fcs/DataViewParserHits.java (added)
• src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/client/fcs/LegacyClarinFCSRecordDataParser.java (added)
• src/test/java/eu/clarin/sru/client/TestClient.java (modified) (2 diffs)
• src/test/java/eu/clarin/sru/client/TestSimpleClient.java (modified) (2 diffs)
• src/test/java/eu/clarin/sru/client/TestThreadedClient.java (modified) (2 diffs)
• src/test/java/eu/clarin/sru/client/TestThreadedClientCallback.java (modified) (2 diffs)
• src/test/java/eu/clarin/sru/client/TestUtils.java (modified) (3 diffs)

SRUClient/trunk/pom.xml

@@ -34 +34 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.2.5</version>
+            <version>4.3.5</version>
         </dependency>
 

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

@@ -32 +32 @@
 
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.StatusLine;
 import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.HttpClientUtils;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.impl.NoConnectionReuseStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65 +67 @@
  */
 public class SRUSimpleClient {
+    private static final String USER_AGENT = "SRU-Client/1.0.0";
     /** default version the client will use, if not otherwise specified */
     public static final SRUVersion DEFAULT_SRU_VERSION = SRUVersion.VERSION_1_2;
@@ -81 +84 @@
     private final SRUVersion defaultVersion;
     private final Map<String, SRURecordDataParser> parsers;
-    private final HttpClient httpClient;
+    private final CloseableHttpClient httpClient;
     private final XmlStreamReaderProxy proxy = new XmlStreamReaderProxy();
     private final SRUExplainRecordDataParser explainRecordParser =
@@ -138 +141 @@
         this.defaultVersion = defaultVersion;
         this.parsers        = parsers;
-        this.httpClient     = new DefaultHttpClient();
-        this.httpClient.getParams().setParameter(CoreProtocolPNames.USER_AGENT,
-                    "eu.clarin.sru.client/0.0.1");
+
+        // create HTTP client
+        // FIXME: get timeout values from somewhere?
+        final int connectTimeout = 30 * 1000;
+        final int socketTimeout = 180 * 1000;
+        httpClient = createHttpClient(connectTimeout, socketTimeout);
     }
 
@@ -206 +212 @@
         // create URI and perform request
         final URI uri = request.makeURI(defaultVersion);
-        HttpResponse response = executeRequest(uri);
-        HttpEntity entity = response.getEntity();
-        if (entity == null) {
-            throw new SRUClientException("cannot get entity");
-        }
-
-        InputStream stream = null;
-        SRUXMLStreamReader reader = null;
+        CloseableHttpResponse response = executeRequest(uri);
+        InputStream stream             = null;
+        SRUXMLStreamReader reader      = null;
         try {
+            final HttpEntity entity = response.getEntity();
+            if (entity == null) {
+                throw new SRUClientException("cannot get entity");
+            }
+
             stream = entity.getContent();
 
@@ -257 +263 @@
 
             /* make sure to release allocated resources */
-            HttpClientUtils.closeQuietly(response);
+            try {
+                response.close();
+            } catch (IOException e) {
+                /* IGNORE */
+            }
         }
     }
@@ -292 +302 @@
         // create URI and perform request
         final URI uri = request.makeURI(defaultVersion);
-        HttpResponse response = executeRequest(uri);
-        HttpEntity entity = response.getEntity();
-        if (entity == null) {
-            throw new SRUClientException("cannot get entity");
-        }
-
-        InputStream stream = null;
-        SRUXMLStreamReader reader = null;
+        CloseableHttpResponse response = executeRequest(uri);
+        InputStream stream             = null;
+        SRUXMLStreamReader reader      = null;
         try {
+            final HttpEntity entity = response.getEntity();
+            if (entity == null) {
+                throw new SRUClientException("cannot get entity");
+            }
             stream = entity.getContent();
 
@@ -343 +352 @@
 
             /* make sure to release allocated resources */
-            HttpClientUtils.closeQuietly(response);
+            try {
+                response.close();
+            } catch (IOException e) {
+                /* IGNORE */
+            }
         }
     }
@@ -378 +391 @@
         // create URI and perform request
         final URI uri = request.makeURI(defaultVersion);
-        HttpResponse response = executeRequest(uri);
-        HttpEntity entity = response.getEntity();
-        if (entity == null) {
-            throw new SRUClientException("cannot get entity");
-        }
-
-        InputStream stream = null;
-        SRUXMLStreamReader reader = null;
+        CloseableHttpResponse response = executeRequest(uri);
+        InputStream stream             = null;
+        SRUXMLStreamReader reader      = null;
         try {
+            final HttpEntity entity = response.getEntity();
+            if (entity == null) {
+                throw new SRUClientException("cannot get entity");
+            }
+
             stream = entity.getContent();
 
@@ -429 +442 @@
 
             /* make sure to release allocated resources */
-            HttpClientUtils.closeQuietly(response);
-        }
-    }
-
-
-    private HttpResponse executeRequest(URI uri) throws SRUClientException {
-        HttpGet request = null;
-        HttpResponse response = null;
+            try {
+                response.close();
+            } catch (IOException e) {
+                /* IGNORE */
+            }
+        }
+    }
+
+
+    private CloseableHttpResponse executeRequest(URI uri)
+            throws SRUClientException {
+        CloseableHttpResponse response = null;
+        boolean forceClose             = true;
         try {
             logger.debug("submitting HTTP request: {}", uri.toString());
             try {
-                request = new HttpGet(uri);
-                response = httpClient.execute(request);
+                HttpGet request = new HttpGet(uri);
+                response        = httpClient.execute(request);
                 StatusLine status = response.getStatusLine();
                 if (status.getStatusCode() != HttpStatus.SC_OK) {
@@ -451 +469 @@
                     }
                 }
+                forceClose = false;
                 return response;
             } catch (ClientProtocolException e) {
@@ -471 +490 @@
              * we've used
              */
-            if (response != null) {
+            if (forceClose && (response != null)) {
                 try {
-                    EntityUtils.consume(response.getEntity());
+                    response.close();
                 } catch (IOException ex) {
                     /* IGNORE */
                 }
-
-                /* make sure to release allocated resources */
-                HttpClientUtils.closeQuietly(response);
-            }
-            if (request != null) {
-                request.abort();
             }
             throw e;
@@ -1357 +1370 @@
 
 
-    private SRUXMLStreamReader createReader(InputStream in, boolean wrap)
+    private static SRUXMLStreamReader createReader(InputStream in, boolean wrap)
             throws XMLStreamException {
         return new SRUXMLStreamReader(in, wrap);
     }
 
+
+    private static CloseableHttpClient createHttpClient(int connectTimeout,
+            int socketTimeout) {
+        final PoolingHttpClientConnectionManager manager =
+                new PoolingHttpClientConnectionManager();
+        manager.setDefaultMaxPerRoute(8);
+        manager.setMaxTotal(128);
+
+        final SocketConfig socketConfig = SocketConfig.custom()
+                .setSoReuseAddress(true)
+                .setSoLinger(0)
+                .build();
+
+        final RequestConfig requestConfig = RequestConfig.custom()
+                .setAuthenticationEnabled(false)
+                .setRedirectsEnabled(true)
+                .setMaxRedirects(4)
+                .setCircularRedirectsAllowed(false)
+                .setCookieSpec(CookieSpecs.IGNORE_COOKIES)
+                .setConnectTimeout(connectTimeout)
+                .setSocketTimeout(socketTimeout)
+                .setConnectionRequestTimeout(0) /* infinite */
+                .setStaleConnectionCheckEnabled(false)
+                .build();
+
+        return HttpClients.custom()
+                .setUserAgent(USER_AGENT)
+                .setConnectionManager(manager)
+                .setDefaultSocketConfig(socketConfig)
+                .setDefaultRequestConfig(requestConfig)
+                .setConnectionReuseStrategy(new NoConnectionReuseStrategy())
+                .build();
+    }
+
 } // class SRUSimpleClient

SRUClient/trunk/src/main/java/eu/clarin/sru/client/XmlStreamReaderUtils.java

@@ -247 +247 @@
 
 
+    public static boolean peekEnd(XMLStreamReader reader,
+            String namespaceURI, String localName)
+            throws XMLStreamException {
+        if (reader.isWhiteSpace()) {
+            consumeWhitespace(reader);
+        }
+        if (!reader.isEndElement()) {
+            return false;
+        }
+        return namespaceURI.equals(reader.getNamespaceURI()) &&
+                localName.equals(reader.getLocalName());
+    }
+
+
     public static void consumeStart(XMLStreamReader reader)
             throws XMLStreamException {

SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/ClarinFCSRecordData.java

@@ -30 +30 @@
      * The record schema for CLARIN-FCS records.
      */
-    public static final String RECORD_SCHEMA = "http://clarin.eu/fcs/1.0";
+    public static final String RECORD_SCHEMA =
+            "http://clarin.eu/fcs/resource";
+    /**
+     * The legacy record schema for CLARIN-FCS records.
+     * 
+     * @deprecated Only use to talk to legacy clients
+     */
+    @Deprecated
+    public static final String LEGACY_RECORD_SCHEMA =
+            "http://clarin.eu/fcs/1.0";
     private final Resource resource;
 
@@ -54 +63 @@
     /**
      * Get the CLARIN-FCS record resource.
-     * 
+     *
      * @return a {@link Resource} object
      */

SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/ClarinFCSRecordDataParser.java

@@ -17 +17 @@
 package eu.clarin.sru.client.fcs;
 
-import java.util.LinkedList;
 import java.util.List;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import eu.clarin.sru.client.SRUClientException;
 import eu.clarin.sru.client.SRURecordData;
-import eu.clarin.sru.client.SRURecordDataParser;
-import eu.clarin.sru.client.XmlStreamReaderUtils;
 
 
 /**
- * A record parse to parse records conforming to CLARIN-FCS specification.
+ * A record data parse to parse records conforming to CLARIN-FCS specification.
  */
-public class ClarinFCSRecordParser implements SRURecordDataParser {
-    private static final Logger logger =
-            LoggerFactory.getLogger(ClarinFCSRecordParser.class);
-    private static final String FCS_NS =
-            ClarinFCSRecordData.RECORD_SCHEMA;
-    // TODO: make this configurable
-    private final DataViewParser[] parsers = new DataViewParser[] {
-            new DataViewParserGenericDOM(),
-//            new DataViewParserGenericString(),
-            new DataViewParserKWIC()
-    };
+public class ClarinFCSRecordDataParser extends
+        AbstractClarinFCSRecordDataParser {
+
+
+    /**
+     * Constructor.
+     *
+     * @param parsers
+     *            the list of data view parsers to be used by this record data
+     *            parser. This list should contain one
+     *            {@link DataViewParserGenericDOM} or
+     *            {@link DataViewParserGenericString} instance.
+     * @throws NullPointerException
+     *             if parsers is <code>null</code>
+     * @throws IllegalArgumentException
+     *             if parsers is empty or contains duplicate entries
+     */
+    public ClarinFCSRecordDataParser(List<DataViewParser> parsers) {
+        super(parsers);
+    }
+
 
 
@@ -57 +63 @@
         logger.debug("parsing CLARIN-FCS record");
 
-        // Resource
-        XmlStreamReaderUtils.readStart(reader, FCS_NS, "Resource", true, true);
-        String pid = XmlStreamReaderUtils.readAttributeValue(reader, null, "pid");
-        String ref = XmlStreamReaderUtils.readAttributeValue(reader, null, "ref");
-        XmlStreamReaderUtils.consumeStart(reader);
-
-        // Resource/Resource (optional)
-        if (XmlStreamReaderUtils.readStart(reader, FCS_NS, "Resource", false)) {
-            logger.info("skipping nested <Resource> element");
-            XmlStreamReaderUtils.readEnd(reader, FCS_NS, "Resource", true);
-        }
-
-        // Resource/DataView
-        final List<DataView> dataviews = parseDataViews(reader);
-
-        // Resource/ResourceFragment
-        final List<Resource.ResourceFragment> resourceFragments =
-                parseResourceFragments(reader);
-
-        XmlStreamReaderUtils.readEnd(reader, FCS_NS, "Resource", true);
-
-        return new ClarinFCSRecordData(pid, ref, dataviews, resourceFragments);
-    }
-
-
-    private List<DataView> parseDataViews(XMLStreamReader reader)
-            throws XMLStreamException, SRUClientException {
-        List<DataView> dataviews = null;
-
-        while (XmlStreamReaderUtils.readStart(reader, FCS_NS, "DataView", false, true)) {
-            String pid = XmlStreamReaderUtils.readAttributeValue(reader, null, "pid");
-            String ref = XmlStreamReaderUtils.readAttributeValue(reader, null, "ref");
-            String type = XmlStreamReaderUtils.readAttributeValue(reader, null, "type");
-            if ((type == null) || type.isEmpty()) {
-                throw new SRUClientException("element <DataView> needs a "
-                        + "non-empty 'type' attribute");
-            }
-
-            // consume start element and get rid of any whitespace
-            XmlStreamReaderUtils.consumeStart(reader);
-            XmlStreamReaderUtils.consumeWhitespace(reader);
-
-            logger.debug("processing <DataView> of type = {}", type);
-
-            DataViewParser parser = null;
-            for (int i = 0; i < parsers.length; i++) {
-                if (parsers[i].acceptType(type) &&
-                        ((parser == null) ||
-                         (parser.getPriority() < parsers[i].getPriority()))) {
-                    parser = parsers[i];
-                }
-            }
-
-            DataView dataview = null;
-            if (parser != null) {
-                dataview = parser.parse(reader, type, pid, ref);
-            } else {
-                logger.warn("no parser found for <DataView> of type = {}", type);
-            }
-
-            XmlStreamReaderUtils.readEnd(reader, FCS_NS, "DataView", true);
-
-            if (dataview != null) {
-                if (dataviews == null) {
-                    dataviews = new LinkedList<DataView>();
-                }
-                dataviews.add(dataview);
-            } else {
-                logger.warn("skipped <DataView> of type = {}", type);
-            }
-        } // while
-        return dataviews;
-    }
-
-
-    private List<Resource.ResourceFragment> parseResourceFragments(
-            XMLStreamReader reader) throws XMLStreamException,
-            SRUClientException {
-        List<Resource.ResourceFragment> resourceFragments = null;
-        while (XmlStreamReaderUtils.readStart(reader, FCS_NS, "ResourceFragment", false, true)) {
-            logger.debug("found ResourceFragment");
-            String pid = XmlStreamReaderUtils.readAttributeValue(reader, null, "pid");
-            String ref = XmlStreamReaderUtils.readAttributeValue(reader, null, "ref");
-            XmlStreamReaderUtils.consumeStart(reader);
-            final List<DataView> dataviews = parseDataViews(reader);
-            XmlStreamReaderUtils.readEnd(reader, FCS_NS, "ResourceFragment", true);
-
-            if (resourceFragments == null) {
-                resourceFragments = new LinkedList<Resource.ResourceFragment>();
-            }
-            resourceFragments.add(new Resource.ResourceFragment(pid, ref, dataviews));
-        } // while
-        return resourceFragments;
+        return parse(reader, ClarinFCSRecordData.RECORD_SCHEMA);
     }
 

SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java

@@ -29 +29 @@
     private static final String FCS_KWIC_NS = "http://clarin.eu/fcs/1.0/kwic";
     private static final String KWIC_LEGACY_TYPE = "kwic";
+    private static final String KWIC_TYPE =
+            "application/x-clarin-fcs-kwic+xml";
     private static final Logger logger =
             LoggerFactory.getLogger(DataViewParserKWIC.class);
@@ -34 +36 @@
     @Override
     public boolean acceptType(String type) {
-        return DataViewKWIC.TYPE.equals(type) ||
-                KWIC_LEGACY_TYPE.equals(type);
+        return KWIC_TYPE.equals(type) || KWIC_LEGACY_TYPE.equals(type);
     }
 
@@ -47 +48 @@
             String ref) throws XMLStreamException, SRUClientException {
         if (KWIC_LEGACY_TYPE.equals(type)) {
-            logger.warn("type '" + KWIC_LEGACY_TYPE + "' is deprecteded for a KWIC <DataView>, please use '" + DataViewKWIC.TYPE + "' instead");
+            logger.warn("type '" + KWIC_LEGACY_TYPE + "' is deprecated " +
+                    "for a KWIC <DataView>, please use '" +
+                    KWIC_TYPE + "' instead");
         }
         String left = null;
@@ -67 +70 @@
         logger.debug("left='{}' keyword='{}', right='{}'",
                 left, keyword, right);
-        return new DataViewKWIC(pid, ref, left, keyword, right);
+
+        logger.warn("Upgraded deprecated KWIC dataview to HITS dataview. " +
+                "Please upgrade to the new CLARIN-FCS specification " +
+                "as soon as possible.");
+        final int[] offsets    = new int[3];
+        final StringBuilder sb = new StringBuilder();
+        if (left != null) {
+            sb.append(left);
+            if (!Character.isWhitespace(sb.charAt(sb.length() - 1))) {
+                sb.append(" ");
+            }
+        }
+        offsets[0] = sb.length();
+        sb.append(keyword);
+        offsets[1] = sb.length();
+        if (right != null) {
+            if (!Character.isWhitespace(sb.charAt(sb.length() - 1))) {
+                sb.append(" ");
+            }
+            sb.append(right);
+        }
+        return new DataViewHits(pid, ref, sb.toString(), offsets, 3);
     }
 

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestClient.java

@@ -20 +20 @@
 import org.slf4j.LoggerFactory;
 
-import eu.clarin.sru.client.fcs.ClarinFCSRecordParser;
+import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder;
 
 
@@ -31 +31 @@
         if (args.length > 0) {
             logger.info("initializing client ...");
-            SRUClient client = new SRUClient();
 
-            // register record data parsers
-            client.registerRecordParser(new ClarinFCSRecordParser());
+            SRUClient client = ClarinFCSClientBuilder.create()
+                    .defaults()
+                    .unkownDataViewAsString()
+                    .enableLegacySupport()
+                    .buildClient();
 
             // explain

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestSimpleClient.java

@@ -22 +22 @@
 import org.slf4j.LoggerFactory;
 
+import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder;
 import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
-import eu.clarin.sru.client.fcs.ClarinFCSRecordParser;
 
 
@@ -33 +33 @@
         if (args.length > 0) {
             logger.info("initializing client ...");
-            SRUSimpleClient client = new SRUSimpleClient();
 
-            // register record data parsers
-            client.registerRecordParser(new ClarinFCSRecordParser());
+            SRUSimpleClient client = ClarinFCSClientBuilder
+                        .create()
+                        .defaults()
+                        .unkownDataViewAsString()
+                        .buildSimpleClient();
 
             /*

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestThreadedClient.java

@@ -23 +23 @@
 import org.slf4j.LoggerFactory;
 
-import eu.clarin.sru.client.fcs.ClarinFCSRecordParser;
+import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder;
 
 @Deprecated
@@ -33 +33 @@
         if (args.length > 0) {
             logger.info("initializing client ...");
-            SRUThreadedClient client = new SRUThreadedClient();
 
-            // register record data parsers
-            client.registerRecordParser(new ClarinFCSRecordParser());
+            SRUThreadedClient client = ClarinFCSClientBuilder
+                    .create()
+                    .defaults()
+                    .buildThreadedClient();
 
             try {

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestThreadedClientCallback.java

@@ -22 +22 @@
 import org.slf4j.LoggerFactory;
 
-import eu.clarin.sru.client.fcs.ClarinFCSRecordParser;
+import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder;
 
 
@@ -32 +32 @@
         if (args.length > 0) {
             logger.info("initializing client ...");
-            SRUThreadedClient client = new SRUThreadedClient();
 
-            // register record data parsers
-            client.registerRecordParser(new ClarinFCSRecordParser());
+            SRUThreadedClient client = ClarinFCSClientBuilder
+                    .create()
+                    .defaults()
+                    .buildThreadedClient();
 
             try {

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestUtils.java

@@ -30 +30 @@
 import eu.clarin.sru.client.fcs.DataViewGenericDOM;
 import eu.clarin.sru.client.fcs.DataViewGenericString;
-import eu.clarin.sru.client.fcs.DataViewKWIC;
+import eu.clarin.sru.client.fcs.DataViewHits;
 import eu.clarin.sru.client.fcs.Resource;
 
@@ -60 +60 @@
         SRUSearchRetrieveRequest request = new SRUSearchRetrieveRequest(baseURI);
         request.setQuery(query);
-        request.setRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA);
+//        request.setRecordSchema(ClarinFCSRecordData.LEGACY_RECORD_SCHEMA);
         request.setMaximumRecords(5);
         request.setRecordPacking(SRURecordPacking.XML);
@@ -214 +214 @@
                 final DataViewGenericDOM view = (DataViewGenericDOM) dataview;
                 final Node root = view.getDocument().getFirstChild();
-                logger.info("{}DataView: root element <{}> / {}",
+                logger.info("{}DataView (generic dom): root element <{}> / {}",
                         s, root.getNodeName(),
                         root.getOwnerDocument().hashCode());
             } else if (dataview instanceof DataViewGenericString) {
-                final DataViewGenericString view = (DataViewGenericString) dataview;
-                logger.info("{}DataView: data = {}", s, view.getContent());
-            } else if (dataview.isMimeType(DataViewKWIC.TYPE)) {
-                final DataViewKWIC kw = (DataViewKWIC) dataview;
-                logger.info("{}DataView: {} / {} / {}",
-                        s, kw.getLeft(), kw.getKeyword(), kw.getRight());
-            }
-        }
+                final DataViewGenericString view =
+                        (DataViewGenericString) dataview;
+                logger.info("{}DataView (generic string): data = {}",
+                        s, view.getContent());
+            } else if (dataview instanceof DataViewHits) {
+                final DataViewHits hits = (DataViewHits) dataview;
+                logger.info("{}DataView: {}",
+                        s, addHitHighlights(hits));
+            } else {
+                logger.info("{}DataView: cannot display " +
+                        "contents of unexpected class '{}'",
+                        s, dataview.getClass().getName());
+            }
+        }
+    }
+
+
+    private static String addHitHighlights(DataViewHits hits) {
+        StringBuilder sb = new StringBuilder(hits.getText());
+        int corr = 0;
+        for (int i = 0; i < hits.getHitCount(); i++) {
+            int[] offsets = hits.getHitOffsets(i);
+            sb.insert(offsets[0] + corr, "[");
+            corr += 1;
+            sb.insert(offsets[1] + corr, "]");
+            corr += 1;
+        }
+        return sb.toString();
     }