Changeset 26190

Timestamp:

2012-09-13T12:00:12+12:00 (12 years ago)

Author:

jmt12

Message:

Moving the StreamGobbler - used in both plugins to prevent a full STDERR buffer killing the import - into it's own class... my computer doesn't have an issue with exactly the same class occuring twice, but Medusa's one seems stricter in this regard

Location:

gs2-extensions/video-and-audio/trunk/src/opt/Terrier

Files:

• ImageDocument.java (modified) (3 diffs)
• VideoDocument.java (modified) (3 diffs)

gs2-extensions/video-and-audio/trunk/src/opt/Terrier/ImageDocument.java

@@ -17 +17 @@
 package org.terrier.indexing;
 
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.Reader;
-import java.lang.Thread;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -36 +29 @@
 
 import org.apache.log4j.Logger;
+import org.terrier.indexing.StreamGobbler;
 import org.terrier.indexing.tokenisation.TokenStream;
 import org.terrier.indexing.tokenisation.Tokeniser;
@@ -260 +254 @@
 }
 
-class StreamGobbler
-extends Thread
-{
-  InputStream is;
-  String file_path;
-  boolean output_to_file;
-
-  StreamGobbler(InputStream is)
-  {
-    this.is = is;
-    this.output_to_file = false;
-  }
-
-  StreamGobbler(InputStream is, String file_path)
-  {
-    this.is = is;
-    this.file_path = file_path;
-    this.output_to_file = true;
-  }
-
-  public void run()
-  {
-    try
-    {
-      InputStreamReader isr = new InputStreamReader(is);
-      BufferedReader br = new BufferedReader(isr);
-      String line = null;
-      if (output_to_file)
-      {
-        PrintWriter pw = new PrintWriter(new BufferedOutputStream(new FileOutputStream(file_path)));
-        while ( (line = br.readLine()) != null)
-        {
-          pw.println(line);
-        }
-        pw.flush();
-        pw.close();
-      }
-      else
-      {
-        while ( (line  = br.readLine()) != null)
-        {
-          // Do nothing - equivalent to > /dev/null
-        }
-      }
-    }
-    catch (IOException ioe)
-    {
-      ioe.printStackTrace();
-    }
-  }
-}

gs2-extensions/video-and-audio/trunk/src/opt/Terrier/VideoDocument.java

@@ -17 +17 @@
 package org.terrier.indexing;
 
-import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.Reader;
@@ -43 +40 @@
 
 import org.apache.log4j.Logger;
+import org.terrier.indexing.StreamGobbler;
 import org.terrier.indexing.tokenisation.TokenStream;
 import org.terrier.indexing.tokenisation.Tokeniser;
@@ -392 +390 @@
   /** getReader() **/
 }
-
-class StreamGobbler
-extends Thread
-{
-  InputStream is;
-  String file_path;
-  boolean output_to_file;
-
-  StreamGobbler(InputStream is)
-  {
-    this.is = is;
-    this.output_to_file = false;
-  }
-
-  StreamGobbler(InputStream is, String file_path)
-  {
-    this.is = is;
-    this.file_path = file_path;
-    this.output_to_file = true;
-  }
-
-  public void run()
-  {
-    try
-    {
-      InputStreamReader isr = new InputStreamReader(is);
-      BufferedReader br = new BufferedReader(isr);
-      String line = null;
-      if (output_to_file)
-      {
-        PrintWriter pw = new PrintWriter(new BufferedOutputStream(new FileOutputStream(file_path)));
-        while ( (line = br.readLine()) != null)
-        {
-          pw.println(line);
-        }
-        pw.flush();
-        pw.close();
-      }
-      else
-      {
-        while ( (line  = br.readLine()) != null)
-        {
-          // Do nothing - equivalent to > /dev/null
-        }
-      }
-    }
-    catch (IOException ioe)
-    {
-      ioe.printStackTrace();
-    }
-  }
-}
-