Index: gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/generate-collection-space.pl.in =================================================================== --- gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/generate-collection-space.pl.in (revision 26746) +++ gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/generate-collection-space.pl.in (revision 26747) @@ -60,4 +60,7 @@ @@ -157,5 +179,4 @@
- @@ -181,5 +202,5 @@ $gsdl_cgi->checked_chdir($gsdlhome); - require cgiactions::HtmlToExpediteeAction; + require cgiactions::CollectionSpaceAction; $gsdl_cgi->parse_cgi_args(); @@ -188,30 +209,33 @@ $gsdl_cgi->{'xml'} = 0; - - #my $action = new HtmlToExpediteeAction($gsdl_cgi,$iis6_mode); - - #$action->do_action(); - - my $collect = $gsdl_cgi->clean_param("collect"); - my $cl = $gsdl_cgi->clean_param("cl"); - - #Establish collect_dir using defining 'site' along the way if GS3 - my $site = undef; - my $isGSDL2 = undef; - - if($gsdl_cgi->greenstone_version() == 2){ - $isGSDL2 = 1; + my $fn = $gsdl_cgi->clean_param("fn"); + + if(defined $fn){ + #Generate a frame. + my $action = new CollectionSpaceAction($gsdl_cgi,$iis6_mode); + $action->do_action(); }else{ - $isGSDL2 = 0; - - #GS3 makes use of 'site' - $site = $gsdl_cgi->clean_param("site"); - - if(!defined $site){ - $gsdl_cgi->generate_error("No site specified."); + my $collect = $gsdl_cgi->clean_param("collect"); + my $cl = $gsdl_cgi->clean_param("cl"); + + #Establish collect_dir using defining 'site' along the way if GS3 + my $site = undef; + my $isGSDL2 = undef; + + if($gsdl_cgi->greenstone_version() == 2){ + $isGSDL2 = 1; + }else{ + $isGSDL2 = 0; + + #GS3 makes use of 'site' + $site = $gsdl_cgi->clean_param("site"); + + if(!defined $site){ + $gsdl_cgi->generate_error("No site specified."); + } } + + generate_html_form($isGSDL2,$site,$collect,$cl); } - - generate_html_form($isGSDL2,$site,$collect,$cl); }