Changeset 9475

Timestamp:

Oct 10, 2006, 2:12:25 PM (20 years ago)

Author:

jhoblitt

Message:

rollback cache support (supposed to be on branch)

File:

• trunk/ippScripts/scripts/phase0_imfile.pl (modified) (4 diffs)

trunk/ippScripts/scripts/phase0_imfile.pl

@@ -11 +11 @@
 use PS::IPP::Metadata::Stats;
 use Data::Dumper;
-use Cache::File;
 
 use PS::IPP::Config;
@@ -20 +19 @@
 use Pod::Usage qw( pod2usage );
 
-my ($cache, $exp_tag, $class_id, $uri, $no_update);
+my ($exp_tag, $class_id, $uri, $no_update);
 
 GetOptions(
-    'caches'        => \$cache,
-    'exp_tag|e=s'   => \$exp_tag,
+    'exp_tag|e=s'    => \$exp_tag,
     'class_id|i=s'  => \$class_id,
     'uri|u=s'       => \$uri,
@@ -76 +74 @@
 die "Can't find required tools.\n" if $missing_tools;
 
-# setup cache interface
-
-my $c = Cache::File->new(
-    cache_root => File::Spec->catdir($ENV{'HOME'}, '.pxcache'),
-    default_expires => '7200 sec',
-);
-
 # Resolve the input URI
 $uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
@@ -90 +81 @@
 {
     my $command = "$ppStats $uri -recipe PPSTATS " . RECIPE; # Command to run ppStats
-
-    ### cache hook
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf );
-    my $cmd_output = $c->get($command) if $cache;
-    if (defined $cmd_output) {
-        ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
-            = @{$cmd_output};
-    } else {
-        my @output = run(command => $command, verbose => 1);
-        $c->set($command, \@output) if $cache;
-        ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
-            = @output;
-    }
-    ### end cache hook
-
-    die "Unable to perform ppStats on exposure id $exp_tag: $error_code\n"
-        if not $success;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    die "Unable to perform ppStats on exposure id $exp_tag: $error_code\n" if not $success;
     
     # Parse the output