--- loncom/publisher/Attic/lonconstruct.pm 2004/12/10 14:57:47 1.26 +++ loncom/publisher/Attic/lonconstruct.pm 2006/04/06 22:15:18 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Page Wrapper for Construction # -# $Id: lonconstruct.pm,v 1.26 2004/12/10 14:57:47 raeburn Exp $ +# $Id: lonconstruct.pm,v 1.32 2006/04/06 22:15:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,23 +26,13 @@ # http://www.lon-capa.org/ # # -# (Page Handler -# -# (TeX Content Handler -# -# 05/29/00,05/30 Gerd Kortemeyer) -# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23, -# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer) -# -# 11/22,11/23,11/28, -# 03/30/01 Gerd Kortemeyer + package Apache::lonconstruct; use strict; use Apache::Constants qw(:common :http :methods); use Apache::lonnet; -use Apache::Log (); use HTML::Entities(); my $DEBUG = 0; @@ -70,20 +60,12 @@ my $DEBUG = 0; =cut sub Debug { - - # Marshall the parameters. - - my $r = shift; - my $log = $r->log; - my $message = shift; - - # Put out the indicated message butonly if DEBUG is false. - - if ($DEBUG) { - $log->debug($message); - } -} - + # Put out the indicated message but only if DEBUG is true. + if ($DEBUG) { + my ($r,$message) = @_; + $r->log_reason($message); + } +} # ================================================================ Main Handler @@ -92,15 +74,11 @@ sub handler { # -------------------------------------------------------------- Build frameset - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; my $lowerframe=$r->path_info; - my $type='file'; - if ($lowerframe =~ /\/$/) { - $type = 'dir'; - } &Debug($r, "Initial URL for lower frame: ".$lowerframe); $lowerframe=~s/^\//\/\~/; &Debug($r, "Lower frame URL afer ~ subst: ".$lowerframe); @@ -113,12 +91,12 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['forceedit']); - if ($ENV{'form.forceedit'}) { + if ($env{'form.forceedit'}) { $lowerframe.='?editmode=Edit&problemmode=EditXML'; } &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['forceColoredit']); - if ($ENV{'form.forceColoredit'}) { + if ($env{'form.forceColoredit'}) { $lowerframe.='?editmode=Edit&problemmode=Edit'; } @@ -127,20 +105,27 @@ sub handler { # my $toprows = 0; my $topsrc = ''; - if ($ENV{'environment.remote'} ne 'off') { + if ($env{'environment.remote'} ne 'off') { $toprows = '110'; - $topsrc = '/adm/pubmenu?disp='.$type; + $topsrc = '/adm/localize/adm/publisher.html'; + } + my $extra; + &Apache::lontexconvert::jsMath_reset(); + if ($env{'environment.texengine'} eq 'jsMath' || + $env{'form.texengine'} eq 'jsMath' ) { + $extra.=&Apache::lontexconvert::jsMath_header(); } + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html LON-CAPA Construction Space - - - + + ENDPAGE