Changeset 2738

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.

Location:

SRUAggregator/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (11 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/data/CenterRegistry.java (modified) (6 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/data/Corpus.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/data/InstitutionForTesting.java (copied) (copied from SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/Institution.java) (3 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/sresult/SearchResultsController.java (modified) (5 diffs)
• src/main/webapp/index.zul (modified) (3 diffs)
• src/main/webapp/key.png (added)

SRUAggregator/trunk/pom.xml

@@ -65 +65 @@
             <version>1.17.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.sardine</groupId>
+            <artifactId>sardine</artifactId>
+            <version>314</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     <build>

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);
+        }
     }
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/CenterRegistry.java

@@ -3 +3 @@
  * and open the template in the editor.
  */
-
 package eu.clarin.sru.fcs.aggregator.data;
 
@@ -25 +24 @@
 /**
  * Center registry node. Its children are centers (institutions).
- * 
+ *
  * @author Yana Panchenko
  */
 public class CenterRegistry implements CorpusTreeNode {
-    
+
     private static final Logger logger = Logger.getLogger(CenterRegistry.class.getName());
-
     private static final String crStartpoint = "http://130.183.206.32/restxml/";
-
     //https://centerregistry-clarin.esc.rzg.mpg.de/restxml/
-    
     private boolean hasChildrenLoaded = false;
-    private List<Institution> centers = new ArrayList<Institution>(); 
+    private List<Institution> centers = new ArrayList<Institution>();
 
     @Override
@@ -46 +42 @@
     @Override
     public void loadChildren() {
-        //TODO change to use Alex binding for that...
+        loadChildren(false);
+    }
+
+    public void loadChildren(boolean testingMode) {
+        
         if (hasChildrenLoaded) {
             return;
         }
         hasChildrenLoaded = true;
+
+        if (testingMode) {
+            loadInstitutionForTesting();
+        } else {
+            loadInstitutionsFromCR();
+        }
+
+        logger.log(Level.FINE, "Number of Centers: {0}", centers.size());
+
+    }
+
+    @Override
+    public List<? extends CorpusTreeNode> getChildren() {
+        loadChildren();
+        return centers;
+    }
+
+    @Override
+    public CorpusTreeNode getChild(int index) {
+        loadChildren();
+        if (index >= centers.size()) {
+            return null;
+        }
+        return centers.get(index);
+    }
+
+    public void addForeignPoint(String endpointUrl, String institutionLink) {
+        //TODO: ask what functionality is required here??
+//        boolean added = false;
+//        for (Institution center : this.centers) {
+//            if (center.getLink().equals(institutionLink)) {
+//                EndpointY ep = new EndpointY(endpointUrl, center);
+//                center.loadChildren();
+//                //center.loadChildren();
+//                //ep.loadChildren();
+//            }
+//        }
+//        if (!added) {
+//            Institution institution = new Institution("unknown", institutionLink);
+//            this.centers.add(institution);
+//            //EndpointY ep = new EndpointY(endpointUrl, institution);
+//            //this.loadChildren();
+//            //institution.loadChildren();
+//        }
+    }
+
+    public static NodeList evaluateXPath(String statement, org.w3c.dom.Document domtree) {
+        NodeList result = null;
+
+        XPath xpath = XPathFactory.newInstance().newXPath();
+        try {
+            result = (NodeList) xpath.evaluate(statement, domtree, XPathConstants.NODESET);
+        } catch (XPathExpressionException ex) {
+            logger.log(Level.SEVERE, "Error parsing XML: ", statement);
+        }
+        return result;
+    }
+
+    //TODO change to use Alex binding for that...
+    private void loadInstitutionsFromCR() {
         InputStream is = null;
         URL u;
@@ -63 +123 @@
 
             //HttpsURLConnection urlConn = (HttpsURLConnection) u.openConnection();
-            
-            urlConn.setConnectTimeout(5000);                                    
+
+            urlConn.setConnectTimeout(5000);
             urlConn.setReadTimeout(15000);
             urlConn.setAllowUserInteraction(false);
-                                    
+
             is = urlConn.getInputStream();
 
@@ -76 +136 @@
             org.w3c.dom.Document document = builder.parse(is);
 
-            
+
             instituteNames = evaluateXPath("//Centername", document);
             institutionsUrls = evaluateXPath("//Center_id_link", document);
@@ -101 +161 @@
             }
         }
