Changeset 32584 for main/trunk/greenstone2/perllib

Timestamp:

2018-11-08T17:28:00+13:00 (5 years ago)

Author:

ak19

Message:

Some more tidying up of the code.

Location:

main/trunk/greenstone2/perllib

Files:

• gssql.pm (modified) (3 diffs)
• plugins/GreenstoneSQLPlugin.pm (modified) (2 diffs)
• plugouts/GreenstoneSQLPlugout.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/gssql.pm

@@ -366 +366 @@
     # NO: "When all the data has been fetched from a SELECT statement, the driver will automatically call finish for you. So you should not call it explicitly except when you know that you've not fetched all the data from a statement handle and the handle won't be destroyed soon."
     
-    print STDERR "    GSSQL disconnecting from database\n";
+    print STDERR "    GSSQL disconnecting from database\n" if $self->{'verbosity'};
     # Just go through the singleton db handle to disconnect
     $_dbh_instance->disconnect or warn $_dbh_instance->errstr;
@@ -427 +427 @@
     my $tablename = $self->get_metadata_table_name();
     if(!$self->table_exists($tablename)) {
-    #print STDERR "   Creating metadata table $tablename\n" if($self->{'verbosity'} > 1);
     $self->create_metadata_table() || return 0;
     } else {
@@ -442 +441 @@
     my $tablename = $self->get_fulltext_table_name();    
     if(!$self->table_exists($tablename)) {
-    #print STDERR "   Creating fulltxt table $tablename\n" if($self->{'verbosity'} > 1);
     $self->create_fulltext_table() || return 0;
     } else {

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -407 +407 @@
     my %attr_hash = %_; # right way, see OAIPlugin.pm
     $self->{'doc_oid'} = $attr_hash{'docoid'};
-    ##print STDERR "XXXXXXXXXXXXXX in SQLPlugin::xml_start_tag()\n";
     print $outhandle "Extracted OID from docsql.xml: ".$self->{'doc_oid'}."\n"
         if $self->{'verbosity'} > 2;
@@ -448 +447 @@
     
     print STDERR "   GreenstoneSQLPlugin processing doc $oid (reading into docobj from SQL db)\n"
-    if $self->{'verbosity'} > 0;
+    if $self->{'verbosity'};
     
     if($proc_mode eq "all" || $proc_mode eq "meta_only") {

main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

@@ -262 +262 @@
     my ($doc_obj, $doc_dir) = @_;
 
-#    print STDERR "\n\n@@@ In saveas\n\n";
-    
     my $proc_mode = $self->{'process_mode'};