Changeset 24924 for gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

Timestamp:

2012-01-09T11:19:41+13:00 (12 years ago)

Author:

davidb

Message:

Introduction of action to support frame writing

File:

• gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in (modified) (6 diffs)

gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

@@ -46 +46 @@
     $gsdl_cgi->checked_chdir($gsdlhome);
 
-##    require cgiactions::metadataaction;
+    require cgiactions::HtmlToExpediteeAction;
     
     # Useful debug statement for seeing what packages have been included
@@ -56 +56 @@
     $gsdl_cgi->{'xml'} = 0;
 
-
     my $collect = $gsdl_cgi->clean_param("c");   
     my $cl = $gsdl_cgi->clean_param("cl");   
@@ -76 +75 @@
         $gsdl_cgi->generate_error("No site specified.");
     }
-    $gsdl_cgi->delete("site");
     }
 
-    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
-
-
-
     my $fn = $gsdl_cgi->clean_param("fn");     # frame number
 
     if (defined $fn) {
-    my $json_str = $gsdl_cgi->param("json");
-    
-    my $output_dir = &util::filename_cat($collect_dir,$collect,"export");
-
-    if (!-d $output_dir) {
-        &util::mk_dir($output_dir);
-    }
-    my $frame_filename = &util::filename_cat($output_dir,"$fn.exp");
-
-    if (open(FOUT,">$frame_filename")) {
-
-        print FOUT $json_str;
-        close(FOUT);
-
-        # write out next free frame num
-
-        $gsdl_cgi->generate_message("html-to-expeditee saved frame $fn");   
-    }
-    else {
-        $gsdl_cgi->generate_error("Failed to open $frame_filename for output");
-    }
+
+    my $action = new HtmlToExpediteeAction($gsdl_cgi,$iis6_mode);
+
+    $action->do_action();
+
 
     }
@@ -277 +255 @@
          });
 
-          expFrame = htmlToExpeditee(iframeDoc.body);
+          var expFrameTree = htmlToExpeditee(iframeDoc.body);
+          var expFrame = JSON.stringify(expFrameTree);
           //alert(expFrame);
 
@@ -288 +267 @@
         params += "&site=" + site;
           }
-          params += "&fn=" + frameID;
+          params += "&a=generate-frame&fn=" + frameID;
           params += "&json=" + escape(expFrame);
 
@@ -302 +281 @@
           // console.log("doc oid = " + docOID);
 
+         // is the following line used ????
           var cl = document.getElementById("cl").value;