Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2397] trunk
|
From: <lor...@us...> - 2010-10-18 16:04:41
|
Revision: 2397
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2397&view=rev
Author: lorenz_b
Date: 2010-10-18 16:04:34 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Continued autosparql component.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -21,6 +21,8 @@
PagingLoadResult<Example> getCurrentQueryResult(PagingLoadConfig config) throws SPARQLQueryException;
+ String getCurrentQuery() throws SPARQLQueryException;
+
void setEndpoint(Endpoint endpoint);
List<Endpoint> getEndpoints();
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -22,6 +22,8 @@
void getCurrentQueryResult(PagingLoadConfig config, AsyncCallback<PagingLoadResult<Example>> callback);
+ void getCurrentQuery(AsyncCallback<String> callback);
+
void setEndpoint(Endpoint endpoint, AsyncCallback<Void> callback);
void getEndpoints(AsyncCallback<List<Endpoint>> callback);
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -273,7 +273,8 @@
public void onSuccess(Example result) {
interactivePanel.unmask();
interactivePanel.setExample(result);
- resultPanel.updateTable();
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris());
}
@Override
@@ -297,7 +298,7 @@
} else if(event.getType() == AppEvents.ShowInteractiveMode){
showInteractivePanel();
} else if(event.getType() == AppEvents.UpdateResultTable){
- resultPanel.updateTable();
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(), examplesPanel.getNegativeExamplesUris());
}
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -1,6 +1,7 @@
package org.dllearner.autosparql.client.widget;
import java.util.ArrayList;
+import java.util.List;
import org.dllearner.autosparql.client.SPARQLService;
import org.dllearner.autosparql.client.model.Example;
@@ -14,6 +15,9 @@
import com.extjs.gxt.ui.client.data.RpcProxy;
import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.ContentPanel;
+import com.extjs.gxt.ui.client.widget.TabItem;
+import com.extjs.gxt.ui.client.widget.TabPanel;
+import com.extjs.gxt.ui.client.widget.Text;
import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
import com.extjs.gxt.ui.client.widget.grid.Grid;
@@ -29,6 +33,16 @@
private static final int HEIGHT = 300;
private PagingLoader<PagingLoadResult<ModelData>> loader;
+
+ private List<String> posExamples;
+ private List<String> negExamples;
+
+ private TabPanel mainPanel;
+
+ private TabItem queryResultTab;
+ private TabItem queryTab;
+ private TabItem graphTab;
+
public ResultPanel(){
setLayout(new RowLayout(Orientation.HORIZONTAL));
@@ -37,7 +51,16 @@
setAnimCollapse(false);
setSize(WIDTH, HEIGHT);
+ mainPanel = new TabPanel();
+ mainPanel.setResizeTabs(true);
+ mainPanel.setTabScroll(true);
+ mainPanel.setAnimScroll(true);
+
+ add(mainPanel, new RowData(1, 1));
+
createResultGrid();
+ createQueryTab();
+ createGraphTab();
}
private void createResultGrid(){
@@ -80,20 +103,72 @@
public String getRowStyle(ModelData model, int rowIndex,
ListStore<ModelData> ds) {
// TODO Auto-generated method stub
- if(rowIndex % 2 == 0){
- return "row-Style-Odd";
- } else {
- return "row-Style-Even";
+// if(rowIndex % 2 == 0){
+// return "row-Style-Odd";
+// } else {
+// return "row-Style-Even";
+// }
+ String uri = model.get("uri");
+ if(posExamples.contains(uri)){
+ return "row-Style-Positive";
+ } else if(negExamples.contains(uri)){
+ return "row-Style-Negative";
+ } else if(rowIndex % 2 == 0){
+ return "row-Style-Odd";
+ } else {
+ return "row-Style-Even";
+
}
}
});
+ queryResultTab = new TabItem("Table");
+ queryResultTab.setLayout(new RowLayout(Orientation.VERTICAL));
+ queryResultTab.add(grid, new RowData(1, 1));
+ queryResultTab.add(toolbar, new RowData(1, -1));
+ mainPanel.add(queryResultTab);
- add(grid, new RowData(1, 1));
- setBottomComponent(toolbar);
+// add(grid, new RowData(1, 1));
+// setBottomComponent(toolbar);
// add(toolbar, new RowData(1, -1));
}
- public void updateTable(){
+ private void createQueryTab(){
+ queryTab = new TabItem("Query");
+ mainPanel.add(queryTab);
+ }
+
+ private void createGraphTab(){
+ graphTab = new TabItem("Graph");
+ mainPanel.add(graphTab);
+ }
+
+ public void refresh(List<String> posExamples, List<String> negExamples){
+ this.posExamples = posExamples;
+ this.negExamples = negExamples;
+
+ updateTable();
+ updateQuery();
+ }
+
+ private void updateTable(){
loader.load();
}
+
+ private void updateQuery(){
+ SPARQLService.Util.getInstance().getCurrentQuery(new AsyncCallback<String>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onSuccess(String result) {
+ queryTab.removeAll();
+ queryTab.addText(result);
+ }
+ });
+
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -28,6 +28,8 @@
private String currentQuery;
+ private QueryTree<String> currentQueryTree;
+
public ExampleFinder(SparqlEndpoint endpoint, ExtractionDBCache selectCache, ExtractionDBCache constructCache){
this.endpoint = endpoint;
this.selectCache = selectCache;
@@ -87,8 +89,11 @@
logger.info("USING GENERALISATION");
logger.info("QUERY BEFORE GENERALISATION: \n\n" + tree.toSPARQLQueryString(true));
Generalisation<String> generalisation = new Generalisation<String>();
+
QueryTree<String> genTree = generalisation.generalise(tree);
+
currentQuery = genTree.toSPARQLQueryString(true);
+ currentQueryTree = genTree;
logger.info("QUERY AFTER GENERALISATION: \n\n" + currentQuery);
currentQuery = currentQuery + " ORDER BY ?x0 LIMIT 10";
@@ -200,4 +205,8 @@
public String getCurrentQuery(){
return currentQuery;
}
+
+ public String getCurrentQueryHTML(){
+ return encodeHTML(currentQuery);
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -61,24 +61,6 @@
// getExampleFinder().setEndpoint(endpoint);
}
- private SparqlEndpoint getEndpoint(){
- SparqlEndpoint endpoint = (SparqlEndpoint) getSession().getAttribute(ENDPOINT);
- return endpoint;
- }
-
- private ExampleFinder getExampleFinder(){
- ExampleFinder exFinder = (ExampleFinder) getSession().getAttribute(EXAMPLE_FINDER);
- if(exFinder == null){
- exFinder = new ExampleFinder(getEndpoint(), selectCache, constructCache);
- getSession().setAttribute(EXAMPLE_FINDER, exFinder);
- }
- return exFinder;
- }
-
- private HttpSession getSession(){
- return getThreadLocalRequest().getSession();
- }
-
@Override
public Example getSimilarExample(List<String> posExamples,
List<String> negExamples) throws SPARQLQueryException{
@@ -135,23 +117,6 @@
return result;
}
- private String modifyQuery(String query){
- String newQuery = query.replace("SELECT ?x0 WHERE {",
- "SELECT DISTINCT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
-
-
- return newQuery;
- }
-
- private String getCountQuery(String query){
- String newQuery = query.replace("SELECT ?x0",
- "SELECT COUNT(DISTINCT ?x0)");
- newQuery = newQuery.substring(0, newQuery.indexOf('}') + 1);
- System.out.println("COUNT query: " + newQuery);
-
- return newQuery;
- }
-
@Override
public void setEndpoint(Endpoint endpoint) {
switch(endpoint.getID()){
@@ -176,5 +141,43 @@
return endpoints;
}
+
+ @Override
+ public String getCurrentQuery() throws SPARQLQueryException {
+ return getExampleFinder().getCurrentQueryHTML();
+ }
+ private String modifyQuery(String query){
+ String newQuery = query.replace("SELECT ?x0 WHERE {",
+ "SELECT DISTINCT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
+
+ return newQuery;
+ }
+
+ private SparqlEndpoint getEndpoint(){
+ SparqlEndpoint endpoint = (SparqlEndpoint) getSession().getAttribute(ENDPOINT);
+ return endpoint;
+ }
+
+ private ExampleFinder getExampleFinder(){
+ ExampleFinder exFinder = (ExampleFinder) getSession().getAttribute(EXAMPLE_FINDER);
+ if(exFinder == null){
+ exFinder = new ExampleFinder(getEndpoint(), selectCache, constructCache);
+ getSession().setAttribute(EXAMPLE_FINDER, exFinder);
+ }
+ return exFinder;
+ }
+
+ private HttpSession getSession(){
+ return getThreadLocalRequest().getSession();
+ }
+
+ private String getCountQuery(String query){
+ String newQuery = query.replace("SELECT ?x0",
+ "SELECT COUNT(DISTINCT ?x0)");
+ newQuery = newQuery.substring(0, newQuery.indexOf('}') + 1);
+
+ return newQuery;
+ }
+
}
Modified: trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css
===================================================================
--- trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css 2010-10-18 16:04:34 UTC (rev 2397)
@@ -8,6 +8,14 @@
}
+ .row-Style-Positive{
+ background-color: green;
+ }
+
+ .row-Style-Negative{
+ background-color: red;
+ }
+
.x-grid3-row td.x-grid3-cell{
vertical-align: middle;
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -39,6 +39,8 @@
filters.add("http://dbpedia.org/property/pageId");
filters.add("http://dbpedia.org/property/revisionId");
filters.add("http://dbpedia.org/ontology/abstract");
+ filters.add("http://dbpedia.org/ontology/thumbnail");
+ filters.add("http://dbpedia.org/property/wikiPageUsesTemplate");
return filters;
}
@@ -58,7 +60,8 @@
List<String> filters = new ArrayList<String>();
filters.add("http://purl.org/dc/elements/1.1/language");
-
+ filters.add("http://purl.org/dc/elements/1.1/rights");
+
return filters;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
