--- loncom/xml/scripttag.pm	2007/11/17 01:46:44	1.146
+++ loncom/xml/scripttag.pm	2011/12/09 22:04:55	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.146 2007/11/17 01:46:44 albertel Exp $
+# $Id: scripttag.pm,v 1.158 2011/12/09 22:04:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,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 {
@@ -81,29 +80,6 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
     return ('','no');
 }
 
-=pod 
-
-=item start_LONCAPA_INTERNAL_LONHTTPD_PORT
-
-emits a pice of javascript that says a global js variable to the
-current lonhttp port, currently used by the remote control to find out
-where to load images from
-
-=cut
-
-sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'webgrade') {
-	return '<script type="text/javascript">var lonhttpdport=\''.
-	    &Apache::loncommon::lonhttpd_port().'\';</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 = @_;
@@ -140,17 +116,16 @@ sub start_script {
 	    my $function_name = 
 		join('_','LONCAPA_scriptvars',$uname,$udom,
 		     $env{'form.counter'},$Apache::lonxml::curdepth);
-	    my $script_var ="<script type=\"text/javascript\">
-// <![CDATA[
-    function $function_name() {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;
-	    $script_var.=$listing;
-	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />";
-	    &Apache::lonxml::add_script_result($script_var);
+            my $scriptblocklog=$start_page.
+                               &Apache::loncommon::start_scrollbox('500px','480px','480px').
+                               '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>'.
+                               &Apache::loncommon::end_scrollbox().
+                               $end_page;
+            $scriptblocklog=~s/\'/\\'/gs;
+            &Apache::lonxml::add_script_result(
+	             &Apache::loncommon::modal_adhoc_script($function_name,500,500,$scriptblocklog).
+                     "<a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />"
+                                              );
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -375,6 +350,8 @@ sub end_window {
     $result = "<script type=\"text/javascript\">
 //<!--
  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');
+newWindow.close();
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
 newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
 newWindow.document.writeln('$start_page $output $end_page');
@@ -394,7 +371,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' ) {
@@ -406,7 +383,19 @@ 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");
@@ -419,20 +408,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.= '&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_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -619,7 +626,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;
     }
@@ -634,3 +641,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
+