Changeset 24938 for gs3-extensions/html-to-expeditee

Timestamp:

2012-01-11T10:35:25+13:00 (12 years ago)

Author:

davidb

Message:

Implementation of saving 'frame.inf' added

Location:

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

Files:

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

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

@@ -31 +31 @@
 {
     my $class = shift(@_);
-    my ($username) = shift(@_) || "greenstone";
+    my $output_dir = shift(@_);
+    my $username   = shift(@_) || "greenstone";
 
     my $self = { 'items' => [], 'lines' => [], 'constraints' => [] };
 
+    $self->{'output_dir'} = $output_dir;
     $self->{'username'} = $username;
 
@@ -364 +366 @@
 {
     my $self = shift @_;
-    my ($filename) = @_;
+    my ($file) = @_;
+
+    my $filename = &util::filename_cat($self->{'output_dir'},$file);
 
     my $status = undef;
@@ -380 +384 @@
     }
     else {
-    print STDERR "ExpediteeFrameIO:: Failed to open $filename for output\n";
+    print STDERR "ExpediteeFrameIO::saveFrame() Failed to open $filename for output\n";
     $status = 0;
     }
@@ -428 +432 @@
 
 
-sub saveNextFreeFrame
-{
-    my $self = shift @_;
-    my ($nextFreeFrame) = @_;
-
-    print STDERR "****  saveNextFreeFrame not implemented yet!!\n";
+sub saveLastFrameNumber
+{
+    my $self = shift @_;
+    my ($last_frame_number) = @_;
+
+    my $filename = &util::filename_cat($self->{'output_dir'},"frame.inf");
+
+    my $status = undef;
+
+    if (open(FNOUT,">$filename")) {
+    binmode(FOUT,":utf8");
+    
+    print FNOUT "$last_frame_number\n";
+
+    close(FNOUT);
+    $status = 1;
+    }
+    else {
+    print STDERR "ExpediteeFrameIO::saveLastFrameNumber() Failed to open $filename for output\n";
+    $status = 0;
+    }
+
+    return $status;
+
 }
 

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

@@ -90 +90 @@
     &util::mk_dir($output_dir);
     }
-    my $frame_filename = &util::filename_cat($output_dir,"$fn.exp");
 
-    my $expeditee_frame_io = new ExpediteeFrameIO();
+    my $expeditee_frame_io = new ExpediteeFrameIO($output_dir);
     
     $expeditee_frame_io->buildFrame($exp_frame_tree);
 
-    if ($expeditee_frame_io->saveFrame($frame_filename)) {
+    if ($expeditee_frame_io->saveFrame("$fn.exp")) {
     
     # write out next free frame num
-    $expeditee_frame_io->saveNextFreeFrame($fn+1);
+    $expeditee_frame_io->saveLastFrameNumber($fn);
 
     $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");
     }
     else {
-    $gsdl_cgi->generate_error("Failed to open $frame_filename for output");
+    $gsdl_cgi->generate_error("Failed to save frame number $fn");
     }
 }