Changeset 31409 for main/trunk/greenstone2/perllib/oaiinfo.pm

Timestamp:

2017-02-14T17:43:28+13:00 (7 years ago)

Author:

ak19

Message:

Adding verbosity setting to oaiinfo.pm to reduce debug output on regular runs of building process. The perl filest that use oaiinfo now pass in the verbosity setting to the oaiinfo constructor.

File:

• main/trunk/greenstone2/perllib/oaiinfo.pm (modified) (10 diffs)

main/trunk/greenstone2/perllib/oaiinfo.pm

@@ -28 +28 @@
 sub new {
     my $class = shift(@_);
-    my ($config_filename, $infodbtype) = @_;
+    my ($config_filename, $infodbtype, $verbosity) = @_;
  
     my $self = { 
+    'verbosity' => $verbosity || 0,
+    'verbosity_threshold' => 5, # start printing debugging info from verbosity >= threshold
     'info'=>{} # map of {OID, array[deletion-status,timestamp,datestamp]} pairs
     };
@@ -47 +49 @@
     $self->{'oaidb_tmp_filepath'} = &dbutil::get_infodb_file_path($infodbtype, "oai-inf-tmp", $etc_dir, $perform_firsttime_init);
     $self->{'etc_dir'} = $etc_dir;
-#    print STDERR "############ LIVE DB: $self->{'oaidb_live_filepath'}\n";
-#    print STDERR "############ TMP DB: $self->{'oaidb_tmp_filepath'}\n";
+#    print STDERR "############ LIVE DB: $self->{'oaidb_live_filepath'}\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
+#    print STDERR "############ TMP DB: $self->{'oaidb_tmp_filepath'}\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
 
     $self->{'oaidb_file_path'} = $self->{'oaidb_tmp_filepath'}; # db file we're working with
@@ -184 +186 @@
                                  # final param follows jmt's $perform_firsttime_init in inexport.pm
 
-#    print STDERR "@@@@@ oaidb: $self->{'oaidb_file_path'}\n";
+#    print STDERR "@@@@@ oaidb: $self->{'oaidb_file_path'}\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
     
     return $do_pd_step;
@@ -197 +199 @@
     my $self = shift (@_);
     my ($removeold, $have_manifest) = @_;
-    
+    
     my $do_pd_step = $self->init_tmpdb($removeold, $have_manifest);
       # returns 1 if the step to mark oaidb entries as PD is required
@@ -244 +246 @@
                  # see http://perldoc.perl.org/constant.html
 
-    print STDERR "######## OID: $OID - status: $indexing_status\n";
+    print STDERR "######## OID: $OID - status: $indexing_status\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
 
     if($indexing_status eq "I") {
@@ -257 +259 @@
         # an oaicollection. But what if we always maintain an oaidb? Still call $self->index() here.
     } else {
-        print STDERR "### oaiinfo::building_stage_before_indexing(): Unrecognised indexing status $indexing_status\n";
+        if ($self->{'verbosity'} >= $self->{'verbosity_threshold'}) {
+            print STDERR "### oaiinfo::building_stage_before_indexing(): Unrecognised indexing status $indexing_status\n";
+        }
     }
     }
@@ -288 +292 @@
     &dbutil::rename_db_file_to($self->{'infodbtype'}, $oaidb_tmp_filepath, $oaidb_live_filepath); # rename the db file and any assoc files
 
-    print STDERR "#### Should now have MOVED $self->{'oaidb_tmp_filepath'} to $self->{'oaidb_live_filepath'}\n"; 
+    if ($self->{'verbosity'} >= $self->{'verbosity_threshold'}) {
+        print STDERR "#### Should now have MOVED $self->{'oaidb_tmp_filepath'} to $self->{'oaidb_live_filepath'}\n";
+    }
     
     } else {
-    print STDERR "@@@@@ In oaiinfo::activate_collection():\n";
-    print STDERR "@@@@@   No tmpdb at $self->{'oaidb_tmp_filepath'}\n";
-    print STDERR "@@@@@   to make 'live' by moving to $self->{'oaidb_live_filepath'}.\n";
+        if ($self->{'verbosity'} >= $self->{'verbosity_threshold'}) {
+            print STDERR "@@@@@ In oaiinfo::activate_collection():\n";
+            print STDERR "@@@@@   No tmpdb at $self->{'oaidb_tmp_filepath'}\n";
+            print STDERR "@@@@@   to make 'live' by moving to $self->{'oaidb_live_filepath'}.\n";
+        }
     }
 }
@@ -306 +314 @@
     my $self = shift (@_);
     
-    print STDERR "@@@@@ oaiinfo::mark_all_E_as_PD(): Marking the E entries as PD\n";
+    print STDERR "@@@@@ oaiinfo::mark_all_E_as_PD(): Marking the E entries as PD\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
 
     my $infomap = $self->{'info'};
@@ -324 +332 @@
     my $self = shift (@_);
     
-    print STDERR "@@@@@ oaiinfo::mark_all_PD_as_D(): Marking the PD entries as D\n";
+    print STDERR "@@@@@ oaiinfo::mark_all_PD_as_D(): Marking the PD entries as D\n" if $self->{'verbosity'} >= $self->{'verbosity_threshold'};
 
     my $infomap = $self->{'info'};
@@ -343 +351 @@
     my $self = shift (@_);
 
+    if ($self->{'verbosity'} < $self->{'verbosity_threshold'}) {
+        return;
+    }   
+    
     print STDERR "###########################################################\n";
     print STDERR "@@@@@ oaiinfo::print_info(): oaidb in memory contains: \n";