Author: siren
Date: Sat Feb 4 01:34:27 2006
New Revision: 374842
URL: http://svn.apache.org/viewcvs?rev=374842&view=rev
Log:
fixes for hadoop split
Modified:
lucene/nutch/trunk/src/web/jsp/anchors.jsp
lucene/nutch/trunk/src/web/jsp/cached.jsp
lucene/nutch/trunk/src/web/jsp/explain.jsp
lucene/nutch/trunk/src/web/jsp/refine-query-init.jsp
lucene/nutch/trunk/src/web/jsp/search.jsp
lucene/nutch/trunk/src/web/jsp/text.jsp
Modified: lucene/nutch/trunk/src/web/jsp/anchors.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/anchors.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/anchors.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/anchors.jsp Sat Feb 4 01:34:27 2006
@@ -8,12 +8,13 @@
import="org.apache.nutch.html.Entities"
import="org.apache.nutch.searcher.*"
- import="org.apache.nutch.util.NutchConf"
+ import="org.apache.hadoop.conf.Configuration"
+ import="org.apache.nutch.util.NutchConfiguration"
%><%
- NutchConf nutchConf = (NutchConf)
application.getAttribute(NutchConf.class.getName());
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
if (nutchConf == null) {
- nutchConf = new NutchConf();
- application.setAttribute(NutchConf.class.getName(), nutchConf);
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
}
NutchBean bean = NutchBean.get(application, nutchConf);
// set the character encoding to use when interpreting request values
Modified: lucene/nutch/trunk/src/web/jsp/cached.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/cached.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/cached.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/cached.jsp Sat Feb 4 01:34:27 2006
@@ -7,12 +7,13 @@
import="org.apache.nutch.searcher.*"
import="org.apache.nutch.parse.ParseData"
import="org.apache.nutch.protocol.ContentProperties"
- import="org.apache.nutch.util.NutchConf"
+ import="org.apache.hadoop.conf.Configuration"
+ import="org.apache.nutch.util.NutchConfiguration"
%><%
- NutchConf nutchConf = (NutchConf)
application.getAttribute(NutchConf.class.getName());
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
if (nutchConf == null) {
- nutchConf = new NutchConf();
- application.setAttribute(NutchConf.class.getName(), nutchConf);
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
}
NutchBean bean = NutchBean.get(application, nutchConf);
bean.LOG.info("cache request from " + request.getRemoteAddr());
Modified: lucene/nutch/trunk/src/web/jsp/explain.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/explain.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/explain.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/explain.jsp Sat Feb 4 01:34:27 2006
@@ -6,12 +6,13 @@
import="java.io.*"
import="java.util.*"
import="org.apache.nutch.searcher.*"
- import="org.apache.nutch.util.NutchConf"
+ import="org.apache.hadoop.conf.Configuration"
+ import="org.apache.nutch.util.NutchConfiguration"
%><%
- NutchConf nutchConf = (NutchConf)
application.getAttribute(NutchConf.class.getName());
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
if (nutchConf == null) {
- nutchConf = new NutchConf();
- application.setAttribute(NutchConf.class.getName(), nutchConf);
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
}
NutchBean bean = NutchBean.get(application, nutchConf);
// set the character encoding to use when interpreting request values
Modified: lucene/nutch/trunk/src/web/jsp/refine-query-init.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/refine-query-init.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/refine-query-init.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/refine-query-init.jsp Sat Feb 4 01:34:27
2006
@@ -13,11 +13,11 @@
// being loaded into the JVM. Need improvement in future.
try {
- org.apache.nutch.util.NutchConf nutchConf =
(org.apache.nutch.util.NutchConf)
application.getAttribute(org.apache.nutch.util.NutchConf.class.getName());
- if (nutchConf == null) {
- nutchConf = new org.apache.nutch.util.NutchConf();
-
application.setAttribute(org.apache.nutch.util.NutchConf.class.getName(),
nutchConf);
- }
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
+ if (nutchConf == null) {
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
+ }
String urls = nutchConf.get("extension.ontology.urls");
ontology = new
org.apache.nutch.ontology.OntologyFactory(nutchConf).getOntology();
if (urls==null || urls.trim().equals("")) {
Modified: lucene/nutch/trunk/src/web/jsp/search.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/search.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/search.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/search.jsp Sat Feb 4 01:34:27 2006
@@ -3,7 +3,6 @@
contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"
- import="javax.servlet.http.*"
import="java.io.*"
import="java.util.*"
import="java.net.*"
@@ -12,15 +11,15 @@
import="org.apache.nutch.searcher.*"
import="org.apache.nutch.plugin.*"
import="org.apache.nutch.clustering.*"
- import="org.apache.nutch.util.NutchConf"
+ import="org.apache.hadoop.conf.*"
+ import="org.apache.nutch.util.NutchConfiguration"
%><%
- NutchConf nutchConf = (NutchConf)
application.getAttribute(NutchConf.class.getName());
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
if (nutchConf == null) {
- nutchConf = new NutchConf();
- application.setAttribute(NutchConf.class.getName(), nutchConf);
- }
-
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
+ }
/**
* Number of hits to retrieve and cluster if clustering extension is
available
* and clustering is on. By default, 100. Configurable via nutch-conf.xml.
Modified: lucene/nutch/trunk/src/web/jsp/text.jsp
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/text.jsp?rev=374842&r1=374841&r2=374842&view=diff
==============================================================================
--- lucene/nutch/trunk/src/web/jsp/text.jsp (original)
+++ lucene/nutch/trunk/src/web/jsp/text.jsp Sat Feb 4 01:34:27 2006
@@ -6,15 +6,16 @@
import="org.apache.nutch.searcher.*"
import="org.apache.nutch.parse.ParseText"
- import="org.apache.nutch.util.NutchConf"
+ import="org.apache.hadoop.conf.Configuration"
+ import="org.apache.nutch.util.NutchConfiguration"
%><%
// show the content of a hit as plain text
- NutchConf nutchConf = (NutchConf)
application.getAttribute(NutchConf.class.getName());
+ Configuration nutchConf = (Configuration)
application.getAttribute(Configuration.class.getName());
if (nutchConf == null) {
- nutchConf = new NutchConf();
- application.setAttribute(NutchConf.class.getName(), nutchConf);
+ nutchConf = NutchConfiguration.create();
+ application.setAttribute(Configuration.class.getName(), nutchConf);
}
NutchBean bean = NutchBean.get(application, nutchConf);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Nutch-cvs mailing list
Nutch-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nutch-cvs
