Changeset 2187

Timestamp:

08/31/12 13:25:27 (12 years ago)

Author:

zastrow

Message:

 

File:

• SRUAggregator/trunk/src/java/clarind/fcs/Aggregator.java (modified) (11 diffs)

SRUAggregator/trunk/src/java/clarind/fcs/Aggregator.java

@@ -1 +1 @@
 package clarind.fcs;
 
-//import eu.clarin.sru.client.SRUClient;
-//import eu.clarin.sru.client.SRUClientException;
-//import eu.clarin.sru.client.SRUDefaultHandlerAdapter;
-//import eu.clarin.sru.client.SRURecordData;
-//import eu.clarin.sru.client.SRUSearchRetrieveRequest;
-//import eu.clarin.sru.client.SRUVersion;
-//import eu.clarin.sru.fcs.ClarinFederatedContentSearchRecordData;
-//import eu.clarin.sru.fcs.ClarinFederatedContentSearchRecordParser;
 import java.util.ArrayList;
 import org.zkoss.zhtml.Filedownload;
@@ -26 +18 @@
 import org.zkoss.zul.Separator;
 import org.zkoss.zul.Label;
-//import org.zkoss.zul.Html;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Grid;
-//import org.zkoss.zul.Panelchildren;
 import org.zkoss.zul.Columns;
 import org.zkoss.zul.Column;
@@ -35 +25 @@
 import org.zkoss.zul.Iframe;
 import org.zkoss.zul.Window;
+import java.util.logging.*;
+
 
 public class Aggregator extends SelectorComposer<Component> {
+    
+    private static Logger logger = Logger.getLogger("FCS-AGGREGATOR");
 
     @Wire
@@ -63 +57 @@
     @Override
     public void doAfterCompose(Component comp) throws Exception {
-        super.doAfterCompose(comp); //wire variables and event listners
-        //do whatever you want (you could access wired variables here)
+        super.doAfterCompose(comp); 
 
         languageSelect.setSelectedItem(german);
@@ -75 +68 @@
         for (i = 0; i < ep.size(); i++) {
 
-            System.out.println("Calling corpora ...: " + ep.get(i).getUrl());
+            logger.info("Calling corpora ...: " + ep.get(i).getUrl());
             ArrayList<Corpus> corpora = harv.getCorporaOfAnEndpoint(ep.get(i).getUrl());
 
-            if (corpora.size() == 0) {
+            if (corpora.isEmpty()) {
                 Checkbox cb = new Checkbox();
                 cb.setId(ep.get(i).getUrl());
@@ -88 +81 @@
                 allCorpora.getChildren().add(new Separator());
 
-                System.out.println("CHECKBOX: " + cb.getId());
+                logger.info("Created Checkbox for endpoint" + cb.getId());
             } else {
                 Label l = new Label(ep.get(i).getUrl() + ":");
@@ -105 +98 @@
                     allCorpora.getChildren().add(new Separator());
 
-                    System.out.println("CHECKBOX: " + cb.getId());
+                    logger.info("Created Checkbox for corpus " + cb.getId());
                 } // for i2 ...
             } // if corpora.size else
@@ -270 +263 @@
 
                         isACorpusSelected = true;
-
-                        System.out.println("---- THE SEARCH ----");
-
+                        
                         String endpointURL = null;
                         String corpus = null;
@@ -283 +274 @@
                         }
 
-                        System.out.println("enddpointURL: " + endpointURL);
-                        System.out.println("corpus: " + corpus);
                         SRUSearch srusearch = new SRUSearch();
-                        System.out.println("Calling the client ");
 
                         resultsVbox.appendChild(new Label("Query: " + searchString.getText()));
@@ -295 +283 @@
 
 
-
+                        logger.info("Now executing search: " + searchString.getText() + " " + endpointURL + " " +  corpus + " " + 10);
                         ArrayList<Row> zeilen = srusearch.execute(searchString.getText(), endpointURL, corpus, 10);
 
@@ -351 +339 @@
 
 
-            System.out.println("Search is done.");
+           logger.info("Search done.");
 
         } catch (Exception ex) {