Menu
▾
▴
dl-learner-svn
|
From: <ku...@us...> - 2011-06-21 17:10:04
|
Revision: 2919
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2919&view=rev
Author: kurzum
Date: 2011-06-21 17:09:57 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
geizhals minor fixes
Modified Paths:
--------------
trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java
trunk/interfaces/src/main/resources/nke/geizhals.owl
Modified: trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java 2011-06-21 10:02:25 UTC (rev 2918)
+++ trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java 2011-06-21 17:09:57 UTC (rev 2919)
@@ -72,7 +72,7 @@
if (action.equalsIgnoreCase("learn")) {
if (isSet(httpServletRequest, "debug")) {
- String debugResult = "{\"time\":\"needed: 2896.0 ms. (2896.0 total)\",\"learned\":{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},\"related\":[{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]}],\"success\":true,\"up\":[{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]}]}";
+ String debugResult = "{\"time\":\"needed: 2896.0 ms. (2896.0 total)\",\"learned\":{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},\"related\":[{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]}],\"success\":true,\"up\":[{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]},{\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]}]}";
result = (JSONObject) JSONValue.parseWithException(debugResult);
} else if (isSet(httpServletRequest, "data")) {
String json = httpServletRequest.getParameter("data");
@@ -97,9 +97,13 @@
try {
JSONObject j = (JSONObject) JSONValue.parseWithException(json);
- //save the concept
- Geizhals2OWL.getLRS().increasePopularity(Geizhals2OWL.prefixSave + j.get("link"), (String) j.get("kbsyntax"), (String) j.get("link"), (String) j.get("label"));
+ String kbsyntax = (String) j.get("kbsyntax");
+ if (kbsyntax.contains(" AND ") || kbsyntax.contains(" OR ")) {
+ //save the concept
+ Geizhals2OWL.getLRS().increasePopularity(Geizhals2OWL.prefixSave + j.get("link"), kbsyntax, (String) j.get("link"), (String) j.get("label"));
+ }
+
} catch (org.json.simple.parser.ParseException e) {
//TODO this code was copy pasted and could be a function
int position = e.getPosition();
@@ -119,17 +123,17 @@
if (action.equalsIgnoreCase("mostPopular")) {
if (isSet(httpServletRequest, "debug")) {
- String debugResult = "[" + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"popularity\": 10,\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"popularity\": 10,\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"popularity\": 10,\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + "] ";
+ String debugResult = "[" + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"popularity\": 10,\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"popularity\": 10,\"link\":\"?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"popularity\": 10,\"link\":\"http:\\/\\/geizhals.at\\/?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + ", " + " {\"kbsyntax\":\"(\\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_84_DVD%2B%2F-RW\\\" AND \\\"http:\\/\\/nke.aksw.org\\/geizhals\\/_85_12.5~85_13~85_13.3~85_13.3~85_13.4\\\")\",\"link\":\"?cat=nb15w&xf=84_DVD%2B%2F-RW~85_12.5~85_13~85_13.3~85_13.3~85_13.4\",\"trueNegatives\":[\"http://test.de/n1\",\"http://test.de/n2\"],\"truePositives\":[\"http://test.de/p1\",\"http://test.de/p2\"],\"label\":\"(DVD+\\/-RW and 12.5" till 13.4")\",\"falsePositives\":[],\"falseNegatives\":[]} " + "] ";
debugResult = "{\"list\":" + debugResult + " }";
result = (JSONObject) JSONValue.parseWithException(debugResult);
} else {
JSONArray ja = new JSONArray();
for (LogicalRelationStrategy.Concept c : Geizhals2OWL.getLRS().getMostPopular(6)) {
- ja.add(c.getJSON());
+ ja.add(c.getJSON());
}
- result.put("popular",ja);
+ result.put("popular", ja);
}
}
@@ -335,7 +339,7 @@
if (httpServletRequest.getParameterMap().keySet().isEmpty()) {
return "Empty parameters: there were neither post nor get parameters";
} else {
- buf.append("Received " + httpServletRequest.getParameterMap().size() + " parameters");
+ buf.append("\nReceived " + httpServletRequest.getParameterMap().size() + " parameters");
}
for (Object key : httpServletRequest.getParameterMap().keySet()) {
buf.append("\nParameter: " + key + " Values: ");
Modified: trunk/interfaces/src/main/resources/nke/geizhals.owl
===================================================================
--- trunk/interfaces/src/main/resources/nke/geizhals.owl 2011-06-21 10:02:25 UTC (rev 2918)
+++ trunk/interfaces/src/main/resources/nke/geizhals.owl 2011-06-21 17:09:57 UTC (rev 2919)
@@ -172,7 +172,7 @@
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
</rdf:Description>
<rdf:Description rdf:about="http://nke.aksw.org/geizhals/_85_unbekannt">
- <ns0:label xmlns:ns0="http://www.w3.org/2000/01/rdf-schema#">unbekannt</ns0:label>
+ <ns0:label xmlns:ns0="http://www.w3.org/2000/01/rdf-schema#">unknown Display</ns0:label>
</rdf:Description>
<rdf:Description rdf:about="http://nke.aksw.org/geizhals/_1200_4%3A3">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
@@ -772,7 +772,7 @@
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
</rdf:Description>
<rdf:Description rdf:about="http://nke.aksw.org/geizhals/_84_ohne">
- <ns0:label xmlns:ns0="http://www.w3.org/2000/01/rdf-schema#">ohne</ns0:label>
+ <ns0:label xmlns:ns0="http://www.w3.org/2000/01/rdf-schema#">w/o Optical Drive</ns0:label>
</rdf:Description>
<rdf:Description rdf:about="http://nke.aksw.org/geizhals/_84_unbekannt">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2011-08-21 21:04:54
|
Revision: 3080
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3080&view=rev
Author: lorenz_b
Date: 2011-08-21 21:04:48 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
Added assembly file to package future release as zip, tar etc.
Added Paths:
-----------
trunk/interfaces/src/main/assemble/
trunk/interfaces/src/main/assemble/archive.xml
Added: trunk/interfaces/src/main/assemble/archive.xml
===================================================================
--- trunk/interfaces/src/main/assemble/archive.xml (rev 0)
+++ trunk/interfaces/src/main/assemble/archive.xml 2011-08-21 21:04:48 UTC (rev 3080)
@@ -0,0 +1,12 @@
+<assembly>
+ <id>archive</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/appassembler</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/interfaces/src/main/assemble/archive.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2011-09-15 12:32:14
|
Revision: 3272
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3272&view=rev
Author: lorenz_b
Date: 2011-09-15 12:32:06 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Removed executable status for some files in assembly.
Modified Paths:
--------------
trunk/interfaces/src/main/assemble/archive.xml
trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
Modified: trunk/interfaces/src/main/assemble/archive.xml
===================================================================
--- trunk/interfaces/src/main/assemble/archive.xml 2011-09-15 12:30:52 UTC (rev 3271)
+++ trunk/interfaces/src/main/assemble/archive.xml 2011-09-15 12:32:06 UTC (rev 3272)
@@ -2,7 +2,6 @@
<id>archive</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<fileSets>
@@ -57,6 +56,7 @@
<include>LICENSE</include>
<include>INSTALL</include>
</includes>
+ <fileMode>0644</fileMode>
</fileSet>
</fileSets>
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-15 12:30:52 UTC (rev 3271)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-15 12:32:06 UTC (rev 3272)
@@ -734,7 +734,14 @@
} catch(OptionException e) {
System.out.println("The specified graph appears not be a proper URL.");
System.exit(0);
- }
+ }
+ URI resourceURI = null;
+ try {
+ resourceURI = (URI) options.valueOf("resource");
+ } catch(OptionException e) {
+ System.out.println("The specified resource appears not be a proper URI.");
+ System.exit(0);
+ }
LinkedList<String> defaultGraphURIs = new LinkedList<String>();
if(graph != null) {
defaultGraphURIs.add(graph.toString());
@@ -757,7 +764,7 @@
// map resource to correct type
Entity resource = null;
if(options.valueOf("resource") != null) {
- resource = new SPARQLTasks(se).guessResourceType(((URI)options.valueOf("resource")).toString(), true);
+ resource = new SPARQLTasks(se).guessResourceType(resourceURI.toString(), true);
if(resource == null) {
throw new IllegalArgumentException("Could not determine the type (class, object property or data property) of input resource " + options.valueOf("resource"));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2011-11-21 10:54:45
|
Revision: 3419
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3419&view=rev
Author: kurzum
Date: 2011-11-21 10:54:36 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
changed rest interface
Modified Paths:
--------------
trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
trunk/interfaces/src/main/webapp/WEB-INF/web.xml
Modified: trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2011-11-18 15:35:17 UTC (rev 3418)
+++ trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2011-11-21 10:54:36 UTC (rev 3419)
@@ -2,6 +2,7 @@
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,6 +14,8 @@
import java.io.PrintWriter;
import java.net.URLEncoder;
import java.security.InvalidParameterException;
+import java.util.HashMap;
+import java.util.Map;
public class Rest extends HttpServlet {
@@ -38,39 +41,33 @@
* @throws java.io.IOException
*/
private void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
- Monitor mon = MonitorFactory.getTimeMonitor("NIFParameters.getInstance").start();
- String result = "";
try {
- //check parameters
- String conf = "";
- if (isSet(httpServletRequest, "conf")) {
+ String conf = null;
+ if (!isSet("conf", httpServletRequest)) {
+ throw new IllegalArgumentException("Missing parameter: conf is required. ");
+ } else {
conf = httpServletRequest.getParameter("conf");
- } else {
- throw new InvalidParameterException("No parameter 'conf' found. " + getDocumentation(httpServletRequest.getRequestURL().toString()));
}
- //output default is json
- String output = "json";
- if (isSet(httpServletRequest, "output")) {
- output = httpServletRequest.getParameter("output");
- //use the function one of
- if (!oneOf(output, "json", "xml")) {
- throw new InvalidParameterException("Wrong parameter value for \"output\", must be one of ( json, xml ) " + getDocumentation(httpServletRequest.getRequestURL().toString()));
- }
- }
+ /*todo learn
+ Description d = learn (conf);
+ String concept = d.getConceptAsString ();
+ String sparql = new SPARLQConverter().convert(d);
- /**
- * Do the magic here
- */
- result = conf;
+ */
+ String concept = "hasCar some (ClosedCar and ShortCar)";
+ String sparql = "SELECT ?instances { ?instances :hasCar ?o . ?o rdf:type :ClosedCar. ?o2 rdf:type :ShortCar ";
- PrintWriter pw = httpServletResponse.getWriter();
- log.debug("Request handled: " + logMonitor(mon.stop()));
- pw.print(result);
- pw.close();
+ String result="{\"concept\": \""+concept+"\", \"SPARQL\":\""+sparql+"\"}";
+ result+="\n\nconf was:\n"+conf;
+ httpServletResponse.setContentType("text/plain");
+ PrintWriter out = httpServletResponse.getWriter();
+ out.println(result);
+ out.close();
+
} catch (IllegalArgumentException e) {
- String msg = e.getMessage() + printParameterMap(httpServletRequest);
+ String msg = e.getMessage();// + printParameterMap(httpServletRequest);
log.error(msg);
httpServletResponse.setContentType("text/plain");
PrintWriter out = httpServletResponse.getWriter();
@@ -78,7 +75,7 @@
out.close();
} catch (Exception e) {
- String msg = "An error occured: " + e.getMessage() + printParameterMap(httpServletRequest);
+ String msg = "An error occured: " + e.getMessage(); //+ printParameterMap(httpServletRequest);
log.error(msg, e);
httpServletResponse.setContentType("text/plain");
PrintWriter out = httpServletResponse.getWriter();
@@ -90,12 +87,23 @@
}
- /**
- * Examples are from NIF
- *
- * @param serviceUrl
- * @return
- */
+ public static String requiredParameter(String parameterName, HttpServletRequest hsr) {
+
+ if (!isSet(parameterName, hsr)) {
+ throw new IllegalArgumentException("Missing parameter: " + parameterName + " is required. ");
+ }
+ return hsr.getParameter(parameterName);
+ }
+
+ public static String requiredParameter(String parameterName, HttpServletRequest hsr, String... requiredValues) {
+ String value = requiredParameter(parameterName, hsr);
+ if (!oneOf(value, requiredValues)) {
+ throw new InvalidParameterException("Wrong value for parameter " + parameterName + ", value was: " + value + ", but must be one of ( " + StringUtils.join(requiredValues, ", ") + " ) ");
+ }
+ return value;
+ }
+
+
public static String getDocumentation(String serviceUrl) {
String doc = "";
try {
@@ -107,12 +115,6 @@
return doc;
}
- public static boolean isSet(HttpServletRequest httpServletRequest, String name) {
- log.trace("isSet(" + name + ")");
- log.trace(httpServletRequest.getParameterValues(name) + "");
- return httpServletRequest.getParameterValues(name) != null && httpServletRequest.getParameterValues(name).length == 1 && httpServletRequest.getParameter(name).length() > 0;
- }
-
public static boolean oneOf(String value, String... possibleValues) {
for (String s : possibleValues) {
if (s.equals(value)) {
@@ -122,19 +124,21 @@
return false;
}
- protected static String logMonitor(Monitor m) {
- return "needed: " + m.getLastValue() + " ms. (" + m.getTotal() + " total)";
+ public static boolean isSet(String parameterName, HttpServletRequest hsr) {
+ boolean retVal = hsr.getParameterValues(parameterName) != null && hsr.getParameterValues(parameterName).length == 1 && hsr.getParameter(parameterName).length() > 0;
+ if (log.isTraceEnabled()) {
+ log.trace("Parameter " + parameterName + " isSet: " + retVal + " with value: " + hsr.getParameter(parameterName) + ")");
+ }
+ return retVal;
}
- public static String printParameterMap(HttpServletRequest httpServletRequest) {
- StringBuffer buf = new StringBuffer();
+ public static Map<String, String> copyParameterMap(HttpServletRequest httpServletRequest) {
+ Map<String, String> ret = new HashMap<String, String>();
for (Object key : httpServletRequest.getParameterMap().keySet()) {
- buf.append("\nParameter: " + key + " Values: ");
- for (String s : httpServletRequest.getParameterValues((String) key)) {
- buf.append(((s.length() > 200) ? s.substring(0, 200) + "..." : s) + " ");
- }
+ ret.put((String) key, httpServletRequest.getParameter((String) key));
}
- return buf.toString();
+ return ret;
}
+
}
Modified: trunk/interfaces/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/interfaces/src/main/webapp/WEB-INF/web.xml 2011-11-18 15:35:17 UTC (rev 3418)
+++ trunk/interfaces/src/main/webapp/WEB-INF/web.xml 2011-11-21 10:54:36 UTC (rev 3419)
@@ -10,7 +10,13 @@
<servlet-class>org.dllearner.server.Rest</servlet-class>
</servlet>
- <servlet>
+ <servlet-mapping>
+ <servlet-name>rest</servlet-name>
+ <url-pattern>/rest</url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
<servlet-name>NKEGeizhals</servlet-name>
<servlet-class>org.dllearner.server.NKEGeizhals</servlet-class>
</servlet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2012-04-29 17:25:52
|
Revision: 3667
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3667&view=rev
Author: shadowtm
Date: 2012-04-29 17:25:45 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Added logger for the cli package so we could enable output of stacktraces to the appenders if we want.
Modified Paths:
--------------
trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
trunk/interfaces/src/main/resources/log4j.properties
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java 2012-04-29 16:25:14 UTC (rev 3666)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java 2012-04-29 17:25:45 UTC (rev 3667)
@@ -28,7 +28,6 @@
import java.util.Map.Entry;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
import org.dllearner.configuration.IConfiguration;
import org.dllearner.configuration.spring.ApplicationContextBuilder;
@@ -39,6 +38,8 @@
import org.dllearner.core.*;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.utilities.Files;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
@@ -52,9 +53,8 @@
*/
public class CLI {
- private static Logger logger = Logger.getLogger(CLI.class);
- private static Logger rootLogger = Logger.getRootLogger();
-
+ private static Logger logger = LoggerFactory.getLogger(CLI.class);
+
private ApplicationContext context;
private IConfiguration configuration;
private File confFile;
@@ -190,7 +190,7 @@
// Get the Root Error Message
logger.error("An Error Has Occurred During Processing.");
logger.error(primaryCause.getMessage());
-
+ logger.debug("Stack Trace: ", e);
logger.error("Terminating DL-Learner...and writing stacktrace to: " + stacktraceFileName);
FileOutputStream fos = new FileOutputStream(stacktraceFileName);
PrintStream ps = new PrintStream(fos);
Modified: trunk/interfaces/src/main/resources/log4j.properties
===================================================================
--- trunk/interfaces/src/main/resources/log4j.properties 2012-04-29 16:25:14 UTC (rev 3666)
+++ trunk/interfaces/src/main/resources/log4j.properties 2012-04-29 17:25:45 UTC (rev 3667)
@@ -1,3 +1,5 @@
+# All loggers will default to the INFO level unless specified in a specific logger
+# For more information, see the Log4J API manual at: http://bit.ly/KmvtWL .
log4j.rootLogger=INFO, stdout, file
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -12,6 +14,8 @@
# DL-Learner Logs
log4j.logger.org.dllearner=INFO
+# Turn this to Debug if you wish to dump stack traces to the appenders (console, file)
+log4j.logger.org.dllearner.cli=INFO
log4j.logger.org.dllearner.server.nke.LogicalRelationStrategy=DEBUG
log4j.category.org.dllearner.kb.simple=DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dc...@us...> - 2013-07-16 05:25:44
|
Revision: 4020
http://sourceforge.net/p/dl-learner/code/4020
Author: dcherix
Date: 2013-07-16 05:25:41 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Added a simple possibility to configure via a webpage for sparqr
Modified Paths:
--------------
trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
trunk/interfaces/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
trunk/interfaces/src/main/java/org/dllearner/server/ConfGeneratorServlet.java
trunk/interfaces/src/main/resources/config.template
Added: trunk/interfaces/src/main/java/org/dllearner/server/ConfGeneratorServlet.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/ConfGeneratorServlet.java (rev 0)
+++ trunk/interfaces/src/main/java/org/dllearner/server/ConfGeneratorServlet.java 2013-07-16 05:25:41 UTC (rev 4020)
@@ -0,0 +1,221 @@
+/**
+ *
+ */
+package org.dllearner.server;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URLDecoder;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author didier
+ *
+ */
+public class ConfGeneratorServlet extends HttpServlet {
+
+ private Logger logger = LoggerFactory.getLogger(ConfGeneratorServlet.class);
+
+ private String template;
+
+ public ConfGeneratorServlet() {
+ BufferedReader input = new BufferedReader(new InputStreamReader(ConfGeneratorServlet.class
+ .getClassLoader().getResourceAsStream("config.template")));
+ StringBuilder builder = new StringBuilder();
+ try {
+ while (input.ready()) {
+ builder.append(input.readLine());
+ builder.append("\n");
+ }
+ } catch (IOException e) {
+ logger.error("", ExceptionUtils.getRootCause(e));
+ } finally {
+ try {
+ input.close();
+ } catch (IOException e) {
+ logger.error("", ExceptionUtils.getRootCause(e));
+ }
+ }
+ template = builder.toString();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest
+ * , javax.servlet.http.HttpServletResponse)
+ */
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+ IOException {
+ handle(req, resp);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest
+ * , javax.servlet.http.HttpServletResponse)
+ */
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ handle(req, resp);
+ }
+
+ /**
+ * @param req
+ * @param resp
+ */
+ private void handle(HttpServletRequest req, HttpServletResponse resp) {
+ String tmp = template;
+ try {
+ String[] pos, neg = null;
+ if (!Rest.isSet("pos", req)) {
+ System.out.println("blub");
+ req.getRequestDispatcher("/WEB-INF/sparqr.html").forward(req, resp);
+ return;
+ } else {
+ pos = URLDecoder.decode(req.getParameter("pos"), "UTF-8").split(",");
+ if (Rest.isSet("neg", req)) {
+ neg = URLDecoder.decode(req.getParameter("neg"), "UTF-8").split(",");
+ }
+ }
+ StringBuilder posStr = new StringBuilder();
+ StringBuilder negStr = new StringBuilder();
+ StringBuilder instances = new StringBuilder();
+
+ if (neg != null) {
+ tmp=tmp.replace("<LPTYPE>", "\"posNegStandard\"");
+ for (int i = 0; i < neg.length; i++) {
+ if (i > 0) {
+ negStr.append(",\n");
+ instances.append(",\n");
+ }
+ negStr.append("\"");
+ negStr.append(neg[i].replaceAll("\"|\n|\\s", ""));
+ negStr.append("\"");
+ instances.append("\"");
+ instances.append(neg[i].replaceAll("\"|\n|\\s", ""));
+ instances.append("\"");
+ }
+ } else {
+ tmp=tmp.replace("<LPTYPE>", "\"posOnlyLP\"");
+ tmp=tmp.replace("lp.negativeExamples = {\n<NEGATIVES>\n} ", "");
+ }
+
+ for (int i = 0; i < pos.length; i++) {
+ if (i > 0) {
+ posStr.append(",\n");
+ }
+ if (instances.length() > 0) {
+ instances.append(",\n");
+ }
+ posStr.append("\"");
+ posStr.append(pos[i].replaceAll("\"|\n|\\s", ""));
+ posStr.append("\"");
+ instances.append("\"");
+ instances.append(pos[i].replaceAll("\"|\n|\\s", ""));
+ instances.append("\"");
+ }
+ tmp=tmp.replace("<INSTANCES>", instances.toString());
+ tmp=tmp.replace("<POSITIVES>", posStr.toString());
+ tmp=tmp.replace("<NEGATIVES>", negStr.toString());
+ Map<String, String[]> additionalParams = new HashMap<String, String[]>();
+ additionalParams.put("conf", new String[]{tmp});
+ System.out.println(tmp);
+ ModifiableWrappedRequest request = new ModifiableWrappedRequest(req, additionalParams);
+ request.getRequestDispatcher("/rest").forward(request, resp);
+ } catch (ServletException e) {
+ logger.error("", ExceptionUtils.getRootCause(e));
+ try {
+ resp.sendError(500, ExceptionUtils.getRootCause(e).toString());
+ } catch (IOException e1) {
+ logger.error("", ExceptionUtils.getRootCause(e1));
+ }
+ } catch (IOException e) {
+ logger.error("", ExceptionUtils.getRootCause(e));
+ try {
+ resp.sendError(500, ExceptionUtils.getRootCause(e).toString());
+ } catch (IOException e1) {
+ logger.error("", ExceptionUtils.getRootCause(e1));
+ }
+ }
+ }
+
+ public class ModifiableWrappedRequest extends HttpServletRequestWrapper
+ {
+ private final Map<String, String[]> modifiableParameters;
+ private Map<String, String[]> allParameters = null;
+
+ /**
+ * Create a new request wrapper that will merge additional parameters into
+ * the request object without prematurely reading parameters from the
+ * original request.
+ *
+ * @param request
+ * @param additionalParams
+ */
+ public ModifiableWrappedRequest(final HttpServletRequest request,
+ final Map<String, String[]> additionalParams)
+ {
+ super(request);
+ modifiableParameters = new TreeMap<String, String[]>();
+ modifiableParameters.putAll(additionalParams);
+ }
+
+ @Override
+ public String getParameter(final String name)
+ {
+ String[] strings = getParameterMap().get(name);
+ if (strings != null)
+ {
+ return strings[0];
+ }
+ return super.getParameter(name);
+ }
+
+ @Override
+ public Map<String, String[]> getParameterMap()
+ {
+ if (allParameters == null)
+ {
+ allParameters = new TreeMap<String, String[]>();
+ allParameters.putAll(super.getParameterMap());
+ allParameters.putAll(modifiableParameters);
+ }
+ //Return an unmodifiable collection because we need to uphold the interface contract.
+ return Collections.unmodifiableMap(allParameters);
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames()
+ {
+ return Collections.enumeration(getParameterMap().keySet());
+ }
+
+ @Override
+ public String[] getParameterValues(final String name)
+ {
+ return getParameterMap().get(name);
+ }
+ }
+
+}
Property changes on: trunk/interfaces/src/main/java/org/dllearner/server/ConfGeneratorServlet.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2013-07-15 16:32:53 UTC (rev 4019)
+++ trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2013-07-16 05:25:41 UTC (rev 4020)
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -58,10 +59,10 @@
int limit = 5;
if (!isSet("conf", httpServletRequest)) {
// throw new IllegalArgumentException("Missing parameter: conf is required. ");
- httpServletResponse.sendError(400, "Missing parameter: conf is required. ");
+ httpServletRequest.getRequestDispatcher("/WEB-INF/sparqr.html").forward(httpServletRequest, httpServletResponse);
return;
} else {
- conf = httpServletRequest.getParameter("conf");
+ conf = URLDecoder.decode(httpServletRequest.getParameter("conf"));
if (isSet("limit", httpServletRequest)) {
limit = Integer.parseInt(httpServletRequest.getParameter("limit"));
}
Added: trunk/interfaces/src/main/resources/config.template
===================================================================
--- trunk/interfaces/src/main/resources/config.template (rev 0)
+++ trunk/interfaces/src/main/resources/config.template 2013-07-16 05:25:41 UTC (rev 4020)
@@ -0,0 +1,47 @@
+sparql.type = "sparqls"
+sparql.endpointURL = "http://dbpedia.org/sparql"
+sparql.defaultGraphURI = "http://dbpedia.org"
+sparql.recursionDepth = 2
+sparql.ontologySchemaUrls = {"http://downloads.dbpedia.org/3.6/dbpedia_3.6.owl" }
+sparql.aboxfilter = "FILTER (
+!isLiteral(?o) &&
+!regex(str(?p), 'http://dbpedia.org/property/website') &&
+!regex(str(?p), 'http://dbpedia.org/property/wikipage') &&
+!regex(str(?p), 'http://dbpedia.org/property/wikiPageUsesTemplate') &&
+!regex(str(?p), 'http://dbpedia.org/property/reference') &&
+!regex(str(?p), 'http://www.w3.org/2004/02/skos/core') &&
+!regex(str(?p), 'http://www.w3.org/2002/07/owl#sameAs') &&
+!regex(str(?p), 'http://xmlns.com/foaf/0.1/') &&
+!regex(str(?p), 'http://dbpedia.org/property/wordnet_type') &&
+!regex(str(?p), 'http://dbpedia.org/property/wikilink') &&
+regex(str(?o), '^http://dbpedia.org/resource/')
+) "
+sparql.tboxfilter = "FILTER ( !regex(str(?class), '^http://upload.wikimedia.org/wikipedia') &&
+!regex(str(?class), '^http://dbpedia.org/resource/Template') &&
+!regex(str(?class), '^http://dbpedia.org/resource/Category:') &&
+!regex(str(?class), '^http://umbel.org/umbel/') &&
+!regex(str(?class), '^http://dbpedia.org/class/yago')
+ ) . "
+sparql.instances = {
+<INSTANCES>
+ }
+reasoner.type = "fast instance checker"
+reasoner.sources = {sparql}
+lp.type = <LPTYPE>
+lp.positiveExamples = {
+<POSITIVES>
+}
+lp.negativeExamples = {
+<NEGATIVES>
+}
+lp.reasoner = reasoner
+op.type = "rho"
+op.useNegation = false
+op.useAllConstructor = false
+op.useCardinalityRestrictions = false
+op.useHasValueConstructor = true
+op.reasoner = reasoner
+alg.type = "ocel"
+alg.reasoner = reasoner
+alg.maxExecutionTimeInSeconds = 30
+alg.noisePercentage = 10.0
\ No newline at end of file
Modified: trunk/interfaces/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/interfaces/src/main/webapp/WEB-INF/web.xml 2013-07-15 16:32:53 UTC (rev 4019)
+++ trunk/interfaces/src/main/webapp/WEB-INF/web.xml 2013-07-16 05:25:41 UTC (rev 4020)
@@ -14,8 +14,18 @@
<servlet-name>rest</servlet-name>
<url-pattern>/rest</url-pattern>
</servlet-mapping>
+
+ <servlet>
+ <servlet-name>conf</servlet-name>
+ <servlet-class>org.dllearner.server.ConfGeneratorServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>conf</servlet-name>
+ <url-pattern>/conf</url-pattern>
+ </servlet-mapping>
+
<servlet>
<servlet-name>NKEGeizhals</servlet-name>
<servlet-class>org.dllearner.server.NKEGeizhals</servlet-class>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X