Changeset 25155 for gs2-extensions/ngramj/perllib/ngramj.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/ngramj.pm (modified) (6 diffs)

gs2-extensions/ngramj/perllib/ngramj.pm

@@ -33 +33 @@
 
 use strict;
-
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub new {
     my $class = shift (@_);
-
-    my $self = {};
+    my ($verbosity,$outhandle) = @_;
+    
+    my $self = { 'verbosity' => $verbosity, 'outhandle' => $outhandle };
 
     my $ngram_jar = &util::filename_cat($ENV{'GSDLHOME'},"ext","ngramj","jars","cngram.jar");
@@ -45 +46 @@
     
     $self->{'java_cmd'} = $java_cmd;
-    
   
     return bless $self, $class;
@@ -87 +87 @@
                 my @lang_array = split(/\s+/,$lang_group);
                 
+                my @lang_summary = ( "++ Ngram language probabilities:\n++  ");
+                
                 foreach my $l (@lang_array) {
-                    print STDERR "l = $l\n";
+                    push(@lang_summary,$l);
                     my ($lang,$score) = ($l =~ m/^(.+):(.+)$/);
                     
@@ -95 +97 @@
                     
                     push(@$lang_encode_pairs,$lang_pair);
+                }
+                push(@lang_summary,"\n");
+                
+                if ($self->{'verbosity'}>=2) {
+                    my $outhandle = $self->{'outhandle'};
+                    my $lang_summary_str = join(" ",@lang_summary);
+                    print $outhandle $lang_summary_str;
                 }
             }
@@ -105 +114 @@
         return undef;
     }
-    
-    
    
     &util::rm($tmp_txt_filename);
@@ -119 +126 @@
 
     return $self->classify_contents($contents_ref,$filename,$filter_by_encoding);
-    
 }