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

Timestamp:

03/26/13 14:04:11 (11 years ago)

Author:

yana

Message:

fixed no-scroll-in-search-results panel bug;
added testing mode to test endpoints on development servers;
added fist functionality for the show-case: save TCF into Personal Workspace using sardine library;
added: in scan operation the resource handle is put in quotes to avoid parse error.

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (11 diffs)

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

@@ -46 +46 @@
 import eu.clarin.weblicht.wlfxb.xb.WLData;
 import javax.ws.rs.core.MediaType;
+import org.zkoss.zul.Popup;
 
 /**
  * Main window of the Aggregator application.
- * 
+ *
  * @author Yana Panchenko
  */
@@ -55 +56 @@
 
     private static final Logger logger = Logger.getLogger(Aggregator.class.getName());
-    
 //    @Wire
 //    private Grid anzeigeGrid;
@@ -88 +88 @@
     @Wire
     private Label searchResultsProgress;
-
+    @Wire
+    private Popup wspaceSigninpop;
+    @Wire
+    private Textbox wspaceUserName;
+    @Wire
+    private Textbox wspaceUserPwd;
     private WebResource mapGenerator;
     public static final String MAPS_SERVICE_URL = "http://weblicht.sfs.uni-tuebingen.de/rws/service-geolocationconsumer/resources/geoloc/";
-    
     private Map<String, List<String>> xAggregationContext;
     private SRUVersion version = SRUVersion.VERSION_1_2;
     private SearchResultsController searchResultsController;
     private CenterRegistry registry;
+    private boolean testingMode = false;
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
-        
+
         super.doAfterCompose(comp);
 
@@ -105 +110 @@
 
         languageSelect.setSelectedItem(anyLanguage);
-        
+
         searchResultsController = new SearchResultsController(resultsBox, searchResultsProgress);
         // assign the search controller to desktop, so that it can be accessed to be shutdown when the desktop is destroyed
@@ -112 +117 @@
         Set<SearchResultsController> activeControllers = (Set<SearchResultsController>) Executions.getCurrent().getDesktop().getWebApp().getAttribute(WebAppListener.ACTIVE_SEARCH_CONTROLLERS);
         activeControllers.add(searchResultsController);
-        
+
         registry = new CenterRegistry();
-        registry.loadChildren();
+        registry.loadChildren(testingMode);
         CorpusTreeModel corporaModel = new CorpusTreeModel(registry);
         tree.setModel(corporaModel);
         tree.setItemRenderer(new CorpusTreeNodeRenderer());
         tree.setMultiple(true);
-        
-        
+
+
         //tempMap();
 
@@ -127 +132 @@
     @Listen("onSelect = #languageSelect")
     public void onSelectLanguage(Event ev) {
-       //TODO
-    }
-    
-    
+        //TODO
+    }
+
     @Listen(ZulEvents.ON_AFTER_RENDER + "=#tree")
     public void onAfterRenderCorporaTree(Event ev) {
@@ -157 +161 @@
         searchResultsController.executeSearch(tree.getSelectedItems(), maxRecords, searchString.getText(), version);
     }
-    
+
     @Listen("onOK = #searchString")
     public void onEnterSearchString(Event ev) {
         onExecuteSearch(ev);
     }
- 
+
     @Listen("onClick=#clearResults")
     public void onClearResults(Event ev) {
@@ -193 +197 @@
         searchResultsController.exportTCF();
     }
+
+    @Listen("onClick=#exportResultsPWTCF")
+    public void onExportResultsPWTCF(Event ev) {
+        wspaceSigninpop.open(resultsBox, "top_center");
+    }
+
+    @Listen("onClick=#wspaceSigninBtn")
+    public void onSignInExportResultsPWTCF(Event ev) {
+        String user = wspaceUserName.getValue();
+        String pswd = wspaceUserPwd.getValue();
+        if (user.isEmpty() || pswd.isEmpty()) {
+            Messagebox.show("Need user name and password!");
+        } else {
+            wspaceUserPwd.setValue("");
+            wspaceSigninpop.close();
+            searchResultsController.exportPWTCF(user, pswd);
+        }
+    }
     