-        logger.log(Level.FINE, "Number of Centers: {0}", centers.size());
-
     }
 
-    @Override
-    public List<? extends CorpusTreeNode> getChildren() {
-        loadChildren();
-        return centers;
+    private void loadInstitutionForTesting() {
+        String institutionUrl = "http://www.example.org";
+        String institutionName = "Institution for Testing";
+        Institution institution = new InstitutionForTesting(institutionName, institutionUrl);
+        if (!institution.getChildren().isEmpty()) {
+            centers.add(institution);
+        }
     }
-
-    @Override
-    public CorpusTreeNode getChild(int index) {
-        loadChildren();
-        if (index >= centers.size()) {
-            return null;
-        }
-        return centers.get(index);
-    }
-    
-    
-    public void addForeignPoint(String endpointUrl, String institutionLink) {
-        
-        //TODO: ask what functionality is required here??
-        
-//        boolean added = false;
-//        for (Institution center : this.centers) {
-//            if (center.getLink().equals(institutionLink)) {
-//                EndpointY ep = new EndpointY(endpointUrl, center);
-//                center.loadChildren();
-//                //center.loadChildren();
-//                //ep.loadChildren();
-//            }
-//        }
-//        if (!added) {
-//            Institution institution = new Institution("unknown", institutionLink);
-//            this.centers.add(institution);
-//            //EndpointY ep = new EndpointY(endpointUrl, institution);
-//            //this.loadChildren();
-//            //institution.loadChildren();
-//        }
-    }
-    
-   
-    public static NodeList evaluateXPath(String statement, org.w3c.dom.Document domtree) {
-        NodeList result = null;
-
-        XPath xpath = XPathFactory.newInstance().newXPath();
-        try {
-            result = (NodeList) xpath.evaluate(statement, domtree, XPathConstants.NODESET);
-        } catch (XPathExpressionException ex) {
-            System.out.println(ex.getMessage());
-        }
-        return result;
-    }
-
 }

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/Corpus.java

@@ -127 +127 @@
         StringBuilder scanClause = new StringBuilder("fcs.resource");
         scanClause.append("=");
+        scanClause.append("");
         scanClause.append(value);
+        scanClause.append("");
         try {
             SRUClient sruClient = new SRUClient(SRUVersion.VERSION_1_2);

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/data/InstitutionForTesting.java

@@ -19 +19 @@
  * @author Yana Panchenko
  */
-public class Institution implements CorpusTreeNode {
+public class InstitutionForTesting extends Institution {
 
-    private String name;
-    private String link;
-    private ArrayList<Endpoint> endpoints;
+    private List<Endpoint> endpoints = new ArrayList<Endpoint>();
     private boolean hasChildrenLoaded = false;
+    
+    private static final String[] testEndpoints = new String[]{"http://lux17.mpi.nl/cqltest"};
     
     private static final Logger logger = Logger.getLogger(Institution.class.getName());
 
-    public Institution(String name, String link) {
-        this.name = name;
-        this.link = link;
-        this.endpoints = new ArrayList<Endpoint>();
+    public InstitutionForTesting(String name, String link) {
+        super(name,link);
     }
 
-    public String getName() {
-        return name;
-    }
     
-    public String getLink() {
-        return link;
-    }
 
     @Override
@@ -54 +46 @@
         }
         hasChildrenLoaded = true;
-        InputStream is = null;
         
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            URL u = new URL(link);
-            is = u.openStream();
-            Document doc = builder.parse(is);
-            is.close();
-            NodeList endpointsUrls = CenterRegistry
-                    .evaluateXPath("//WebReference[./Description[text()=\"CQL\"]]/Website", doc);
-
-            for (int j = 0; j < endpointsUrls.getLength(); j++) {
-                String epUrl = endpointsUrls.item(j).getTextContent();
+        for (int j = 0; j < testEndpoints.length; j++) {
+                String epUrl = testEndpoints[j];
                 Endpoint endpoint = new Endpoint(epUrl, this);
                 endpoints.add(endpoint);
-            } 
-        } catch (Exception ex) {
-            logger.log(Level.SEVERE, "Error accessing endpoint of {0} {1} {2}", 
-                    new String[]{link, ex.getClass().getName(), ex.getMessage()});
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException ex) {
-                    logger.log(Level.SEVERE, null, ex);
-                }
-            }
-        }
+        } 
+        
     }
 
