Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[2591] trunk/archive-access/projects/nutchwax/ archive/src
|
From: <bi...@us...> - 2008-09-22 18:08:11
|
Revision: 2591
http://archive-access.svn.sourceforge.net/archive-access/?rev=2591&view=rev
Author: binzino
Date: 2008-09-22 18:07:59 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
WAX-22: Various code clean-ups based on code review using PMD tool.
Modified Paths:
--------------
trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/NutchWaxBean.java
trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/XSLTFilter.java
trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DateAdder.java
trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DumpParallelIndex.java
trunk/archive-access/projects/nutchwax/archive/src/plugin/index-nutchwax/src/java/org/archive/nutchwax/index/ConfigurableIndexingFilter.java
trunk/archive-access/projects/nutchwax/archive/src/plugin/urlfilter-nutchwax/src/java/org/archive/nutchwax/urlfilter/WaybackURLFilter.java
Modified: trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/NutchWaxBean.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/NutchWaxBean.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/NutchWaxBean.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -16,10 +16,12 @@
*/
package org.archive.nutchwax;
-import java.io.*;
+//import java.io.*;
import java.util.*;
import java.lang.reflect.Field;
-import javax.servlet.*;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +36,6 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Closeable;
import org.apache.hadoop.conf.Configuration;
import org.apache.lucene.index.IndexReader;
Modified: trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/XSLTFilter.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/XSLTFilter.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/XSLTFilter.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -25,7 +25,6 @@
import java.io.PrintWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -35,15 +34,14 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.Templates;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
-import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -55,8 +53,6 @@
public void init( FilterConfig config )
throws ServletException
{
- ServletContext app = config.getServletContext( );
-
this.xsltUrl = config.getInitParameter( "xsltUrl" );
if ( this.xsltUrl != null )
@@ -116,9 +112,11 @@
}
catch ( javax.xml.transform.TransformerConfigurationException tce )
{
+ // TODO: Re-throw, or log it and eat it?
}
catch( javax.xml.transform.TransformerException te )
{
+ // TODO: Re-throw, or log it and eat it?
}
}
else
Modified: trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DateAdder.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DateAdder.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DateAdder.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -20,17 +20,15 @@
*/
package org.archive.nutchwax.tools;
-import java.io.File;
import java.io.BufferedReader;
-import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Map;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
-import java.util.Collections;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -132,7 +130,7 @@
String dates[] = sourceDoc.getValues( NutchWax.DATE_KEY );
- java.util.Collections.addAll( uniqueDates, dates );
+ Collections.addAll( uniqueDates, dates );
}
for ( String date : uniqueDates )
{
Modified: trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DumpParallelIndex.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DumpParallelIndex.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/java/org/archive/nutchwax/tools/DumpParallelIndex.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -31,9 +31,6 @@
{
public static void main( String[] args ) throws Exception
{
- String option = "";
- String indexDir = "";
-
if ( args.length < 1 )
{
usageAndExit( );
Modified: trunk/archive-access/projects/nutchwax/archive/src/plugin/index-nutchwax/src/java/org/archive/nutchwax/index/ConfigurableIndexingFilter.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/plugin/index-nutchwax/src/java/org/archive/nutchwax/index/ConfigurableIndexingFilter.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/plugin/index-nutchwax/src/java/org/archive/nutchwax/index/ConfigurableIndexingFilter.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -73,6 +73,7 @@
String destKey = srcKey;
switch ( spec.length )
{
+ default:
case 6:
destKey = spec[5];
case 5:
@@ -83,6 +84,9 @@
store = Boolean.parseBoolean( spec[2] );
case 2:
lowerCase = Boolean.parseBoolean( spec[1] );
+ case 1:
+ // Nothing to do
+ ;
}
LOG.info( "Add field specification: " + srcKey + ":" + lowerCase + ":" + store + ":" + tokenize + ":" + exclusive + ":" + destKey );
Modified: trunk/archive-access/projects/nutchwax/archive/src/plugin/urlfilter-nutchwax/src/java/org/archive/nutchwax/urlfilter/WaybackURLFilter.java
===================================================================
--- trunk/archive-access/projects/nutchwax/archive/src/plugin/urlfilter-nutchwax/src/java/org/archive/nutchwax/urlfilter/WaybackURLFilter.java 2008-09-04 21:36:09 UTC (rev 2590)
+++ trunk/archive-access/projects/nutchwax/archive/src/plugin/urlfilter-nutchwax/src/java/org/archive/nutchwax/urlfilter/WaybackURLFilter.java 2008-09-22 18:07:59 UTC (rev 2591)
@@ -24,14 +24,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.httpclient.URIException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
