Changeset 25155 for gs2-extensions/ngramj/perllib/plugins/ReadTextFile.pm

Timestamp:

2012-02-28T16:40:01+13:00 (12 years ago)

Author:

papitha

Message:

Tidy up of code to give controlled output (verbosity>=2)

File:

• gs2-extensions/ngramj/perllib/plugins/ReadTextFile.pm (modified) (3 diffs)

gs2-extensions/ngramj/perllib/plugins/ReadTextFile.pm

@@ -120 +120 @@
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
 
-    print STDERR "**** In Pei Jones Local version of ReadTextFile\n";
+    my $verbosity = $self->{'verbosity'};
+    if ($verbosity>=2) {
+        my $outhandle = $self->{'outhandle'};
+        print $outhandle "++ Using Ngram-Java version of ReadTextFile.pm ++\n";
+    }
     
     my $outhandle = $self->{'outhandle'};
@@ -329 +333 @@
     my ($filename) = @_;
 
-    $self->{'textcat'} = new ngramj() if (!defined($self->{'textcat'}));
+    $self->{'textcat'} = new ngramj($self->{'verbosity'},$self->{'outhandle'}) if (!defined($self->{'textcat'}));
     
     my ($language, $encoding, $extracted_encoding);
@@ -629 +633 @@
 
     else { # need to use textcat to get either the language, or get both language and encoding
-    $self->{'ngramj'} = new ngramj() if (!defined($self->{'ngramj'}));
+    $self->{'ngramj'} = new ngramj($self->{'verbosity'},$self->{'outhandle'}) if (!defined($self->{'ngramj'}));
     
     if($found_html_encoding) { # know encoding, find language by limiting search to known encoding