fix

[BackupPC.git] / bin / BackupPC_ASA_SearchUpdate

diff --git a/bin/BackupPC_ASA_SearchUpdate b/bin/BackupPC_ASA_SearchUpdate
index 5cff61f..034642f 100755 (executable)
--- a/bin/BackupPC_ASA_SearchUpdate
+++ b/bin/BackupPC_ASA_SearchUpdate
@@ -7,7 +7,7 @@ use DBI;
 use BackupPC::Lib;
 use BackupPC::View;
 use Data::Dumper;
 use BackupPC::Lib;
 use BackupPC::View;
 use Data::Dumper;

-use Getopt::Std;
+use Getopt::Long::Descriptive;

 use Time::HiRes qw/time/;
 use File::Pid;
 use POSIX qw/strftime/;
 use Time::HiRes qw/time/;
 use File::Pid;
 use POSIX qw/strftime/;


@@ -57,42 +57,40 @@ my $index_node_url = $Conf{HyperEstraierIndex};
 
 my $dbh = DBI->connect($dsn, $user, "", { RaiseError => 1, AutoCommit => 0 });
 
 
 my $dbh = DBI->connect($dsn, $user, "", { RaiseError => 1, AutoCommit => 0 });
 

-my %opt;
+my ($opt,$usage) = describe_options(
+"%c %o",
+[ 'create|c',  "create database on first use" ],
+[ 'delete|d',  "delete database before import" ],
+[ 'max|m=i',   "import just max increments for one host" ],
+[ 'host|h=s@', "import just host(s)" ],
+[],
+[ 'verbose|v:i', 'set verbosity (debug) level' ],
+[ 'index|i',   'update full text index' ],
+[ 'junk|j',    "update full text, don't check existing files" ],
+[ 'fast|f',    "don't do anything with full text index" ],
+[ 'quiet|q',   "be quiet for hosts without changes" ],
+[ 'help',      "show help" ],
+);
+
+print($usage->text), exit if $opt->help;
+
+warn "hosts: ",dump( $opt->host );

 
 

-if ( !getopts("cdm:v:ijfq", \%opt ) ) {
-       print STDERR <<EOF;
-usage: $0 [-c|-d] [-m num] [-v|-v level] [-i|-j|-f]
-
-Options:
-       -c      create database on first use
-       -d      delete database before import
-       -m num  import just num increments for one host
-       -v num  set verbosity (debug) level (default $debug)
-       -i      update Hyper Estraier full text index
-       -j      update full text, don't check existing files
-       -f      don't do anything with full text index
-       -q      be quiet for hosts without changes
-
-Option -j is variation on -i. It will allow faster initial creation
-of full-text index from existing database.
-
-Option -f will create database which is out of sync with full text index. You
-will have to re-run $0 with -i to fix it.
-
-EOF
-       exit 1;
-}
+#---- subs ----

 
 

-if ($opt{v}) {
-       print "Debug level at $opt{v}\n";
-       $debug = $opt{v};
-} elsif ($opt{f}) {
-       print "WARNING: disabling full-text index update. You need to re-run $0 -j !\n";
-       $index_node_url = undef;
+sub status {
+       my $text = shift;
+       $text =~ s{\s+$}{};
+       my $new = $0;
+       $new =~ s{^[\w\/]+/(\w+) }{$1 }; # strip path from process name
+       if ( $text =~ m/^\|/ ) {
+               $new =~ s/\|.*/$text/ or $new .= " $text";
+       } else {
+               $new =~ s/\s+.*/ $text/ or $new .= " $text";
+       }
+       $0 = $new;

 }
 
 }
 