@@ -100 +70 @@
     }
     
-    @Override
-    public String toString() {
-        if (name != null && name.length() > 0) {
-            return name;
-        } else {
-        return link;
-       }
-    }
+
 }

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

@@ -1 +1 @@
 package eu.clarin.sru.fcs.aggregator.sresult;
 
+import com.googlecode.sardine.Sardine;
+import com.googlecode.sardine.SardineFactory;
 import eu.clarin.sru.client.SRUClientException;
 import eu.clarin.sru.client.SRURecord;
@@ -19 +21 @@
 import eu.clarin.weblicht.wlfxb.tc.xb.TextCorpusStored;
 import eu.clarin.weblicht.wlfxb.xb.WLData;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -58 +67 @@
     private Label progress;
     
+    
+    private static final String WSPACE_SERVER_URL = "http://egi-cloud21.zam.kfa-juelich.de"; 
+    private static final String WSPACE_WEBDAV_DIR = "/owncloud/remote.php/webdav/";
+    private static final String AGGREGATOR_DIR = "aggregator_results/";
+    
     private static final Logger logger = Logger.getLogger(SearchResultsController.class.getName());
 
@@ -171 +185 @@
         resultsThread = new UpdateResultsThread();
         resultsThread.start();
+    }
+
+    private String kwcToText() {
+        StringBuilder text = new StringBuilder();
+
+        if (resultsProcessed != null && !resultsProcessed.isEmpty()) {
+            for (SearchResult result : resultsProcessed) {
+                for (DataViewKWIC kwic : result.getDataKWIC()) {
+                    text.append(kwic.getLeft());
+                    text.append(" ");
+                    text.append(kwic.getKeyword());
+                    text.append(" ");
+                    text.append(kwic.getRight());
+                    text.append("\n");
+                }
+            }
+
+        }
+        return text.toString();
     }
 
@@ -387 +420 @@
         }
     }
