Diff for /foxridge-archiver/archivecheck.pl between versions 1.5 and 1.8

version 1.5, 2005/12/07 17:31:04 version 1.8, 2017/03/16 17:00:43
Line 1 Line 1
 #!/usr/local/bin/perl -w  #!/usr/bin/perl -w
   
 use strict;  use strict;
   
Line 16  $|=1; Line 16  $|=1;
 #  #
   
 # program version  # program version
 my $version = "0.4.2 (7.12.2005 ROC)";  my $version = "0.4.5 (13.7.2009 ROC)";
   
 # read command line parameters  # read command line parameters
 my $args = parseargs;  my $args = parseargs;
Line 205  sub run_query { Line 205  sub run_query {
     $archcmd .= " -description='$archname'";      $archcmd .= " -description='$archname'";
     $archcmd .= " '$dirquery'";      $archcmd .= " '$dirquery'";
   
       logger('INFO', "querying TSM server for $dirquery, please wait...");
     my $archcnt = 0;      my $archcnt = 0;
     print LOG "CMD: $archcmd\n";      print LOG "CMD: $archcmd\n";
     if (open ARCH, "$archcmd 2>&1 |") {      if (open ARCH, "$archcmd 2>&1 |") {
Line 342  sub compare_files { Line 343  sub compare_files {
 logger("INFO", "archivecheck $version");  logger("INFO", "archivecheck $version");
   
 # make shure the right user is running this program  # make shure the right user is running this program
 my $user = getlogin;  my $user = getlogin || getpwuid($<) ;
 if (not (($user eq "archive")||($user eq "root"))) {  if (not (($user eq "archive")||($user eq "root"))) {
     logger("ABORT", "you must be archive or root user to run this program!");      logger("ABORT", "you must be archive or root user to run this program!");
     exit 1;      exit 1;
Line 367  my %archived_files = (); Line 368  my %archived_files = ();
 my $archcnt = 0;  my $archcnt = 0;
 if ($docdir =~ /\/mpiwg\/archive\/data\/(.*)/) {  if ($docdir =~ /\/mpiwg\/archive\/data\/(.*)/) {
     # TSM needs two different paths because of historical mount points :-(      # TSM needs two different paths because of historical mount points :-(
     my $docdir1 = "/mpiwg/archive/data/";      # ...doesn't work anymore since old filespace was renamed (13.7.2009)
     $archcnt += run_query($docdir1, \%archived_files);  #    my $docdir1 = "/mpiwg/archivedataold/";
   #    $archcnt += run_query($docdir1, \%archived_files);
     my $docdir2 = "/mpiwg/archive/";      my $docdir2 = "/mpiwg/archive/";
     $archcnt += run_query($docdir2, \%archived_files);      $archcnt += run_query($docdir2, \%archived_files);
 } else {  } else {

Removed from v.1.5  
changed lines
  Added in v.1.8


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>