-#---- subs ----
-

 sub fmt_time {
        my $t = shift || return;
        my $out = "";
 sub fmt_time {
        my $t = shift || return;
        my $out = "";


@@ -110,7 +108,7 @@ sub hest_update {
 
        my ($host_id, $share_id, $num) = @_;
 
 
        my ($host_id, $share_id, $num) = @_;
 

-       my $skip_check = $opt{j} && print STDERR "Skipping check for existing files -- this should be used only with initital import\n";
+       my $skip_check = $opt->junk && print STDERR "Skipping check for existing files -- this should be used only with initital import\n";

 
        print curr_time," updating fulltext:";
 
 
        print curr_time," updating fulltext:";
 


@@ -185,6 +183,7 @@ sub hest_update {
                }
 
                print "$added";
                }
 
                print "$added";

+               status "| $added";

 
                $offset += EST_CHUNK;
 
 
                $offset += EST_CHUNK;
 


@@ -203,17 +202,17 @@ sub hest_update {
 
 
 ## update index ##
 
 
 ## update index ##

-if ( ( $opt{i} || $opt{j} ) && !$opt{c} ) {
+if ( ( $opt->index || $opt->junk ) && !$opt->create ) {

        # update all
        print "force update of Hyper Estraier index ";
        # update all
        print "force update of Hyper Estraier index ";

-       print "by -i flag" if ($opt{i});
-       print "by -j flag" if ($opt{j});
+       print "by -i flag" if ($opt->index);
+       print "by -j flag" if ($opt->junk);

        print "\n";
        hest_update();
 }
 
 ## create tables ##
        print "\n";
        hest_update();
 }
 
 ## create tables ##

-if ($opt{c}) {
+if ($opt->create) {

        sub do_index {
                my $index = shift || return;
                my ($table,$col,$unique) = split(/:/, $index);
        sub do_index {
                my $index = shift || return;
                my ($table,$col,$unique) = split(/:/, $index);


@@ -358,6 +357,8 @@ if ($opt{c}) {
                $dbh->do( qq{ CREATE SEQUENCE $seq } );
        }
 
                $dbh->do( qq{ CREATE SEQUENCE $seq } );
        }
 

+=for later
+

        print " creating triggers ";
        $dbh->do( <<__END_OF_TRIGGER__ );
 
        print " creating triggers ";
        $dbh->do( <<__END_OF_TRIGGER__ );
 


@@ -419,6 +420,8 @@ create trigger do_backup_backup_parts_check
 
 __END_OF_TRIGGER__
 
 
 __END_OF_TRIGGER__
 

+=cut
+

        print "...\n";
 
        $dbh->commit;
        print "...\n";
 
        $dbh->commit;


@@ -426,7 +429,7 @@ __END_OF_TRIGGER__
 }
 
 ## delete data before inseting ##
 }
 
 ## delete data before inseting ##

-if ($opt{d}) {
+if ($opt->delete) {

        print "deleting ";
        foreach my $table (qw(files dvds backups shares hosts)) {
                print "$table ";
        print "deleting ";
        foreach my $table (qw(files dvds backups shares hosts)) {
                print "$table ";


@@ -451,7 +454,7 @@ INSERT INTO hosts (name, IP) VALUES (?,?)
 });
 
 $sth->{hosts_by_name} = $dbh->prepare(qq{
 });
 
 $sth->{hosts_by_name} = $dbh->prepare(qq{

-SELECT ID FROM hosts WHERE name=?
+SELECT id FROM hosts WHERE name=?

 });
 
 $sth->{backups_count} = $dbh->prepare(qq{
 });
 
 $sth->{backups_count} = $dbh->prepare(qq{


@@ -483,7 +486,9 @@ foreach my $host_key (@hosts) {
 
        my $hostname = $hosts->{$host_key}->{'host'} || die "can't find host for $host_key";
 
 
        my $hostname = $hosts->{$host_key}->{'host'} || die "can't find host for $host_key";
 

-       $sth->{hosts_by_name}->execute($hosts->{$host_key}->{'host'});
+       next if $opt->host && ! grep { m/^$hostname$/ } @{ $opt->host };
+
+       $sth->{hosts_by_name}->execute($hostname);

 
        unless (($hostID) = $sth->{hosts_by_name}->fetchrow_array()) {
                $sth->{insert_hosts}->execute(
 
        unless (($hostID) = $sth->{hosts_by_name}->fetchrow_array()) {
                $sth->{insert_hosts}->execute(


@@ -505,7 +510,7 @@ foreach my $host_key (@hosts) {
                ($#hosts + 1),
                $incs
        );
                ($#hosts + 1),
                $incs
        );

-       print $host_header unless ($opt{q});
+       print $host_header unless $opt->quiet;

  
        my $inc_nr = 0;
        $beenThere = {};
  
        my $inc_nr = 0;
        $beenThere = {};


@@ -513,7 +518,7 @@ foreach my $host_key (@hosts) {
        foreach my $backup (@backups) {
 
                $inc_nr++;
        foreach my $backup (@backups) {
 
                $inc_nr++;

-               last if (defined $opt{m} && $inc_nr > $opt{m});
+               last if defined $opt->max && $inc_nr > $opt->max;

 
                my $backupNum = $backup->{'num'};
                my @backupShares = ();
 
                my $backupNum = $backup->{'num'};
                my @backupShares = ();


@@ -526,9 +531,10 @@ foreach my $host_key (@hosts) {
                        strftime($t_fmt,localtime($backup->{startTime})),
                        fmt_time($backup->{endTime} - $backup->{startTime})
                );
                        strftime($t_fmt,localtime($backup->{startTime})),
                        fmt_time($backup->{endTime} - $backup->{startTime})
                );

-               print $share_header unless ($opt{q});
+               print $share_header unless $opt->quiet;
+               status "$hostname $backupNum $share_header";

 
 

-               my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_first => 1 });
+               my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_increment => 1 });

 
                foreach my $share ($files->shareList($backupNum)) {
 
 
                foreach my $share ($files->shareList($backupNum)) {
 


@@ -542,7 +548,7 @@ foreach my $host_key (@hosts) {
                        next if ($count > 0);
 
                        # dump host and share header for -q
                        next if ($count > 0);
 
                        # dump host and share header for -q

-                       if ($opt{q}) {
+                       if ( $opt->quiet ) {

                                if ($host_header) {
                                        print $host_header;
                                        $host_header = undef;
                                if ($host_header) {
                                        print $host_header;
                                        $host_header = undef;


@@ -581,14 +587,17 @@ foreach my $host_key (@hosts) {
                        }
 
                        my $dur = (time() - $t) || 1;
                        }
 
                        my $dur = (time() - $t) || 1;

-                       printf(" %d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]\n",
+                       my $status = sprintf("%d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]",

                                $nf, $f, $nd, $d,
                                ($size / 1024 / 1024),
                                ( ($f+$d) / $dur ),
                                fmt_time($dur)
                        );
                                $nf, $f, $nd, $d,
                                ($size / 1024 / 1024),
                                ( ($f+$d) / $dur ),
                                fmt_time($dur)
                        );

+                       print " $status\n";
+                       status "$hostname $backupNum $status";

 
                        if ($nf + $nd > 0) {
 
                        if ($nf + $nd > 0) {

+                               status "$hostname $backupNum full-text | indexing";

                                eval { hest_update($hostID, $shareID, $backupNum) };
                                warn "ERROR: $@" if $@;
                        }
                                eval { hest_update($hostID, $shareID, $backupNum) };
                                warn "ERROR: $@" if $@;
                        }