Changeset 4069 for SRUAggregator

Timestamp:

11/21/13 13:17:06 (11 years ago)

Author:

yana

Message:

added: plain-text export of search results; excel export of search results; in TCF iexport TCF s tokenized and matched layer added with source corpus information - only for German language corpora.

Location:

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator

Files:

• app/Aggregator.java (modified) (3 diffs)
• app/CacheCorporaScanIntoFileTask.java (modified) (4 diffs)
• app/SearchOptions.java (modified) (5 diffs)
• app/SearchResults.java (modified) (10 diffs)
• app/WebAppListener.java (modified) (4 diffs)
• sopt/CorpusRendererCached.java (modified) (3 diffs)
• sresult/SearchResult.java (modified) (2 diffs)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -128 +128 @@
         searchResultsComposer.exportTCF();
     }
+    
+    @Listen("onClick=#downloadText")
+    public void onExportResultsText(Event ev) {
+        searchResultsComposer.exportText();
+    }
+    
+    @Listen("onClick=#downloadExcel")
+    public void onExportResultsExcel(Event ev) {
+        searchResultsComposer.exportExcel();
+    }
 
     @Listen("onClick=#exportPWCSV")
@@ -138 +148 @@
     public void onExportResultsPWTCF(Event ev) {
         exportDataType = 0;
+        wspaceSigninpop.open(srDiv, "top_center");
+    }
+    
+    @Listen("onClick=#exportPWText")
+    public void onExportResultsPWText(Event ev) {
+        exportDataType = 2;
+        wspaceSigninpop.open(srDiv, "top_center");
+    }
+    
+    @Listen("onClick=#exportPWExcel")
+    public void onExportResultsPWExcel(Event ev) {
+        exportDataType = 3;
         wspaceSigninpop.open(srDiv, "top_center");
     }
@@ -152 +174 @@
             if (exportDataType == 0) {
                 searchResultsComposer.exportPWTCF(user, pswd);
-            } else {
+            } else if (exportDataType == 1) {
                 searchResultsComposer.exportPWCSV(user, pswd);
+            } else if (exportDataType == 2) {
+                searchResultsComposer.exportPWText(user, pswd);
+            } else if (exportDataType == 3) {
+                searchResultsComposer.exportPWExcel(user, pswd);
             }
         }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/CacheCorporaScanIntoFileTask.java

@@ -11 +11 @@
 import eu.clarin.sru.fcs.aggregator.sopt.Corpus;
 import static eu.clarin.sru.fcs.aggregator.sopt.Corpus.ROOT_HANDLE;
-import eu.clarin.sru.fcs.aggregator.sopt.CorpusCache;
-import eu.clarin.sru.fcs.aggregator.sopt.CorpusModelLive;
 import eu.clarin.sru.fcs.aggregator.sopt.Endpoint;
 import eu.clarin.sru.fcs.aggregator.sopt.InstitutionI;
-import eu.clarin.sru.fcs.aggregator.sopt.Languages;
 import eu.clarin.sru.fcs.aggregator.util.SRUCQLscan;
 import java.io.BufferedOutputStream;
@@ -22 +19 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -37 +27 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
 import org.w3c.dom.DocumentFragment;
