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

Timestamp:

2012-01-11T10:05:58+13:00 (12 years ago)

Author:

davidb

Message:

Introduction of new Perl module to handle taking the JSON version of the traversed HTML tree and output it as an expeditee frame

File:

• gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm (modified) (3 diffs)

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

@@ -30 +30 @@
 use cgiactions::baseaction;
 
+use ExpediteeFrameIO;
 use JSON;
 
@@ -84 +85 @@
     my $exp_frame_tree = decode_json $json_str_utf8;
     
-
     my $output_dir = &util::filename_cat($collect_dir,$collect,"export");
 
@@ -92 +92 @@
     my $frame_filename = &util::filename_cat($output_dir,"$fn.exp");
 
-    if (open(FOUT,">$frame_filename")) {
-    binmode(FOUT,":utf8");
+    my $expeditee_frame_io = new ExpediteeFrameIO();
+    
+    $expeditee_frame_io->buildFrame($exp_frame_tree);
 
-    print FOUT $json_str_utf8;
-    close(FOUT);
+#    if (open(FOUT,">$frame_filename")) {
+#   binmode(FOUT,":utf8");
+
+#   print FOUT $json_str_utf8;
+#   close(FOUT);
+#   $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");
+#    }
+#    else {
+#   $gsdl_cgi->generate_error("Failed to open $frame_filename for output");
+#    }
+
+    if ($expeditee_frame_io->saveFrame($frame_filename)) {
     
     # write out next free frame num
-    
+    $expeditee_frame_io->saveNextFreeFrame($fn+1);
+
     $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");
     }