You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by pk...@apache.org on 2005/08/25 20:48:21 UTC
svn commit: r240117 [2/2] - in /lucene/nutch/branches/Release-0.7: ./ conf/
docs/ca/ docs/de/ docs/en/ docs/es/ docs/fi/ docs/fr/ docs/hu/ docs/jp/
docs/ms/ docs/nl/ docs/pl/ docs/pt/ docs/sv/ docs/th/ docs/zh/
src/java/org/apache/nutch/parse/ src/plug...
Modified: lucene/nutch/branches/Release-0.7/src/plugin/parse-text/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/parse-text/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/parse-text/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/parse-text/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,6 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.parse.Parser"
- name="Nutch Content Parser"/>
<runtime>
<library name="parse-text.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/parse-text/src/java/org/apache/nutch/parse/text/TextParser.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/parse-text/src/java/org/apache/nutch/parse/text/TextParser.java?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/parse-text/src/java/org/apache/nutch/parse/text/TextParser.java (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/parse-text/src/java/org/apache/nutch/parse/text/TextParser.java Thu Aug 25 11:44:58 2005
@@ -28,7 +28,7 @@
Properties metadata = new Properties();
metadata.putAll(content.getMetadata());
- ParseData parseData = new ParseData(ParseStatus.STATUS_SUCCESS, "", new Outlink[0], metadata);
+ //ParseData parseData = new ParseData(ParseStatus.STATUS_SUCCESS, "", new Outlink[0], metadata);
String encoding =
StringUtil.parseCharacterEncoding(content.getContentType());
@@ -45,6 +45,9 @@
text = new String(content.getContent()); // use default encoding
}
- return new ParseImpl(text, parseData);
+ return new ParseImpl(text,
+ new ParseData(ParseStatus.STATUS_SUCCESS, "",
+ OutlinkExtractor.getOutlinks(text),
+ metadata));
}
}
Modified: lucene/nutch/branches/Release-0.7/src/plugin/protocol-file/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/protocol-file/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/protocol-file/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/protocol-file/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,6 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.protocol.Protocol"
- name="Nutch Protocol"/>
<runtime>
<library name="protocol-file.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/protocol-ftp/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/protocol-ftp/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/protocol-ftp/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/protocol-ftp/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,7 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.protocol.Protocol"
- name="Nutch Protocol"/>
+
<runtime>
<library name="protocol-ftp.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/protocol-http/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/protocol-http/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/protocol-http/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/protocol-http/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,10 +5,6 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.protocol.Protocol"
- name="Nutch Protocol"/>
-
<runtime>
<library name="protocol-http.jar">
<export name="*"/>
Modified: lucene/nutch/branches/Release-0.7/src/plugin/protocol-httpclient/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/protocol-httpclient/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/protocol-httpclient/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/protocol-httpclient/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,21 +5,16 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.protocol.Protocol"
- name="Nutch Protocol"/>
-
<runtime>
<library name="protocol-httpclient.jar">
<export name="*"/>
</library>
<library name="commons-codec.jar" />
<library name="commons-httpclient-3.0-rc2.jar" />
-
</runtime>
<extension id="org.apache.nutch.protocol.httpclient"
- name="HttpProtocol"
+ name="HttpProtocol"
point="org.apache.nutch.protocol.Protocol">
<implementation id="org.apache.nutch.protocol.httpclient.Http"
Modified: lucene/nutch/branches/Release-0.7/src/plugin/query-basic/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/query-basic/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/query-basic/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/query-basic/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,7 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.searcher.QueryFilter"
- name="Nutch Query Filter"/>
+
<runtime>
<library name="query-basic.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/query-more/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/query-more/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/query-more/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/query-more/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,7 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.searcher.QueryFilter"
- name="Nutch Query Filter"/>
+
<runtime>
<library name="query-more.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/query-site/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/query-site/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/query-site/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/query-site/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,10 +5,6 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.searcher.QueryFilter"
- name="Nutch Query Filter"/>
-
<runtime>
<library name="query-site.jar">
<export name="*"/>
Modified: lucene/nutch/branches/Release-0.7/src/plugin/query-url/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/query-url/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/query-url/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/query-url/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,7 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.searcher.QueryFilter"
- name="Nutch Query Filter"/>
+
<runtime>
<library name="query-url.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-prefix/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-prefix/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-prefix/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-prefix/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,9 +5,7 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.net.URLFilter"
- name="Nutch URL Filter"/>
+
<runtime>
<library name="urlfilter-prefix.jar">
Modified: lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-regex/plugin.xml
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-regex/plugin.xml?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-regex/plugin.xml (original)
+++ lucene/nutch/branches/Release-0.7/src/plugin/urlfilter-regex/plugin.xml Thu Aug 25 11:44:58 2005
@@ -5,10 +5,6 @@
version="1.0.0"
provider-name="nutch.org">
- <extension-point
- id="org.apache.nutch.net.URLFilter"
- name="Nutch URL Filter"/>
-
<runtime>
<library name="urlfilter-regex.jar">
<export name="*"/>
Modified: lucene/nutch/branches/Release-0.7/src/web/jsp/search.jsp
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/web/jsp/search.jsp?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/web/jsp/search.jsp (original)
+++ lucene/nutch/branches/Release-0.7/src/web/jsp/search.jsp Thu Aug 25 11:44:58 2005
@@ -123,9 +123,14 @@
<link rel="alternate" type="application/rss+xml" title="RSS" href="<%=rss%>"/>
<jsp:include page="include/style.html"/>
<base href="<%= base + "/" + language %>/">
+<script type="text/javascript">
+<!--
+function queryfocus() { document.search.query.focus(); }
+// -->
+</script>
</head>
-<body>
+<body onLoad="queryfocus();">
<jsp:include page="<%= language + "/include/header.html"%>"/>
Modified: lucene/nutch/branches/Release-0.7/src/web/style/nutch-page.xsl
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/Release-0.7/src/web/style/nutch-page.xsl?rev=240117&r1=240116&r2=240117&view=diff
==============================================================================
--- lucene/nutch/branches/Release-0.7/src/web/style/nutch-page.xsl (original)
+++ lucene/nutch/branches/Release-0.7/src/web/style/nutch-page.xsl Thu Aug 25 11:44:58 2005
@@ -17,8 +17,15 @@
<!-- specify icon file -->
<link rel="icon" href="../img/favicon.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon"/>
+
+ <script type="text/javascript">
+ <xsl:comment>
+function queryfocus() { document.search.query.focus(); }
+<xsl:text>// </xsl:text>
+</xsl:comment>
+ </script>
</head>
- <body>
+ <body onLoad="queryfocus();">
<!-- insert localized header -->
<xsl:copy-of select="document('include/header.html')"/>
<table width="635" border="0" cellpadding="0" cellspacing="0">