Diff for /loncom/build/filecompare.pl between versions 1.5 and 1.10

version 1.5, 2001/11/16 21:12:46 version 1.10, 2001/12/06 23:14:33
Line 1 Line 1
 #!/usr/bin/perl  #!/usr/bin/perl
   
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  
 # filecompare.pl - script used to help probe and compare file statistics  # filecompare.pl - script used to help probe and compare file statistics
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # YEAR=2001  # YEAR=2001
 # 9/27, 10/24, 10/25, 11/4 Scott Harrison  # 9/27, 10/24, 10/25, 11/4 Scott Harrison
 # 11/14 Guy Albertelli  # 11/14 Guy Albertelli
 # 11/16 Scott Harrison  # 11/16,11/17 Scott Harrison
   # 12/3,12/5 Scott Harrison
 #  #
 # $Id$  
 ###  ###
   
 ###############################################################################  ###############################################################################
Line 34  my $invocation=<<END; Line 57  my $invocation=<<END;
 filecompare.pl [ options ... ] [FILE1] [FILE2] [ restrictions ... ]  filecompare.pl [ options ... ] [FILE1] [FILE2] [ restrictions ... ]
 or  or
 filecompare.pl [ options ... ] [DIR1] [DIR2] [ restrictions ... ]  filecompare.pl [ options ... ] [DIR1] [DIR2] [ restrictions ... ]
   or
   filecompare.pl [ options ... ] -s TARGET=[target] SOURCE=[source] MODE=[mode]
       LOC1 LOC2
   
 Restrictions: a list of space separated values (after the file/dir names)  Restrictions: a list of space separated values (after the file/dir names)
 can restrict the comparison.  can restrict the comparison.