@@ -43 +32 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.zkoss.zk.ui.Executions;
-import org.zkoss.zul.DefaultTreeNode;
 
 /**

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/SearchOptions.java

@@ -23 +23 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -143 +144 @@
         Treechildren openTreeItems = tree.getTreechildren();
         for (Treeitem openItem : openTreeItems.getItems()) {
+            
+            DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) openItem.getValue();
+            Corpus data = node.getData();
+            System.out.println(data);
+            
             corpusRenderer.updateItem(openItem, false);
         }
@@ -150 +156 @@
         onDeselectAll(null);
         Treechildren openTreeItems = tree.getTreechildren();
-        for (Treeitem openItem : openTreeItems.getItems()) {
+        
+        List<Treeitem> openitems = new ArrayList<Treeitem>();
+        openitems.addAll(openTreeItems.getItems());
+            
+        for (Treeitem openItem : openitems) {
             DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) openItem.getValue();
             Corpus data = node.getData();
@@ -172 +182 @@
                         }
                     }
+                    
+//                    // this is a temporary solution,
+//                    // the whole concept on how selected externally resources
+//                    // are displayed has to be changed, otherwise endpoints with
+//                    // hundreds of subresources will break the tree interface
+//                    // by loading all their resources...
+//                    List<String> handlesCopy = new ArrayList<String>(handles.size());
+//                    handlesCopy.addAll(handles);
+//                    selectCorpora(openItem, data, handlesCopy);
                 }
             }
@@ -300 +319 @@
     }
 
+    private void selectCorpora(Treeitem openItem, Corpus data, List<String> handles) {
+        List<String> handlesFound = new ArrayList<String>();
+        for (String handle : handles) {
+            if (handle.equals(data.getHandle())) {
+                handlesFound.add(handle);
+            }
+        }
+        for (String handle : handlesFound) {
+            corpusRenderer.updateItem(openItem, true);
+            handles.remove(handle);
+        }
+        
+        if (!handles.isEmpty()) {
+            int sizeBefore = handles.size();
+            openItem.setOpen(true);
+            Treechildren tchildren = openItem.getTreechildren();
+            List<Treeitem> tcitems = new ArrayList<Treeitem>();
+            tcitems.addAll(tchildren.getItems());
+            for (Treeitem child : tcitems) {
+                DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) child.getValue();
+                Corpus cdata = node.getData();
+                selectCorpora(child, cdata, handles);
+                if (handles.isEmpty()) {
+                    break;
+                }
+            }
+            if (sizeBefore == handles.size()) {
+                openItem.setOpen(false);
+            }
+        }
+    }
+
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/SearchResults.java

@@ -33 +33 @@
 import eu.clarin.weblicht.wlfxb.io.WLFormatException;
 import eu.clarin.weblicht.wlfxb.md.xb.MetaData;
+import eu.clarin.weblicht.wlfxb.tc.api.MatchedCorpus;
+import eu.clarin.weblicht.wlfxb.tc.api.Token;
 import eu.clarin.weblicht.wlfxb.tc.xb.TextCorpusStored;
 import eu.clarin.weblicht.wlfxb.xb.WLData;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -45 +48 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
+import opennlp.tools.tokenize.TokenizerME;
+import opennlp.tools.tokenize.TokenizerModel;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.zkoss.zhtml.Filedownload;
 import org.zkoss.zk.ui.event.EventListener;
@@ -86 +97 @@
     private Languages languages;
 
+
     @Override
     public void doAfterCompose(Component comp) throws Exception {
@@ -155 +167 @@
 
     private SearchResult executeSearch(Corpus corpus, String searchString) {
-        SearchResult resultsItem = new SearchResult(corpus);
+        SearchResult resultsItem = new SearchResult(corpus, searchString);
         LOGGER.log(Level.INFO, "Executing search for {0} query={1} maxRecords={2}",
                 new Object[]{corpus.toString(), searchString, maxRecords});
@@ -366 +378 @@
     
     public void exportTCF() {
-            byte[] bytes = getExportTCF();
+            byte[] bytes = getExportTokenizedTCF();
             if (bytes != null) {
                 Filedownload.save(bytes, "text/tcf+xml", "ClarinDFederatedContentSearch.xml");
@@ -372 +384 @@
     }
     
+    public void exportText() {
+            String text = getExportText().toString();
+            if (text != null) {
+                Filedownload.save(text, "text/plain", "ClarinDFederatedContentSearch.txt");
+        }
+    }
+    
+    
+    void exportExcel() {
+        
+        byte[] bytes = getExportExcel();
+            if (bytes != null) {
+                Filedownload.save(bytes, "text/tcf+xml", "ClarinDFederatedContentSearch.xls");
+        }
+    }
+
+    private byte[] getExportExcel() {
+        
+        boolean noResult = true;
+        SXSSFWorkbook workbook = null;
+        ByteArrayOutputStream excelStream = new ByteArrayOutputStream();
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            try {
+                String[] headers = new String[] {
+                    "LEFT CONTEXT", "KEYWORD", "RIGHT CONTEXT", "PID", "REFERENCE"};
+            
+                workbook = new SXSSFWorkbook();
+                Sheet sheet = workbook.createSheet();
+
+                Font boldFont = workbook.createFont();
+                boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+
+                // Header
+                CellStyle headerStyle = workbook.createCellStyle();
+                headerStyle.setFont(boldFont);
+
+                Row row = sheet.createRow(0);
+
+                for (int j = 0; j < headers.length; ++j) {
+                    Cell cell = row.createCell(j, Cell.CELL_TYPE_STRING);
+                    cell.setCellValue(headers[j]);
+                    cell.setCellStyle(headerStyle);
+                }
+
+                // Body
+                Cell cell;
+                for (int k = 0; k < resultsProcessed.size(); k++) {
+                    SearchResult result = resultsProcessed.get(k);
+                    List<Kwic> kwics = result.getKwics();
+                    for (int i = 0; i < kwics.size(); i++) {
+                        Kwic kwic = kwics.get(i);
+                        row = sheet.createRow(k + i + 1);
+                        cell = row.createCell(0, Cell.CELL_TYPE_STRING);
+                        cell.setCellValue(kwic.getLeft());
+                        cell = row.createCell(1, Cell.CELL_TYPE_STRING);
+                        cell.setCellValue(kwic.getKeyword());
+                        cell = row.createCell(2, Cell.CELL_TYPE_STRING);
+                        cell.setCellValue(kwic.getRight());
+                        if (kwic.getPid() != null) {
+                            cell = row.createCell(3, Cell.CELL_TYPE_STRING);
+                            cell.setCellValue(kwic.getPid());
+                        }
+                        if (kwic.getReference() != null) {
+                            cell = row.createCell(3, Cell.CELL_TYPE_STRING);
+                            cell.setCellValue(kwic.getReference());
+                        }
+                        noResult = false;
+                    }
+                }
+                workbook.write(excelStream);
+            } catch (IOException ex) {
+                // should not happen
+                Logger.getLogger(SearchResults.class.getName()).log(Level.SEVERE, null, ex);
+            } finally {
+                if (workbook != null) {
+                    workbook.dispose();
+                }
+            }
+        }
+        if (noResult) {
+            Messagebox.show("Nothing to export!");
+            return null;
+        } else {
+            return excelStream.toByteArray();
+        }
+        
+    }
+
+    void exportPWText(String user, String pass) {
+        byte[] bytes = null;
+        try {
+            bytes = getExportText().toString().getBytes("UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            Logger.getLogger(SearchResults.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        if (bytes != null) {
+            uploadToPW(user, pass, bytes, "text/plan",".txt");
+        }
+    }
+
+    void exportPWExcel(String user, String pass) {
+        byte[] bytes = getExportExcel();
+            if (bytes != null) {
+                uploadToPW(user, pass, bytes, "application/vnd.ms-excel",".xls");
+        }
+    }
+    
    public void exportPWTCF(String user, String pass) {
        
-       byte[] bytes = getExportTCF();
+       byte[] bytes = getExportTokenizedTCF();
             if (bytes != null) {
                 uploadToPW(user, pass, bytes, "text/tcf+xml",".tcf");
@@ -436 +555 @@
     }
     
+    
+        private byte[] getExportTokenizedTCF() {
+        StringBuilder text = new StringBuilder();
+        Set<String> resultsLangs = new HashSet<String>();
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            for (SearchResult result : resultsProcessed) {
+                resultsLangs.addAll(result.getCorpus().getLanguages());
+                for (Kwic kwic : result.getKwics()) {
+                    text.append(kwic.getLeft());
+                    text.append(" ");
+                    text.append(kwic.getKeyword());
+                    text.append(" ");
+                    text.append(kwic.getRight());
+                    text.append("\n");
+                }
+            }
+
+        }
+        ByteArrayOutputStream os = null;
+        if (text.length() == 0) {
+            Messagebox.show("Nothing to export!");
+        } else {
+            WLData data;
+            MetaData md = new MetaData();
+            String resultsLang = "unknown";
+            if (resultsLangs.size() == 1) {
+                resultsLang = resultsLangs.iterator().next();
+                String code2 = languages.code2ForCode(resultsLang);
+                if (code2 != null) {
+                    resultsLang = code2;
+                }
+            } else if (!searchLanguage.equals("anylang")) {
+                String code2 = languages.code2ForCode(searchLanguage);
+                if (code2 == null) {
+                    resultsLang = searchLanguage;
+                } else {
+                    resultsLang = code2;
+                }
+            }
+            TextCorpusStored tc = new TextCorpusStored(resultsLang);
+            tc.createTextLayer().addText(text.toString());
+            addTokensSentencesMatches(tc);
+            data = new WLData(md, tc);
+            os = new ByteArrayOutputStream();
+            try {
+                WLDObjector.write(data, os);
+            } catch (WLFormatException ex) {
+                LOGGER.log(Level.SEVERE, "Error exporting TCF {0} {1}", new String[]{ex.getClass().getName(), ex.getMessage()});
+                Messagebox.show("Sorry, export error!");
+            }
+        }
+        if (os == null) {
+            return null;
+        } else {
+            return os.toByteArray();
+        }
+    }
+    
+        
+    private void addTokensSentencesMatches(TextCorpusStored tc) {
+        
+        TokenizerModel model = (TokenizerModel) Executions.getCurrent().getDesktop().getWebApp().getAttribute(WebAppListener.DE_TOK_MODEL);
+        
+        if (model == null || !tc.getLanguage().equals("de")) {
+            return;
+        }
+        TokenizerME tokenizer = new TokenizerME(model);
+        
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            tc.createTokensLayer();
+            tc.createSentencesLayer();
+            tc.createMatchesLayer("FCS", resultsProcessed.get(0).getSearchString());
+            for (SearchResult result : resultsProcessed) {
+                MatchedCorpus mCorpus = tc.getMatchesLayer().addCorpus(result.getCorpus().getDisplayName(), result.getCorpus().getHandle());
+                for (Kwic kwic : result.getKwics()) {
+                    List<Token> tokens = new ArrayList<Token>();
+                    addToTcfTokens(tokens, tc, tokenizer.tokenize(kwic.getLeft()));
+                    String[] target = tokenizer.tokenize(kwic.getKeyword());
+                    List<Token> targetTokens = addToTcfTokens(tokens, tc, target);
+                    addToTcfTokens(tokens, tc, tokenizer.tokenize(kwic.getRight()));
+                    tc.getSentencesLayer().addSentence(tokens);
+                    List<String> pidAndRef = new ArrayList<String>();
+                    if (kwic.getPid() != null) {
+                        pidAndRef.add(kwic.getPid());
+                    }
+                    if (kwic.getReference() != null) {
+                        pidAndRef.add(kwic.getReference());
+                    }
+                    tc.getMatchesLayer().addItem(mCorpus, targetTokens, pidAndRef);
+                }
+            }
+        }
+    }
+    
+    
+    private List<Token> addToTcfTokens(List<Token> tokens, TextCorpusStored tc, String[] tokenStrings) {
+        List<Token> addedTokens = new ArrayList<Token>(tokenStrings.length);
+        for (String tokenString : tokenStrings) {
+            Token token = tc.getTokensLayer().addToken(tokenString);
+            addedTokens.add(token);
+            tokens.add(token);
+        }
+        return addedTokens;
+    }
+    
+    private CharSequence getExportText() {
+        StringBuilder text = new StringBuilder();
+        //Set<String> resultsLangs = new HashSet<String>();
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            for (SearchResult result : resultsProcessed) {
+                //resultsLangs.addAll(result.getCorpus().getLanguages());
+                for (Kwic kwic : result.getKwics()) {
+                    text.append(kwic.getLeft());
+                    text.append(" ");
+                    text.append(kwic.getKeyword());
+                    text.append(" ");
+                    text.append(kwic.getRight());
+                    text.append("\n");
+                }
+            }
+
+        }
+        if (text.length() == 0) {
+            Messagebox.show("Nothing to export!");
+            return null;
+        } else {
+            return text;
+        }
+    }
+    
     public void exportCSV() {
-        String csv = getExportCSV();
+        String csv = getExportCSV(";");
         if (csv != null) {
             Filedownload.save(csv.toString(), "text/plain", "ClarinDFederatedContentSearch.csv");
@@ -445 +694 @@
     
     public void exportPWCSV(String user, String pass) {
-        String csv = getExportCSV();
+        String csv = getExportCSV(";");
         if (csv != null) {
             uploadToPW(user, pass, csv.getBytes(), "text/csv",".csv");
@@ -451 +700 @@
     }
 
-    private String getExportCSV() {
+    private String getExportCSV(String separator) {
 
         boolean noResult = true;
         StringBuilder csv = new StringBuilder();
         if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
-            csv.append("\""); csv.append("LEFT CONTEXT"); csv.append("\"");
-            csv.append(",");
-            csv.append("\""); csv.append("KEYWORD"); csv.append("\"");
-            csv.append(",");
-            csv.append("\""); csv.append("RIGHT CONTEXT"); csv.append("\"");
-            csv.append(",");
-            csv.append("\""); csv.append("PID"); csv.append("\"");
-            csv.append(",");
-            csv.append("\""); csv.append("REFERENCE"); csv.append("\"");
+            String[] headers = new String[] {
+                    "LEFT CONTEXT", "KEYWORD", "RIGHT CONTEXT", "PID", "REFERENCE"};
+            for (String header : headers) {
+                csv.append("\""); csv.append(header); csv.append("\"");
+                csv.append(separator);
+            }
             csv.append("\n");
 
             for (SearchResult result : resultsProcessed) {
                 for (Kwic kwic : result.getKwics()) {
-                    csv.append("\""); csv.append(kwic.getLeft().replace("\"", "QUOTE")); csv.append("\"");
-                    csv.append(",");
-                    csv.append("\""); csv.append(kwic.getKeyword().replace("\"", "QUOTE")); csv.append("\"");
-                    csv.append(",");
-                    csv.append("\""); csv.append(kwic.getRight().replace("\"", "QUOTE")); csv.append("\"");
-                    csv.append(",");
+                    csv.append("\""); csv.append(escapeQuotes(kwic.getLeft())); csv.append("\"");
+                    csv.append(separator);
+                    csv.append("\""); csv.append(escapeQuotes(kwic.getKeyword())); csv.append("\"");
+                    csv.append(separator);
+                    csv.append("\""); csv.append(escapeQuotes(kwic.getRight())); csv.append("\"");
+                    csv.append(separator);
                     csv.append("\"");
                     if (kwic.getPid() != null) {
-                        csv.append(kwic.getPid().replace("\"", "QUOTE"));
+                        csv.append(escapeQuotes(kwic.getPid()));
                     }
                     csv.append("\"");
-                    csv.append(",");
+                    csv.append(separator);
                     csv.append("\"");
                     if (kwic.getReference() != null) {
-                        csv.append(kwic.getReference().replace("\"", "QUOTE"));
+                        csv.append(escapeQuotes(kwic.getReference()));
                     }
                     csv.append("\"");
@@ -497 +743 @@
             return csv.toString();
         }
+    }
+    
+    private CharSequence escapeQuotes(String text) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            if (ch == '"') {
+                sb.append('"');
+            }
+            sb.append(ch);
+        }
+        return sb;
     }
     

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/WebAppListener.java

@@ -7 +7 @@
 import eu.clarin.sru.fcs.aggregator.sopt.CorpusCache;
 import eu.clarin.sru.fcs.aggregator.sopt.Languages;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.HashSet;
@@ -13 +15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import opennlp.tools.tokenize.TokenizerModel;
 import org.joda.time.DateTime;
 import org.zkoss.zk.ui.WebApp;
@@ -36 +39 @@
     
     private Timer cacheTimer;
+    
+    public static final String DE_TOK_MODEL = "/tokenizer/de-tuebadz-8.0-token.bin";
 
     @Override
@@ -67 +72 @@
         CorporaScanCache cache = new CorporaScanCache(webapp.getRealPath("scan") + "/");
         webapp.setAttribute(CORPUS_CACHE, cache);
+        
+        TokenizerModel model = null;
+        try {
+            InputStream tokenizerModelDeAsIS = this.getClass().getResourceAsStream(DE_TOK_MODEL);
+            model = new TokenizerModel(tokenizerModelDeAsIS);
+            tokenizerModelDeAsIS.close();
+        } catch (IOException ex) {
+            LOGGER.log(Level.SEVERE, "Failed to load tokenizer model", ex);
+        }
+        webapp.setAttribute(DE_TOK_MODEL, model);
     }
 

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sopt/CorpusRendererCached.java

@@ -153 +153 @@
         Treecell cell2 = createCellForCorpusLanguage(data);
         dataRow.appendChild(cell2);
+        //Treecell cell6 = createCellForCorpusNumberOfRecords(data);
+        //dataRow.appendChild(cell6);
         Treecell cell5 = createCellForCorpusInstitution(data);
         dataRow.appendChild(cell5);
@@ -167 +169 @@
             corpusLabel.setParent(cell);
         } else {
+            String name = data.getDisplayName();
+            // TODO: this is temp, before some endpoint
+            // fix long names for their resources, that look 
+            // more like a description
+            if (name.length() > 50) {
+                int firstWordEnd = name.indexOf(" ");
+                if (firstWordEnd > 0) {
+                    data.setDisplayName(name.substring(0, firstWordEnd));
+                    if (data.getDescription() == null) {
+                        data.setDescription(name);
+                    }
+                }
+            }
             Label corpusLabel = new Label(data.getDisplayName());
             corpusLabel.setParent(cell);
@@ -210 +225 @@
         return cell;
     }
+    
+    private Treecell createCellForCorpusNumberOfRecords(Corpus data) {
+        Treecell cell = new Treecell();
+        if (data.getNumberOfRecords() == null) {
+            Label label = new Label("");
+            label.setParent(cell);
+        } else {
+            Label label = new Label(data.getNumberOfRecords().toString());
+            label.setParent(cell);
+        }
+        return cell;
+    }
 
     private Treecell createCellForHome(Corpus data) {

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResult.java

@@ -20 +20 @@
 
     private Corpus corpus;
+    private String searchString;
     private Future<SRUSearchRetrieveResponse> futureResponse;
     private SRUSearchRetrieveResponse response;
@@ -35 +36 @@
     }
     
-    public SearchResult(Corpus corpus) {
+    public SearchResult(Corpus corpus, String searchString) {
         this.corpus = corpus;
+        this.searchString = searchString;
     }
 
     public Corpus getCorpus() {
         return corpus;
+    }
+    
+    public String getSearchString() {
+        return searchString;
     }