Changeset 32584

Show
Ignore:
Timestamp:
08.11.2018 17:28:00 (12 days ago)
Author:
ak19
Message:

Some more tidying up of the code.

Location:
main/trunk/greenstone2/perllib
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/gssql.pm

    r32583 r32584  
    366366    # 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." 
    367367     
    368     print STDERR "    GSSQL disconnecting from database\n"; 
     368    print STDERR "    GSSQL disconnecting from database\n" if $self->{'verbosity'}; 
    369369    # Just go through the singleton db handle to disconnect 
    370370    $_dbh_instance->disconnect or warn $_dbh_instance->errstr; 
     
    427427    my $tablename = $self->get_metadata_table_name(); 
    428428    if(!$self->table_exists($tablename)) { 
    429     #print STDERR "   Creating metadata table $tablename\n" if($self->{'verbosity'} > 1); 
    430429    $self->create_metadata_table() || return 0; 
    431430    } else { 
     
    442441    my $tablename = $self->get_fulltext_table_name();     
    443442    if(!$self->table_exists($tablename)) { 
    444     #print STDERR "   Creating fulltxt table $tablename\n" if($self->{'verbosity'} > 1); 
    445443    $self->create_fulltext_table() || return 0; 
    446444    } else { 
  • main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

    r32583 r32584  
    407407    my %attr_hash = %_; # right way, see OAIPlugin.pm 
    408408    $self->{'doc_oid'} = $attr_hash{'docoid'}; 
    409     ##print STDERR "XXXXXXXXXXXXXX in SQLPlugin::xml_start_tag()\n"; 
    410409    print $outhandle "Extracted OID from docsql.xml: ".$self->{'doc_oid'}."\n" 
    411410        if $self->{'verbosity'} > 2; 
     
    448447     
    449448    print STDERR "   GreenstoneSQLPlugin processing doc $oid (reading into docobj from SQL db)\n" 
    450     if $self->{'verbosity'} > 0; 
     449    if $self->{'verbosity'}; 
    451450     
    452451    if($proc_mode eq "all" || $proc_mode eq "meta_only") { 
  • main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

    r32583 r32584  
    262262    my ($doc_obj, $doc_dir) = @_; 
    263263 
    264 #    print STDERR "\n\n@@@ In saveas\n\n"; 
    265      
    266264    my $proc_mode = $self->{'process_mode'}; 
    267265