--- loncom/xml/scripttag.pm	2006/12/20 22:41:59	1.139
+++ loncom/xml/scripttag.pm	2011/12/19 01:49:32	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.139 2006/12/20 22:41:59 albertel Exp $
+# $Id: scripttag.pm,v 1.160 2011/12/19 01:49:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,8 @@ package Apache::scripttag;
 
 use strict;
 use Apache::lonnet;
-use Apache::style;
+use Apache::lonlocal;
+use Apache::style();
 
 #Globals
 # this used to pass around the standard callsub arguments to a tag func
@@ -43,8 +44,7 @@ BEGIN {
 			     'window','display','storetc','physnet',
 			     'standalone','comment','num','parse','algebra',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
-			     'LONCAPA_INTERNAL_TURN_STYLE_OFF',
-			     'LONCAPA_INTERNAL_LONHTTPD_PORT'));
+			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
 }
 
 sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
@@ -80,21 +80,6 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
     return ('','no');
 }
 
-sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'webgrade') {
-	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
-	return '<script type="text/javascript">var lonhttpdport=\''.
-	    $lonhttpdPort.'\';</script>';
-    }
-    return ('','no');
-}
-
-sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
-    return ('','no');
-}
-
 sub start_script {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   @Apache::scripttag::parser_env = @_;
@@ -117,25 +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,});
-
-	    $result.="<script type=\"text/javascript\">
-// <![CDATA[
-    function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
-	    my $listing=&Apache::run::dump($target,$safeeval);
-	    $listing=~s/\\/\\\\/g;
-	    $listing=~s/\'/\\\'/g;
-	    $result.=$listing;
-	    $result.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+	    $uname =~s/\W//g;
+	    $udom  =~s/\W//g;
+	    my $function_name = 
+		join('_','LONCAPA_scriptvars',$uname,$udom,
+		     $env{'form.counter'},$Apache::lonxml::curdepth);
+            &Apache::lonxml::add_script_result(
+	             &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+                            '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>',
+                            &mt('Script Vars'))."<br />");
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -148,7 +123,7 @@ sub start_script {
     }
   } else {
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-      if ($target ne "meta" && $target ne 'tex') {
+      if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
 	  $result = $token->[4];
 	  $result.=$bodytext;
       }
@@ -231,7 +206,7 @@ sub start_scriptlib {
     my $script=&Apache::lonnet::getfile($location);
     if ($script == -1) {
       if ($target eq 'edit') {
-        $error='</tr><tr><td>Errors</td><td colspan="2"><b> Unable to find <i>'.$location.'</i></b></td>'."\n";
+        $error='</tr><tr><td>'.&mt('Errors').'</td><td colspan="2"><b>'.&mt(' Unable to find [_1]','<span class="LC_filename">'.$location.'</span>').'</b></td>'."\n";
       } else {
 	&Apache::lonxml::error("<b> Unable to find <i>$location</i> for scriptlib</b>");
 	return "";
@@ -322,7 +297,8 @@ sub start_window {
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'linktext',
-						     'width','height');
+						     'width','height',
+						     'mimetype');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
     return $result;  
@@ -333,9 +309,6 @@ 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='<sup>*</sup>'; }
     my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
@@ -343,22 +316,9 @@ sub end_window {
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
 
-    my $start_page =
-	&Apache::loncommon::start_page($linktext, undef,
-				       {'only_body' => 1,
-					'bgcolor'   => '#FFFFFF',
-					'js_ready'  => 1,});
-    my $end_page =
-	&Apache::loncommon::end_page({'js_ready' => 1,});
-    $result = "<script type=\"text/javascript\">
-//<!--
- function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
-newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
-newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
-newWindow.document.writeln('$start_page $output $end_page');
-newWindow.document.close();}
-//-->
-</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+    my ($start_page,$end_page);
+    $result=&Apache::loncommon::modal_adhoc_window
+           ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
@@ -372,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' ) {
@@ -384,33 +344,63 @@ sub start_import {
       &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
       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=~/<part[^<]*>/s)) {
+# We explicitly don't want this to be a separate part or the problem already has parts
+          $file=~s/^\s*<problem>/<library>/s;
+	  $file=~s/<\/problem>\s*$/<\/library>/s;
+       } else {
+# We want this to be a separate part, but it currently is not
+          $file=~s/^\s*<problem>/<library><part>/s;
+	  $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
+       }
+    }
     my $dir=$location;
     $dir=~s:/[^/]*$::;
     #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }
     push(@Apache::inputtags::import,$id);
     push(@Apache::inputtags::importlist,$id);
 
-	&Apache::lonxml::newparser($parser,\$file,$dir);
+    &Apache::lonxml::newparser($parser,\$file,$dir);
 
   } 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.= '&nbsp;<label>'.&mt('Import as:').
+              '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
+    my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
+                                            'problem' => 'as problem',
+                                            'part'    => 'as problem part(s)');
+    foreach my $option (sort(keys(%options))) {
+       $result.='<option value="'.$option.'"';
+       if ($option eq &Apache::lonxml::get_param('importmode',$parstack,$safeeval)) {
+          $result.=' selected="selected"';
+       }
+       $result.='>'.$options{$option}.'</option>';
+    }
+    $result.='</select></label>';
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
   } elsif ($target eq 'modified') {
-      $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
+      &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode');
+      $result='<import id="'.$token->[2]{'id'}.'" importmode="'.$token->[2]{'importmode'}.'">';
+      $result.=&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -597,7 +587,7 @@ sub start_algebra {
 	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
-	    $result=&Apache::lontexconvert::algebra($inside,$target,$style);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -612,3 +602,20 @@ sub end_algebra {
 
 1;
 __END__
+
+=pod
+
+=head1 NAME
+
+Apache::scripttag.pm
+
+=head1 SYNOPSIS
+
+implements <script>, <scriptlib>, <parserlib>,
+and <import>
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=cut
+