Changeset 26597

Timestamp:

2013-01-08T19:34:57+13:00 (10 years ago)

Author:

davidb

Message:

The name of the collection and the last frame number are now written out to the frame.inf file. Previously, the full file path of the last frame was being written out as the last frame name.

Location:

gs3-extensions/html-to-expeditee/trunk/src/perllib

Files:

• ExpediteeFrameIO.pm (modified) (3 diffs)
• cgiactions/HtmlToExpediteeAction.pm (modified) (1 diff)

gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

@@ -608 +608 @@
 {
     my $self = shift @_;
-    my ($last_frame_number) = @_;
+    my ($last_frame_number,$collect) = @_;
 
     my $filename = &util::filename_cat($self->{'output_dir'},"frame.inf");
@@ -618 +618 @@
 
     #writes frameset name concatenated with last frame number in the set to the frame.inf file. 
-        my $getFramesetName = $self->{'output_dir'};
-        
+     #   my $getFramesetName = $self->{'output_dir'};
+    
+    #use collection name rather than the directory name where the frameset is stored, when saving the last frame name/number to the frame.inf file.
+    print FNOUT "$collect"."$last_frame_number";
     
     close(FNOUT);
@@ -626 +628 @@
     else {
     print STDERR "ExpediteeFrameIO::saveLastFrameNumber() Failed to open $filename for output\n";
+    
     $status = 0;
     }

gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm

@@ -100 +100 @@
     
     # write out next free frame num
-    $expeditee_frame_io->saveLastFrameNumber($fn);
+    $expeditee_frame_io->saveLastFrameNumber($fn,$collect);
 
     $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");