Line 47  Options (before file/dir names): Line 73  Options (before file/dir names):
 -q only show file names (based on first file/dir)  -q only show file names (based on first file/dir)
 -v verbose mode (default)  -v verbose mode (default)
 -bN buildmode (controls exit code of this script; 0 unless...)  -bN buildmode (controls exit code of this script; 0 unless...)
    N=1: md5sum=same --> 2; cvstime<0 --> 1     N=1: md5sum=same --> 1; cvstime<0 --> 2
    N=2: same as N=1 except without md5sum     N=2: same as N=1 except without md5sum
    N=3: md5sum=same --> 1; age<0 --> 2     N=3: md5sum=same --> 1; age<0 --> 2
    N=4: cvstime>0 --> 2     N=4: cvstime>0 --> 2
   
   The third way to pass arguments is set by the -s flag.
   filecompare.pl -s SOURCE=[source] TARGET=[target] MODE=[mode] LOC1 LOC2
   
   TARGET corresponds to the root path of LOC2.  SOURCE corresponds to
   the root path of LOC1.  MODE can either be file, directory, link, or fileglob.
   
 END  END
 unless (@ARGV) {  unless (@ARGV) {
     print $invocation;      print $invocation;
Line 64  unless (@ARGV) { Line 97  unless (@ARGV) {
 #  #
 # Ways of comparison:  # Ways of comparison:
 #   existence similarity  #   existence similarity
 #   cvs time similarity (first argument treated as CVS source)  #   cvs time similarity (1st arg treated as CVS source; only for buildmode)
 #   age similarity (modification time)  #   age similarity (modification time)
 #   md5sum similarity  #   md5sum similarity
 #   size similarity (bytes)  #   size similarity (bytes)
Line 92  unless (@ARGV) { Line 125  unless (@ARGV) {
 # -q only show file names (based on first file/dir)  # -q only show file names (based on first file/dir)
 # -v verbose mode (default)  # -v verbose mode (default)
 # -bN build/install mode (returns exitcode)  # -bN build/install mode (returns exitcode)
   # -s status checking mode for lpml
   
 my $verbose='1';  my $verbose='1';
 my $show='all';  my $show='all';
 my $buildmode=0;  my $buildmode=0;
 while (@ARGV) {  my $statusmode=0;
   ALOOP: while (@ARGV) {
     my $flag;      my $flag;
     if ($ARGV[0]=~/^\-(\w)/) {      if ($ARGV[0]=~/^\-(\w)/) {
  $flag=$1;   $flag=$1;
  if ($flag eq 'b') {   if ($flag eq 'b') {
     $ARGV[0]=~/^\-\w(\d)/;      $ARGV[0]=~/^\-\w(\d)/;
     $buildmode=$1;      $buildmode=$1;
       shift @ARGV;
       next ALOOP;
  }   }
  shift @ARGV;   shift @ARGV;
       SWITCH: {        SWITCH: {
Line 110  while (@ARGV) { Line 148  while (@ARGV) {
   $show='same', last SWITCH if $flag eq 'p';    $show='same', last SWITCH if $flag eq 'p';
   $show='different', last SWITCH if $flag eq 'n';    $show='different', last SWITCH if $flag eq 'n';
   $show='all', last SWITCH if $flag eq 'a';    $show='all', last SWITCH if $flag eq 'a';
     $statusmode=1, last SWITCH if $flag eq 's';
   print($invocation), exit(1);    print($invocation), exit(1);
       }        }
     }      }
Line 120  while (@ARGV) { Line 159  while (@ARGV) {
 dowarn('Verbose: '.$verbose."\n");  dowarn('Verbose: '.$verbose."\n");
 dowarn('Show: '.$show."\n");  dowarn('Show: '.$show."\n");
   
   my @files;
   my $loc1;
   my $loc2;
   my $dirmode='directories';
   # ----------------------------------------- If status checking mode for lpml
   my ($sourceroot,$targetroot,$mode,$sourceglob,$targetglob);
   my ($source,$target);
   if ($statusmode==1) {
       ($sourceroot,$targetroot,$mode,$sourceglob,$targetglob)=splice(@ARGV,0,5);
       $targetroot.='/' if $targetroot!~/\/$/;
       $sourceroot=~s/^SOURCE\=//;
       $targetroot=~s/^TARGET\=//;
       $source=$sourceroot.'/'.$sourceglob;
       $target=$targetroot.''.$targetglob;
   #    print "SOURCE: $source\n";
   #    print "TARGET: $target\n";
       if ($mode eq 'MODE=fileglob') {
    $loc1=$source;$loc1=~s/\/[^\/]*$// if length($loc1)>2;
    $loc2=$target;$loc2=~s/\/[^\/]*$// if length($loc2)>2;
    @files=map {s/^$loc1\///;$_} glob($source);
    $dirmode='directories';
       }
       elsif ($mode eq 'MODE=file') {
    $loc1=$source;
    $loc2=$target;
    $dirmode='files';
    @files=($loc1);
       }
   }
   else {
   
 # ----------------------------------------- Process file/dir location arguments  # ----------------------------------------- Process file/dir location arguments
 # FILE1 FILE2 or DIR1 DIR2  # FILE1 FILE2 or DIR1 DIR2
 my $loc1=shift @ARGV;  $loc1=shift @ARGV;
 my $loc2=shift @ARGV;  $loc2=shift @ARGV;
 my $dirmode='directories';  
 my @files;  
 unless ($loc1 and $loc2) {  unless ($loc1 and $loc2) {
       print "LOC1: $loc1\nLOC2: $loc2\n";
     print($invocation), exit(1);      print($invocation), exit(1);
 }  }
 if (-f $loc1) {  if (-f $loc1) {
Line 145  else { Line 214  else {
 dowarn('Processing for mode: '.$dirmode."\n");  dowarn('Processing for mode: '.$dirmode."\n");
 dowarn('Location #1: '.$loc1."\n");  dowarn('Location #1: '.$loc1."\n");
 dowarn('Location #2: '.$loc2."\n");  dowarn('Location #2: '.$loc2."\n");
   }
 # --------------------------------------------- Process comparison restrictions  # --------------------------------------------- Process comparison restrictions
 # A list of space separated values (after the file/dir names)  # A list of space separated values (after the file/dir names)
 # can restrict the comparison.  # can restrict the comparison.
Line 230  FLOOP: foreach my $file (@files) { Line 299  FLOOP: foreach my $file (@files) {
         $diffs='n/a';          $diffs='n/a';
     }      }
     else {      else {
         my ($cvstime1,$cvstime2)=&{$MEASURE{'cvstime'}}($file1,$file2);   if ($buildmode) {
         $cvstime=$cvstime1-$cvstime2;      my ($cvstime1,$cvstime2)=&{$MEASURE{'cvstime'}}($file1,$file2);
       $cvstime=$cvstime1-$cvstime2;
    }
    else {
       $cvstime='n/a';
    }
         my ($age1,$age2)=&{$MEASURE{'age'}}($file1,$file2);          my ($age1,$age2)=&{$MEASURE{'age'}}($file1,$file2);
         $age=$age1-$age2;          $age=$age1-$age2;
         my ($md5sum1,$md5sum2)=&{$MEASURE{'md5sum'}}($file1,$file2);          my ($md5sum1,$md5sum2)=&{$MEASURE{'md5sum'}}($file1,$file2);
Line 239  FLOOP: foreach my $file (@files) { Line 313  FLOOP: foreach my $file (@files) {
             $md5sum='same';              $md5sum='same';
             $size=0;              $size=0;
             $lines=0;              $lines=0;
             $diffs=0;              $diffs='0:0';
  }   }
         elsif ($md5sum1 ne $md5sum2) {          elsif ($md5sum1 ne $md5sum2) {
             $md5sum='different';              $md5sum='different';
Line 271  FLOOP: foreach my $file (@files) { Line 345  FLOOP: foreach my $file (@files) {
     $showflag=1;      $showflag=1;
  }   }
     }      }
     elsif ($key eq 'cvstime') {      elsif ($key eq 'cvstime' and $buildmode) {
  if ($cvstime!=0) {   if ($cvstime!=0) {
     $showflag=1;      $showflag=1;
  }   }
Line 307  FLOOP: foreach my $file (@files) { Line 381  FLOOP: foreach my $file (@files) {
     @ks=('existence','md5sum','cvstime','age','size','lines','diffs');      @ks=('existence','md5sum','cvstime','age','size','lines','diffs');
  }   }
         my $showcount=length(@ks);          my $showcount=length(@ks);
    $showcount-- unless $buildmode;
         FLOOP3: for my $key (@ks) {          FLOOP3: for my $key (@ks) {
     if ($key eq 'existence') {      if ($key eq 'existence') {
  if ($existence ne 'yes:yes') {   if ($existence ne 'yes:yes') {
Line 318  FLOOP: foreach my $file (@files) { Line 393  FLOOP: foreach my $file (@files) {
     $showcount--;      $showcount--;
  }   }
     }      }
     elsif ($key eq 'cvstime') {      elsif ($key eq 'cvstime' and $buildmode) {
  if ($cvstime!=0) {   if ($cvstime!=0) {
     $showcount--;      $showcount--;
  }   }
Line 379  FLOOP: foreach my $file (@files) { Line 454  FLOOP: foreach my $file (@files) {
  }   }
     }      }
     elsif ($buildmode==4) {      elsif ($buildmode==4) {
         if ($cvstime>0) {   if ($existence=~/no$/) {
       exit(3);
    }
           elsif ($cvstime>0) {
     exit(2);      exit(2);
  }   }
    elsif ($existence=~/^no/) {
       exit(1);
    }
         else {          else {
     exit(0);      exit(0);
  }   }
     }      }
     print "$file";      if ($showflag) {
     if ($verbose==1) {   print "$file";
         print "\t";   if ($verbose==1) {
  print &{$OUTPUT{'existence'}}($existence);      print "\t";
         print "\t";      print &{$OUTPUT{'existence'}}($existence);
  print &{$OUTPUT{'cvstime'}}($cvstime);      print "\t";
         print "\t";      print &{$OUTPUT{'cvstime'}}($cvstime);
  print &{$OUTPUT{'age'}}($age);      print "\t";
         print "\t";      print &{$OUTPUT{'age'}}($age);
  print &{$OUTPUT{'md5sum'}}($md5sum);      print "\t";
  print "\t";      print &{$OUTPUT{'md5sum'}}($md5sum);
  print &{$OUTPUT{'size'}}($size);      print "\t";
         print "\t";      print &{$OUTPUT{'size'}}($size);
  print &{$OUTPUT{'lines'}}($lines);      print "\t";
         print "\t";      print &{$OUTPUT{'lines'}}($lines);
  print &{$OUTPUT{'diffs'}}($diffs);      print "\t";
       print &{$OUTPUT{'diffs'}}($diffs);
    }
    print "\n";
     }      }
     print "\n";  
 }  }
   
 # ----------------------------------------------------------------- Subroutines  # ----------------------------------------------------------------- Subroutines

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


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