+    
+    
+    
+    public void exportPWTCF(String user, String pass) {
+        String text = kwcToText();
+
+        if (text.isEmpty()) {
+            Messagebox.show("Nothing to export!");
+        } else {
+            WLData data;
+            MetaData md = new MetaData();
+            //data.metaData.source = "Tuebingen Uni";
+            //md.addMetaDataItem("title", "binding test");
+            //md.addMetaDataItem("author", "Yana");
+            TextCorpusStored tc = new TextCorpusStored("unknown");
+            tc.createTextLayer().addText(text.toString());
+            data = new WLData(md, tc);
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            try {
+                WLDObjector.write(data, os);
+                //Filedownload.save(os.toByteArray(), "text/tcf+xml", "ClarinDFederatedContentSearch.xml");
+                Sardine sardine = SardineFactory.begin();
+                sardine.setCredentials(user, pass);
+                String outputDir = WSPACE_SERVER_URL + WSPACE_WEBDAV_DIR + AGGREGATOR_DIR;
+                if (!sardine.exists(outputDir)) {
+                    sardine.createDirectory(outputDir);
+                }
+                Date currentDate = new Date();
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS");
+                Random generator = new Random();
+                int rn1 = generator.nextInt(1000000000);
+                String createdFilePath = outputDir + format.format(currentDate) + "-" + rn1 + ".tcf";
+                while (sardine.exists(createdFilePath)) {
+                    rn1 = generator.nextInt(1000000000);
+                    createdFilePath = outputDir + format.format(currentDate) + "-" + rn1 + ".tcf";
+                }
+                sardine.put(createdFilePath, os.toByteArray(), "text/tcf+xml");
+                Messagebox.show("Export complete!\nCreated file:\n" + createdFilePath);
+                
+            } catch (IOException ex) {
+                Logger.getLogger(SearchResultsController.class.getName()).log(Level.SEVERE, "Error accessing " + WSPACE_SERVER_URL + WSPACE_WEBDAV_DIR, ex);
+            } catch (WLFormatException ex) {
+                logger.log(Level.SEVERE, "Error exporting TCF {0} {1}", new String[]{ex.getClass().getName(), ex.getMessage()});
+                Messagebox.show("Sorry, export error!");
+            }
+        }
+    }
 
     public void shutdown() {

SRUAggregator/trunk/src/main/webapp/index.zul

@@ -151 +151 @@
                                     <menuitem label="Export Results to TCF" id="exportResultsTCF"
                                         image="buttonExport.png"/>
+                                    <menuitem label="Export Results as TCF to personal workspace" id="exportResultsPWTCF"
+                                        image="buttonExport.png"/>
                                 </menupopup>
                             </menu>
@@ -162 +164 @@
                         </menubar>
                     </north>
-                    <center  margins="0,5,0,0" autoscroll="true" border="0">
-                        <panel width="100%" height="100%">
-                            <panelchildren id="resultsPanel" style="overflow: auto">
-                                <window id="resultsBox" style="overflow:auto;" width="100%" height="100%">
-                                    <iframe id="resultsPic" src="help.html" width="100%" height="100%"/>
+                    <center  margins="0,5,0,0" autoscroll="true" border="0" >
+                        <panel>
+                            <panelchildren id="resultsPanel"  >
+                                <window id="resultsBox" style="overflow:auto;">
+                                    <iframe id="resultsPic" src="help.html" width="80%" height="80%"/>
                                 </window>
                                 <label value=" " id="searchResultsProgress" style="border-width:0px;margin-left:5px;"/>
@@ -181 +183 @@
             
         </borderlayout>
+
+
+
+<popup id="wspaceSigninpop" width="400px">
+<label value="Personal Workspace Sign In" style="font-weight:bold;color:#0e4071;"/>
+<grid>
+
+<rows>
+<row>
+<label style="font-weight:bold" value="Username:"/>
+<textbox id="wspaceUserName"  width="150px" value=""/>
+</row>
+<row>
+<label style="font-weight:bold" value="Password:"/>
+<textbox id="wspaceUserPwd" type="password" width="150px" value=""/>
+</row>
+
+<!--
+<row spans="2">
+<div align="center">
+<button id="wspaceSigninBtn" label="Sign in" image="key.png" sclass="ccsDarkBlue" />
+<button id="wspaceCancelBtn" label="Cancel" image="buttonDelete.png" sclass="ccsDarkBlue" style="margin-left:10px;"/>
+</div>
+</row>
+-->
+<row>
+<div>
+</div>
+<div align="center">
+<button id="wspaceSigninBtn" label="Sign in" image="key.png" sclass="ccsDarkBlue" />
+<button id="wspaceCancelBtn" label="Cancel" image="buttonDelete.png" sclass="ccsDarkBlue" style="margin-left:10px;"/>
+</div>
+</row>
+
+</rows>
+</grid>
+</popup>
         
     </window>