[BACK]Return to metacheck.pl CVS log [TXT] [DIR] Up to [Repository] / foxridge-archiver

Diff for /foxridge-archiver/metacheck.pl between versions 1.3 and 1.4

version 1.3, 2004/07/08 17:30:05 version 1.4, 2005/09/20 17:24:57
Line 14  $|=1; Line 14  $|=1;
 #  #
   
 # program version  # program version
 my $version = "0.5.3 (8.7.2004)";  my $version = "0.6.0 (20.9.2005)";
   my $help = 
   "use: metacheck [options] docdir
   options:
     -debug  show debugging info
     -dry-run  simulate, dont'do anything
     -checkonly  leave existing index file untouched
     -add-files  add file tags for missing files
     -replace  rewrite index file to match current files
   ";
   logger("INFO", "metacheck $version");
   
 # read command line parameters  # read command line parameters
 my $args = MPIWGStor::parseargs;  my $args = MPIWGStor::parseargs;
   if (! scalar(%$args)) {
       print $help, "\n";
       exit 1;
   }
   
 # debug level  # debug level
 $debug = (exists $$args{'debug'}) ? $$args{'debug'} : 0;  $debug = (exists $$args{'debug'}) ? $$args{'debug'} : 0;
   
   # simulate action only
   my $dry_run = (exists $$args{'dry-run'}) ? $$args{'dry-run'} : 0;
   logger('DEBUG', "dry-run: $dry_run");
   
 # check only or fix index file also  # check only or fix index file also
 my $check_only = (exists $$args{'checkonly'}) ? $$args{'checkonly'} : 0;  my $check_only = (exists $$args{'checkonly'}) ? $$args{'checkonly'} : 1;
   
 # add file tags for missing files  # add file tags for missing files
 my $fix_files = ! $check_only;  my $fix_files = ! $check_only;
 # add tags for file size and date  # add tags for file size and date
Line 32  my $fix_fs_meta = 1; Line 51  my $fix_fs_meta = 1;
 my $fix_dirs = ! $check_only;  my $fix_dirs = ! $check_only;
 # rewrite XML file (necessary for fix_files and fix_dirs)  # rewrite XML file (necessary for fix_files and fix_dirs)
 my $fix_xml = ! $check_only;  my $fix_xml = ! $check_only;
   # rewrite complete index file
   my $do_rewrite = 0;
   
   # add file tags for missing files
   if (exists $$args{'add-files'}) {
       $check_only = 0;
       $fix_files = 1;
       $fix_dirs = 1;
       $fix_xml = 1;
       $do_rewrite = 0;
       logger('DEBUG', "add-files: true");
   }
   
   # completely rewrite index file
   if (exists $$args{'replace'}) {
       $check_only = 0;
       $fix_files = 1;
       $fix_dirs = 1;
       $fix_xml = 1;
       $do_rewrite = 1;
       logger('DEBUG', "replace: true");
   }
   logger('DEBUG', "checkonly: $check_only");
   
   
 my $xml_changed = 0;  my $xml_changed = 0;
 # XML namespace (not really implemented!)  # XML namespace (not really implemented!)
 my $namespace = "";  my $namespace = "";