+    @Listen("onOK=#wspaceUserPwd")
+    public void onSignInExportResultsPWTCFPwdOK(Event ev) {
+        onSignInExportResultsPWTCF(ev);
+    }
+    
+    @Listen("onClick=#wspaceCancelBtn")
+    public void onSignInPWCancel(Event ev) {
+        wspaceUserPwd.setValue("");
+        wspaceSigninpop.close();
+    }
+
+
     @Listen("onClick=#addForeignEndpoint")
     public void onAddForeignEndpoint(Event ev) {
-            registry.addForeignPoint(foreignEndpointSelect.getValue().split(";")[1], foreignEndpointSelect.getValue().split(";")[0]);
+        registry.addForeignPoint(foreignEndpointSelect.getValue().split(";")[1], foreignEndpointSelect.getValue().split(";")[0]);
     }
 
     private void processParameters() {
-        
+
         String[] paramValue;
         String contextJson = null;
@@ -236 +270 @@
             paramsReceived[3] = contextJson;
         }
-        logger.log(Level.INFO, "Received parameters: query[{0}], operation[{1}], version[{2}], x-aggregation-context[{3}], ",  paramsReceived);
-        
-        
+        logger.log(Level.INFO, "Received parameters: query[{0}], operation[{1}], version[{2}], x-aggregation-context[{3}], ", paramsReceived);
+
+        paramValue = Executions.getCurrent().getParameterMap().get("mode");
+        if (paramValue != null) {
+            String mode = paramValue[0].trim();
+            if (mode.equals("testing")) {
+                testingMode = true;
+            }
+        }
 
         if (contextJson != null) {
@@ -245 +285 @@
             }.getType();
             try {
-            this.xAggregationContext = gson.fromJson(contextJson, mapType);
+                this.xAggregationContext = gson.fromJson(contextJson, mapType);
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, "Error parsing JSON from x-aggregation-context: {0} {1}", new String[]{ex.getMessage(), contextJson});
@@ -260 +300 @@
         TextCorpusStored tc = new TextCorpusStored("en");
         Token t1 = tc.createTokensLayer().addToken("Virginia");
-        List<Token> s1 = new ArrayList<Token>(); s1.add(t1);
+        List<Token> s1 = new ArrayList<Token>();
+        s1.add(t1);
         tc.createSentencesLayer().addSentence(s1);
         tc.createGeoLayer("unknown", GeoLongLatFormat.DegDec);
         //tc.getGeoLayer().addPoint("138.56027", "-34.6663", 15.0, null, null, null, t1);
         WLData data = new WLData(tc);
-        
+
         Iframe resultsPic = (Iframe) resultsBox.getFellow("resultsPic");
-        
+
         try {
-                    String output = mapGenerator.path("3").accept(MediaType.TEXT_HTML).type("text/tcf+xml").post(String.class, data);
-                    Media media = new AMedia("map-" + 4 + ".html", null, "text/html", output);
-                    resultsPic.setContent(media);
-                } catch (Exception e) {
-                    Logger.getLogger(Aggregator.class.getName()).log(Level.SEVERE, "ERROR accessing the maps generator service", e);
-                    Messagebox.show("ERROR accessing the maps generator service \n" + e.getMessage(), "FCS", 0, Messagebox.INFORMATION);
-                }
+            String output = mapGenerator.path("3").accept(MediaType.TEXT_HTML).type("text/tcf+xml").post(String.class, data);
+            Media media = new AMedia("map-" + 4 + ".html", null, "text/html", output);
+            resultsPic.setContent(media);
+        } catch (Exception e) {
+            Logger.getLogger(Aggregator.class.getName()).log(Level.SEVERE, "ERROR accessing the maps generator service", e);
+            Messagebox.show("ERROR accessing the maps generator service \n" + e.getMessage(), "FCS", 0, Messagebox.INFORMATION);
+        }
     }
 }