Changeset 2107

Timestamp:

08/16/12 14:53:42 (12 years ago)

Author:

zastrow

Message:

 

Location:

SRUAggregator/trunk

Files:

• nbproject/private/private.xml (modified) (1 diff)
• src/java/clarind/fcs/Aggregator.java (modified) (8 diffs)
• src/java/clarind/fcs/Corpus.java (added)
• src/java/clarind/fcs/Harvester.java (modified) (5 diffs)
• src/java/clarind/fcs/TestSRUClient1.java (added)
• web/index.zul (modified) (2 diffs)

SRUAggregator/trunk/nbproject/private/private.xml

@@ -3 +3 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/Users/zastrow/Documents/ClarinD/schrauber/Aggregator/trunk/src/java/clarind/fcs/Harvester.java</file>
-        <file>file:/Users/zastrow/Documents/ClarinD/schrauber/Aggregator/trunk/src/java/clarind/fcs/Aggregator.java</file>
-        <file>file:/Users/zastrow/Documents/ClarinD/schrauber/Aggregator/trunk/web/index.zul</file>
-    </open-files>
 </project-private>

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

@@ -17 +17 @@
 import org.zkoss.zul.Separator;
 import org.zkoss.zul.Label;
+import org.zkoss.zul.Comboitem;
 
 public class Aggregator extends SelectorComposer<Component> {
@@ -30 +31 @@
     @Wire
     private Groupbox allCorpora;
+     @Wire
+    private Comboitem german;
 
     @Override
@@ -35 +38 @@
         super.doAfterCompose(comp); //wire variables and event listners
         //do whatever you want (you could access wired variables here)
+        
+        languageSelect.setSelectedItem(german);
+        
         Harvester harv = new Harvester();
         ArrayList<Endpoint> ep = harv.getEndpoints();
@@ -43 +49 @@
 
             System.out.println("Calling corpora ...: " + ep.get(i).getUrl());
-            ArrayList<String> corpora = harv.getCorporaOfAnEndpoint(ep.get(i).getUrl());
+            ArrayList<Corpus> corpora = harv.getCorporaOfAnEndpoint(ep.get(i).getUrl());
 
             if (corpora.size() == 0) {
                 Checkbox cb = new Checkbox();
+                 cb.setId(ep.get(i).getUrl() + "?operation=searchRetrieve&version=1.2");
                 cb.setLabel(ep.get(i).getUrl());
+                
                 allCorpora.getChildren().add(cb);
                 allCorpora.getChildren().add(new Separator());
@@ -57 +65 @@
                 for (i2 = 0; i2 < corpora.size(); i2++) {
                     Checkbox cb = new Checkbox();
-                    cb.setLabel(corpora.get(i2));
+                    
+                    //http://clarinws.informatik.uni-leipzig.de:8080/CQL?operation=searchRetrieve&version=1.2&query=Boppard&x-context=11858/00-229C-0000-0003-174F-D&maximumRecords=2
+
+                    cb.setId(ep.get(i).getUrl() + "?operation=searchRetrieve&version=1.2&x-context=" + corpora.get(i2).getValue());
+                    cb.setLabel(corpora.get(i2).getDisplayTerm());
                     
                     allCorpora.getChildren().add(cb);
@@ -77 +89 @@
     public void onExecuteSearch(Event ev) {
         try {
+            
+            if (languageSelect.getText().trim().equals("")){
+                  Messagebox.show("Please select a language.");
+                  return;
+            }
+            
             String display = "SearchString: " + searchString.getText() + "\n";
 
@@ -92 +110 @@
                     if (cb.isChecked()) {
                         // now execute the search:
-                        display = display + cb.getLabel() + "\n";
+                        String query = cb.getId() + "&maximumRecords=10&query=" + searchString.getText();
+                        display = display + query + "\n";
                     }
                 }
@@ -98 +117 @@
 
             Messagebox.show(display);
-
+            System.out.println(display);
         } catch (Exception ex) {
             System.out.println(ex.getMessage());

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

@@ -17 +17 @@
     final String crStartpoint = "http://130.183.206.32/restxml/";
 
-     private NodeList evaluateXPath(String statement, org.w3c.dom.Document domtree){
+    private NodeList evaluateXPath(String statement, org.w3c.dom.Document domtree) {
         NodeList result = null;
 
@@ -28 +28 @@
         return result;
     }
-     
-     public String evaluateXPathToString(String statement, org.w3c.dom.Document domtree) {
+
+    public String evaluateXPathToString(String statement, org.w3c.dom.Document domtree) {
         String result = null;
 
@@ -40 +40 @@
         return result;
     }
-    
-    
-    public  ArrayList<Endpoint> getEndpoints() throws Exception {
+
+    public ArrayList<Endpoint> getEndpoints() throws Exception {
         ArrayList<Endpoint> ep = new ArrayList<Endpoint>();
 
         URL u = new URL(crStartpoint);
         InputStream is = u.openStream();
-        
+
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
@@ -54 +53 @@
         is.close();
         String instituteName = evaluateXPathToString("//Name", document);
-        
+
         NodeList institutionsUrls = evaluateXPath("//Center_id_link", document);
-        
+
         int i, i2;
-        
-        for(i=0; i<institutionsUrls.getLength();i++){             
-             u = new URL(institutionsUrls.item(i).getTextContent());
-             is = u.openStream();
-             
-             org.w3c.dom.Document doc = builder.parse(is);
-             is.close();
-             ////WebReference[./Description[text()="CQL"]]/Website                         
-             
-             NodeList endpointsUrls = evaluateXPath("//WebReference[./Description[text()=\"CQL\"]]/Website", doc);
-             
-             for(i2=0; i2<endpointsUrls.getLength();i2++){
-                 String epUrl = endpointsUrls.item(i2).getTextContent();                 
-                 ep.add(new Endpoint(epUrl, instituteName));
-             } // for i2
-                          
+
+        for (i = 0; i < institutionsUrls.getLength(); i++) {
+            u = new URL(institutionsUrls.item(i).getTextContent());
+            is = u.openStream();
+
+            org.w3c.dom.Document doc = builder.parse(is);
+            is.close();
+            ////WebReference[./Description[text()="CQL"]]/Website                         
+
+            NodeList endpointsUrls = evaluateXPath("//WebReference[./Description[text()=\"CQL\"]]/Website", doc);
+
+            for (i2 = 0; i2 < endpointsUrls.getLength(); i2++) {
+                String epUrl = endpointsUrls.item(i2).getTextContent();
+                ep.add(new Endpoint(epUrl, instituteName));
+            } // for i2
+
         } // for i ...
-        
+
 
         return ep;
     } //getEndpoints
-    
-    
-    public ArrayList<String> getCorporaOfAnEndpoint(String endpointUrl) throws Exception {
-        System.out.println("getCorporaOfAnEndpoint: " + endpointUrl);
-        ArrayList<String> corpora = new ArrayList<String>();
-        
-        URL u = new URL(endpointUrl + "?operation=scan&scanClause=fcs.resource");
+
+    public ArrayList<Corpus> getCorporaOfAnEndpoint(String endpointUrl) throws Exception {
+
+        ArrayList<Corpus> corpora = new ArrayList<Corpus>();
+        String urlToCall = endpointUrl + "?operation=scan&scanClause=fcs.resource&version=1.2";
+        URL u = new URL(urlToCall);
+
+        System.out.println("getCorporaOfAnEndpoint: " + urlToCall);
+
         InputStream is = u.openStream();
-        
+
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
@@ -93 +94 @@
 
         is.close();
+
+        //http://clarinws.informatik.uni-leipzig.de:8080/CQL?
+
+        //NodeList corporaNodes = evaluateXPath("//*[local-name()='term']/*[local-name()='value']", document);
+        NodeList corporaNodes = evaluateXPath("//*[local-name()='terms']/*[local-name()='term']", document);
+
+        int i, i2;
+        if (corporaNodes.getLength() > 0) {
+            
+            System.out.println("Length of corpora: " + corporaNodes.getLength());
+            
+            for (i = 0; i < corporaNodes.getLength(); i++) {
+                Node n = corporaNodes.item(i);
+                
+                System.out.println("NODENAEM: " + n.getNodeName());
+                
+                Corpus c = new Corpus();
+
+                for (i2 = 0; i2 < n.getChildNodes().getLength(); i2++) {
+                    Node child = n.getChildNodes().item(i2);
+
+                    if (child.getNodeName().endsWith("value")) {
+                        c.setValue(child.getTextContent());
+                    }
+
+                    if (child.getNodeName().endsWith("displayTerm")) {
+                        c.setDisplayTerm(child.getTextContent());
+                    }
+
+                    if (child.getNodeName().endsWith("numberOfRecords")) {
+                        c.setNumberOfRecords(child.getTextContent());
+                    }
+
+                } //for i2
+
+                corpora.add(c);
+
+            } // for i ...
+        } // if coporaNodes ...
         
-        //http://clarinws.informatik.uni-leipzig.de:8080/CQL?
-        
-        NodeList corporaNodes = evaluateXPath("//*[local-name()='term']/*[local-name()='value']", document);
-      
-        int i, i2;
-        
-        for(i=0; i<corporaNodes.getLength();i++){
-          corpora.add(corporaNodes.item(i).getTextContent());
-            
-        } // for i ...
+        System.out.println("------------");
         return corpora;
     }  // getCorporaOfAnEndpoint
-    
-    
-    public static void main (String[] args) throws Exception {
+
+    public static void main(String[] args) throws Exception {
         Harvester cr = new Harvester();
         ArrayList<Endpoint> ep = cr.getEndpoints();
-        
+
         int i;
-        
-        for(i=0; i<ep.size();i++){
+
+        for (i = 0; i < ep.size(); i++) {
             System.out.println(ep.get(i).getInstitution() + " " + ep.get(i).getUrl());
         } // for i ...
-        
-        
+
+
     }
-    
-    
-    
-    
 }

SRUAggregator/trunk/web/index.zul

@@ -22 +22 @@
                         <separator />
                         <label>Language:</label>
-                        <combobox id="languageSelect" width="150px">                            
+                        <combobox id="languageSelect" width="150px" value="German">                                                                                                                   
                             <!--<template name="model"> -->
-                            <comboitem label="German" />
-                            <comboitem label="English" />
-                            <comboitem label="Dutch" />
+                            <comboitem label="German" id="german"/>
+                            <comboitem label="English" id="english"/>
+                            <comboitem label="Dutch" id="dutch" />
                             <comboitem label="-More to come-" />
                             <!-- </template> -->
@@ -34 +34 @@
                         
                         <groupbox mold="3d" id="allCorpora">
-                        <caption>All Corpora</caption>
+                            <caption>All Corpora</caption>
                            
                         </groupbox>