Line 150  sub check_dirs { Line 194  sub check_dirs {
     }      }
     # check with dirs on filesystem       # check with dirs on filesystem 
     my $fn;      my $fn;
     if ($dirpath) {      if ($dirpath && ($dirpath ne '.')) {
         $fn = "$dirpath/$dirname";          $fn = "$dirpath/$dirname";
     } else {      } else {
         $fn = "$dirname";          $fn = "$dirname";
     }      }
         #logger("dir: \"$dirname\", \"$dirpath\"");          #logger('DEBUG', "dir: \"$dirname\", \"$dirpath\", fn: \"$fn\"");
     if ($$fsdirs{$fn}) {      if ($$fsdirs{$fn}) {
         #logger("  OK ($$fsdirs{$fn})");          #logger("  OK ($$fsdirs{$fn})");
         $okdirs{$fn} = $dirname;          $okdirs{$fn} = $dirname;
     } else {      } else {
           if ($do_rewrite) {
           # remove dir tag
           logger("WARNING", "directory $dirname (in $dirpath/) no longer on disk!");
           $dirnode->unbindNode();
           $warncnt++;
           } else {
         logger("ERROR", "directory $dirname (in $dirpath/) missing on disk!");          logger("ERROR", "directory $dirname (in $dirpath/) missing on disk!");
         $errcnt++;          $errcnt++;
     }      }
     }      }
       }
     #logger("dirs: ", (scalar keys %$fsdirs), " vs ", (scalar keys %okdirs), "");      #logger("dirs: ", (scalar keys %$fsdirs), " vs ", (scalar keys %okdirs), "");
     if ((scalar keys %$fsdirs) != (scalar keys %okdirs)) {      if ((scalar keys %$fsdirs) != (scalar keys %okdirs)) {
     # number of dir tags and dirs don't match      # number of dir tags and dirs don't match
Line 171  sub check_dirs { Line 222  sub check_dirs {
     foreach my $f (sort keys %$fsdirs) {      foreach my $f (sort keys %$fsdirs) {
         # was this dir missing?          # was this dir missing?
         if (! $okdirs{$f}) {          if (! $okdirs{$f}) {
         my ($name, $path) = split_file_path($f);          my ($name, $path) = split_file_path($f, 1);
         # name must be valid          # name must be valid
         if (! valid_dir_name($name)) {          if (! valid_dir_name($name)) {
             $path = "." unless ($path);              $path = "." unless ($path);
Line 262  sub check_files { Line 313  sub check_files {
         $xml_changed++;          $xml_changed++;
         }          }
     } else {      } else {
           if ($do_rewrite) {
           # remove file tag
           logger("WARNING", "file $filename (in $filepath/) no longer on disk!");
           $filenode->unbindNode();
           $warncnt++;
           } else {
         logger("ERROR", "file $filename (in $filepath/) missing on disk!");          logger("ERROR", "file $filename (in $filepath/) missing on disk!");
         $errcnt++;          $errcnt++;
     }      }
     }      }
       }
     #logger("files: ", (scalar keys %$fsfiles), " vs ", (scalar keys %okfiles), "");      #logger("files: ", (scalar keys %$fsfiles), " vs ", (scalar keys %okfiles), "");
     if ((scalar keys %$fsfiles) != (scalar keys %okfiles)) {      if ((scalar keys %$fsfiles) != (scalar keys %okfiles)) {
     # number of file tags and files don't match      # number of file tags and files don't match
     # iterate through all files      # iterate through all files
     foreach my $f (sort keys %$fsfiles) {      foreach my $f (sort keys %$fsfiles) {
         my ($name, $path) = split_file_path($f);          my ($name, $path) = split_file_path($f, 1);
         # was this file missing?          # was this file missing?
         if (! $okfiles{$f}) {          if (! $okfiles{$f}) {
         # is an ignoreable file?          # is an ignoreable file?
Line 390  sub check_resource_meta { Line 448  sub check_resource_meta {
 # main  # main
 #  #
   
 logger("INFO", "metacheck $version");  
       
 my ($document, $rootnode) = read_xml($metafile);  my ($document, $rootnode) = read_xml($metafile);
   
 check_resource_meta($rootnode);  check_resource_meta($rootnode);
   
 my $fnum = fs_read_files($docdir, "", \%files, \%dirs);  my $fnum = fs_read_files($docdir, "", \%files, \%dirs);
 logger("INFO", "$fnum files on FS");  logger("INFO", "$fnum files on FS");
 #foreach (keys %files) {logger("  file ($_): $files{$_}");}  #foreach (keys %dirs) {logger('DEBUG', "  dir ($_): $dirs{$_}");}
   
 check_files($rootnode, \%files);  check_files($rootnode, \%files);
 check_dirs($rootnode, \%dirs);  check_dirs($rootnode, \%dirs);
Line 406  check_dirs($rootnode, \%dirs); Line 462  check_dirs($rootnode, \%dirs);
 logger("INFO", "$warncnt warnings");  logger("INFO", "$warncnt warnings");
 logger("INFO", "$errcnt errors");  logger("INFO", "$errcnt errors");
 if ($errcnt > 0) {  if ($errcnt > 0) {
     logger("ABORT", "there were errors!");      logger("ABORT", "there were $errcnt errors!");
     exit 1;      exit 1;
 } else {  } else {
     if ($fix_xml) {      if ($fix_xml) {
       if ($dry_run) {
           logger('INFO', "would write $metafile");
           logger('DEBUG', $document->toString(1));
       } else {
     write_xml($document, $metafile);      write_xml($document, $metafile);
     }      }
       }
     logger("DONE", "index file checked successfully!");      logger("DONE", "index file checked successfully!");
 }  }
Removed from v.1.3  
changed lines
  Added in v.1.4

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