Changeset 18555

Timestamp:

2009-02-20T11:04:15+13:00 (15 years ago)

Author:

davidb

Message:

General tidy up of code for supporting cached files. The generate_cached_images plugin option has been changed to enable_cache as this makes more sense for the other media formats we are begining to support, such as audio and video

Location:

gsdl/trunk/perllib

Files:

• baseconvert.pm (deleted)
• classify/BaseClassifier.pm (modified) (2 diffs)
• convertutil.pm (modified) (5 diffs)
• imageconvert.pm (deleted)
• plugins/BaseMediaConverter.pm (modified) (3 diffs)
• plugins/ImageConverter.pm (modified) (1 diff)
• strings.properties (modified) (1 diff)

gsdl/trunk/perllib/classify/BaseClassifier.pm

@@ -308 +308 @@
     foreach my $existing_oid (@{$self->{$field}}) {
     if ($existing_oid eq $delete_oid) {
-        print $outhandle "  Deleting $delete_oid for ", ref $self, "\n";
+        print $outhandle "  Deleting old $delete_oid for ", ref $self, "\n";
     }
     else {
@@ -324 +324 @@
     my $outhandle = $self->{'outhandle'};
 
-    print $outhandle "  Deleting $delete_oid for ", ref $self, "\n";
+    print $outhandle "  Deleting old $delete_oid for ", ref $self, "\n";
     delete $self->{$field}->{$delete_oid};
 }

gsdl/trunk/perllib/convertutil.pm

@@ -99 +99 @@
     # Default are provided for these monitor functions if none specified
 
+
     my $verbosity = $options->{'verbosity'};
     my $outhandle = $options->{'outhandle'};
@@ -257 +258 @@
     my ($command,$ofilename,$options) = @_;
 
+    my $outhandle = $options->{'outhandle'};
+    my $verbosity = $options->{'verbosity'};
+    my $message_prefix = $options->{'message_prefix'};
+
     my $regenerated = 0;
     my $result = "";
     my $had_error = 0;
+
+    my $args_filename = "$ofilename.args";
 
     if (!-e $ofilename) {
@@ -265 +272 @@
         = regenerate_general_cmd($command,$ofilename,$options);
     }
+    elsif (-M $ofilename > -M $args_filename) {
+    # Source files has been updated/changed in some way
+    # => regenerate
+    print $outhandle "$ofilename modified more recently than cached version\n";
+
+    ($regenerated,$result,$had_error) 
+        = regenerate_general_cmd($command,$ofilename,$options); 
+    }
     else {
     # file exists => check to see if command to generate it has changed
-    my $args_filename = "$ofilename.args";
+
     if (open (ARGSIN,"<$args_filename")) {
         my $prev_command = <ARGSIN>;
@@ -282 +297 @@
         }
         else {
-            my $outhandle = $options->{'outhandle'};
-            my $verbosity = $options->{'verbosity'};
-
-            my $message_prefix = $options->{'message_prefix'};
-
             my ($ofile) = ($ofilename =~ m/^.*(cached.*)$/);
 
@@ -310 +320 @@
     }
     else {
-        my $outhandle = $options->{'outhandle'};
-        my $message_prefix = $options->{'message_prefix'};
-        
         print $outhandle "  $message_prefix: No cached previous args found.  Regenerating $ofilename\n";
 

gsdl/trunk/perllib/plugins/BaseMediaConverter.pm

@@ -40 +40 @@
 
 my $arguments = [
+      { 'name' => "enable_cache",
+    'desc' => "{BaseMediaConverter.enable_cache}",
+    'type' => "flag",
+    'reqd' => "no",
+    }
+
          ];
 
@@ -154 +160 @@
 
 
+sub run_uncached_general_cmd
+{
+    my $self = shift @_;
+
+    my ($command,$ofilename,$print_info) = @_;
+
+    return $self->run_general_cmd($command,$print_info);
+}
+
+
+
 sub run_cached_general_cmd
 {
@@ -183 +200 @@
     my $had_error;
 
-    if ($self->{'cache_generated_images'}) {
+    if ($self->{'enable_cache'}) {
     ($regenerated,$result,$had_error)
         = $self->run_cached_general_cmd($command,$ofilename,$print_info);

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -89 +89 @@
     'deft' => "100",
     'range' => "1,",
-    'reqd' => "no" },
-      { 'name' => "cache_generated_images",
-    'desc' => "{ImageConverter.cache_generated_images}",
-    'type' => "flag",
-    'reqd' => "no",
-    }
+    'reqd' => "no" }
          ];
 

gsdl/trunk/perllib/strings.properties

@@ -905 +905 @@
 HTMLPlugin.old_style_HDL:To mark whether the file in this collection used the old HDL document's tags style. 
 
-ImageConverter.cache_generated_images:Cache thumbnails and screenview images so they don't need to be repeatedly generated.
+BaseMediaConverter.enable_cache:Cache automatically generated files (such as thumbnails and screen-size images) so they don't need to be repeatedly generated.
 
 ImageConverter.converttotype:Convert main image to format 's'.