--- loncom/build/filecompare.pl	2001/11/17 23:00:10	1.8
+++ loncom/build/filecompare.pl	2001/12/06 00:23:16	1.9
@@ -8,8 +8,9 @@
 # 9/27, 10/24, 10/25, 11/4 Scott Harrison
 # 11/14 Guy Albertelli
 # 11/16,11/17 Scott Harrison
+# 12/3,12/5 Scott Harrison
 #
-# $Id: filecompare.pl,v 1.8 2001/11/17 23:00:10 harris41 Exp $
+# $Id: filecompare.pl,v 1.9 2001/12/06 00:23:16 harris41 Exp $
 ###
 
 ###############################################################################
@@ -34,6 +35,9 @@ my $invocation=<<END;
 filecompare.pl [ options ... ] [FILE1] [FILE2] [ restrictions ... ]
 or
 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)
 can restrict the comparison.
@@ -51,6 +55,13 @@ Options (before file/dir names):
    N=2: same as N=1 except without md5sum
    N=3: md5sum=same --> 1; age<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
 unless (@ARGV) {
     print $invocation;
@@ -92,9 +103,12 @@ unless (@ARGV) {
 # -q only show file names (based on first file/dir)
 # -v verbose mode (default)
 # -bN build/install mode (returns exitcode)
+# -s status checking mode for lpml
+
 my $verbose='1';
 my $show='all';
 my $buildmode=0;
+my $statusmode=0;
 ALOOP: while (@ARGV) {
     my $flag;
     if ($ARGV[0]=~/^\-(\w)/) {
@@ -112,6 +126,7 @@ ALOOP: while (@ARGV) {
 	  $show='same', last SWITCH if $flag eq 'p';
 	  $show='different', last SWITCH if $flag eq 'n';
 	  $show='all', last SWITCH if $flag eq 'a';
+	  $statusmode=1, last SWITCH if $flag eq 's';
 	  print($invocation), exit(1);
       }
     }
@@ -122,13 +137,34 @@ ALOOP: while (@ARGV) {
 dowarn('Verbose: '.$verbose."\n");
 dowarn('Show: '.$show."\n");
 
+my @files;
+my $loc1;
+my $loc2;
+# ----------------------------------------- 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') {
+	@files=glob($source);
+    }
+}
+else {
+
 # ----------------------------------------- Process file/dir location arguments
 # FILE1 FILE2 or DIR1 DIR2
-my $loc1=shift @ARGV;
-my $loc2=shift @ARGV;
+$loc1=shift @ARGV;
+$loc2=shift @ARGV;
 my $dirmode='directories';
-my @files;
 unless ($loc1 and $loc2) {
+    print "LOC1: $loc1\nLOC2: $loc2\n";
     print($invocation), exit(1);
 }
 if (-f $loc1) {
@@ -147,7 +183,7 @@ else {
 dowarn('Processing for mode: '.$dirmode."\n");
 dowarn('Location #1: '.$loc1."\n");
 dowarn('Location #2: '.$loc2."\n");
-
+}
 # --------------------------------------------- Process comparison restrictions
 # A list of space separated values (after the file/dir names)
 # can restrict the comparison.