--- loncom/xml/scripttag.pm 2008/09/10 19:45:23 1.148
+++ loncom/xml/scripttag.pm 2011/12/19 01:49:32 1.160
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
- }
- return ('','no');
-}
-
-sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
- return ('','no');
-}
-
sub start_script {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@Apache::scripttag::parser_env = @_;
@@ -126,31 +102,15 @@ sub start_script {
($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
- my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
- my $start_page =
- &Apache::loncommon::start_page('Script Vars', undef,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'js_ready' => 1,});
- my $end_page =
- &Apache::loncommon::end_page({'js_ready' => 1,});
-
$uname =~s/\W//g;
$udom =~s/\W//g;
my $function_name =
join('_','LONCAPA_scriptvars',$uname,$udom,
$env{'form.counter'},$Apache::lonxml::curdepth);
- my $script_var ="".&mt('Script Vars')."
";
- &Apache::lonxml::add_script_result($script_var);
+ &Apache::lonxml::add_script_result(
+ &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+ '
'.&Apache::run::dump($target,$safeeval).'
',
+ &mt('Script Vars'))."
");
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -333,7 +293,6 @@ sub start_window {
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
$result.=&Apache::edit::text_arg('Height:','height',$token,5);
$result.=&Apache::edit::text_arg('Width:','width',$token,5);
- $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -350,39 +309,16 @@ sub end_window {
my $result;
if ($target eq 'web' || $target eq 'webgrade') {
my $output=&Apache::lonxml::endredirection;
- $output =~ s/[\n\r]/ /g;
-# $output = &HTML::Entities::encode($output,'<>&"\'');
- $output =~ s/\'/\\\'/g;
my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
if (!$linktext) { $linktext='*'; }
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
if (!$width) { $width='500'; }
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
if (!$height) { $height='200'; }
- my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
- || 'text/html';
my ($start_page,$end_page);
- if ($mimetype eq 'text/html') {
- $start_page =
- &Apache::loncommon::start_page($linktext, undef,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'js_ready' => 1,});
- $end_page =
- &Apache::loncommon::end_page({'js_ready' => 1,});
- }
- $result = "$linktext";
+ $result=&Apache::loncommon::modal_adhoc_window
+ ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -396,7 +332,7 @@ sub start_import {
my $bodytext=$$parser[$#$parser]->get_text("/import");
my $result ="";
- $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade'
|| $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {
@@ -408,7 +344,19 @@ sub start_import {
&Apache::lonxml::error(" Unable to find $bodytext as $location for import");
return "";
}
-
+ my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval);
+ if (($importmode eq 'problem') || ($importmode eq 'part')) {
+# We are using import to import published problems
+ if (($importmode eq 'problem') || ($file=~//s)) {
+# We explicitly don't want this to be a separate part or the problem already has parts
+ $file=~s/^\s*//s;
+ $file=~s/<\/problem>\s*$/<\/library>/s;
+ } else {
+# We want this to be a separate part, but it currently is not
+ $file=~s/^\s*//s;
+ $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
+ }
+ }
my $dir=$location;
$dir=~s:/[^/]*$::;
# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
@@ -421,20 +369,38 @@ sub start_import {
} elsif ($target eq "edit" ) {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
+ my $location=$token->[1];
+ $location=~s/^\s*//s;
+ $location=~s/\s*$//s;
+ $result.=&Apache::edit::editline($location,$bodytext,'',40);
$result.=&Apache::edit::browse(undef,'textnode');
+ $result.= ' ';
#FIXME this need to convert $bodytext to be a contruction space reference
#my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
#$result.="Clickhere to edit
"
} elsif ($target eq 'modified') {
- $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
+ &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode');
+ $result='';
+ $result.=&Apache::edit::modifiedfield("/import",$parser);
} elsif ($target eq 'meta') {
my $id= &Apache::lonxml::get_id($parstack,$safeeval);
$result.='';
+ $result.='" importmode="'.$token->[2]{'importmode'}.'">';
$result.=$bodytext;
$result.='';
}
@@ -636,3 +602,20 @@ sub end_algebra {
1;
__END__
+
+=pod
+
+=head1 NAME
+
+Apache::scripttag.pm
+
+=head1 SYNOPSIS
+
+implements