You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by si...@apache.org on 2012/03/20 13:23:18 UTC

svn commit: r1302858 - in /incubator/stanbol/trunk/demos/crawler/src/main: java/org/apache/stanbol/contenthub/crawler/cnn/ java/org/apache/stanbol/demos/crawler/web/resources/ resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/...

Author: sinaci
Date: Tue Mar 20 12:23:18 2012
New Revision: 1302858

URL: http://svn.apache.org/viewvc?rev=1302858&view=rev
Log:
Small bug fix while retrieving full content of CNN News.

Removed:
    incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/contenthub/crawler/cnn/
Modified:
    incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource.java
    incubator/stanbol/trunk/demos/crawler/src/main/resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource/index.ftl

Modified: incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource.java?rev=1302858&r1=1302857&r2=1302858&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource.java (original)
+++ incubator/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource.java Tue Mar 20 12:23:18 2012
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -66,9 +67,6 @@ public class CNNCrawlerResource extends 
 		if (max == null) {
 			max = 10;
 		}
-		if (full == null) {
-			full = false;
-		}
 
 		Map<URI, String> newsInfo = cnnCrawler.importCNNNews(topic, max, full,
 				indexName);
@@ -107,8 +105,8 @@ public class CNNCrawlerResource extends 
 	@POST
 	@Produces(TEXT_HTML)
 	public Response importCNNNewsHTMLPOST(@FormParam("topic") String topic,
-			@FormParam("max") Integer max, @FormParam("full") Boolean full) {
-		this.templateData = importCNNNews(topic, max, full);
+			@FormParam("max") Integer max, @FormParam("full") @DefaultValue("no") String full) {
+		this.templateData = importCNNNews(topic, max, full.equals("checked"));
 		return Response.ok(new Viewable("index", this), TEXT_HTML).build();
 	}
 

Modified: incubator/stanbol/trunk/demos/crawler/src/main/resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/crawler/src/main/resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource/index.ftl?rev=1302858&r1=1302857&r2=1302858&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/crawler/src/main/resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource/index.ftl (original)
+++ incubator/stanbol/trunk/demos/crawler/src/main/resources/org/apache/stanbol/demos/crawler/web/templates/org/apache/stanbol/demos/crawler/web/resources/CNNCrawlerResource/index.ftl Tue Mar 20 12:23:18 2012
@@ -104,7 +104,7 @@
 		 
 		function redirectIndex(){
 			var index = $("#indexSelect").val();
-			window.location.replace("${it.publicBaseUri}contenthub/" + index + "/import/cnn/");
+			window.location.replace("${it.publicBaseUri}crawler/cnn/" + index);
 		}
 	</script>
 </...@common.page>