Changeset 5036

Timestamp:

04/24/14 09:59:32 (10 years ago)

Author:

yana.panchenko@uni-tuebingen.de

Message:

change language selection effect

If a language is selected, only those top corpora are shown that have this language specified as the only language of the corpus. Before, the top corpora that have this language and any other languages could be shown. This change will help to avoid the situation when a mixture of languages appear in the search result even if the user selected a particular language.

Location:

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

Files:

• app/SearchOptions.java (modified) (2 diffs)
• app/WebAppListener.java (modified) (2 diffs)
• cache/SimpleInMemScanCache.java (modified) (5 diffs)

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

@@ -101 +101 @@
     }
 
+//    @Listen("onSelect = #languageSelect")
+//    public void onSelectLanguage(Event ev) {
+//        Combobox cbox = (Combobox) ev.getTarget();
+//        String selectedLang = cbox.getSelectedItem().getValue();
+//        for (Component comp : tree.getTreechildren().getChildren()) {
+//            Treeitem treeitem = (Treeitem) comp;
+//            DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) treeitem.getValue();
+//            Corpus corpus = node.getData();
+//            if (corpus.getLanguages().contains(selectedLang) || selectedLang.equals(Languages.ANY_LANGUAGE_NAME)) {
+//                treeitem.setVisible(true);
+//            } else {
+//                corpusRenderer.updateItem(treeitem, false);
+//                treeitem.setVisible(false);
+//            }
+//        }
+//    }
+    
+    
     @Listen("onSelect = #languageSelect")
     public void onSelectLanguage(Event ev) {
@@ -109 +127 @@
             DefaultTreeNode<Corpus> node = (DefaultTreeNode<Corpus>) treeitem.getValue();
             Corpus corpus = node.getData();
-            if (corpus.getLanguages().contains(selectedLang) || selectedLang.equals(Languages.ANY_LANGUAGE_NAME)) {
+            if ((corpus.getLanguages().contains(selectedLang) && corpus.getLanguages().size() == 1) 
+                    || selectedLang.equals(Languages.ANY_LANGUAGE_NAME)) {
                 treeitem.setVisible(true);
             } else {

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

@@ -52 +52 @@
     private static final TimeUnit CACHE_UPDATE_INTERVAL_UNIT = TimeUnit.HOURS;
     private static final int CACHE_UPDATE_INTERVAL = 5;
-    private static final int CACHE_MAX_DEPTH = 3;
+    private static final int CACHE_MAX_DEPTH = 2;
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     public static final String CORPUS_CRAWLER = "CORPUS_CRAWLER";
@@ -113 +113 @@
         EndpointUrlFilter filter = new EndpointUrlFilter();
         //filter.urlShouldContainAnyOf("leipzig", ".mpi.nl");
-        //filter.urlShouldContainAnyOf("uni-tuebingen.de", ".mpi.nl");
-        filter.urlShouldContainAnyOf("dspin.dwds.de", "lindat.");
+        filter.urlShouldContainAnyOf("uni-tuebingen.de", ".mpi.nl");
+        //filter.urlShouldContainAnyOf("dspin.dwds.de", "lindat.");
         ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, filter, CACHE_MAX_DEPTH);
         //ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruScanClient, null, CACHE_MAX_DEPTH);

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/cache/SimpleInMemScanCache.java

@@ -7 +7 @@
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -57 +58 @@
     public void addCorpus(Corpus c, Corpus parentCorpus) {
 
-        // index top corpora with unique language as for their languages
-        //if (c.getLanguages().size() == 1 && 
-        //        (root || this.))
+        
 
         handleToCorpus.put(c.getHandle(), c);
@@ -83 +82 @@
             corpusToChildren.get(parentCorpus.getHandle()).add(c);
             //childToParent.put(c.getHandle(), parentCorpus.getHandle());
+        }
+        
+        // index top corpora with unique language as for their languages
+        if (c.getLanguages().size() == 1 && 
+                (parentCorpus == null || parentCorpus.getLanguages().size() > 0)) {
+            String lang = getElementOfStringUnitset(c.getLanguages());
+            if (!langToTopUniqueCorpora.containsKey(lang)) {
+                langToTopUniqueCorpora.put(lang, new LinkedHashSet<Corpus>());
+            }
+            langToTopUniqueCorpora.get(lang).add(c);
         }
     }
@@ -146 +155 @@
     @Override
     public Map<String, Set<Corpus>> getTopUniqueLangToCorpora() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return this.langToTopUniqueCorpora;
     }
 
     @Override
     public List<Corpus> getTopUniqueLanguageCorpora(String lang) {
-        throw new UnsupportedOperationException("Not supported yet."); 
+        ArrayList<Corpus> corpora = new ArrayList<Corpus>(langToTopUniqueCorpora.get(lang).size());
+        corpora.addAll(langToTopUniqueCorpora.get(lang));
+        return corpora;
     }
 
@@ -158 +169 @@
         return this.handleToCorpus.get(handle);
     }
+
+    private String getElementOfStringUnitset(Set<String> stringUnitSet) {
+        return stringUnitSet.iterator().next();
+    }
 }