--- loncom/xml/scripttag.pm	2010/05/26 02:04:20	1.154
+++ loncom/xml/scripttag.pm	2011/12/10 18:11:05	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.154 2010/05/26 02:04:20 www Exp $
+# $Id: scripttag.pm,v 1.159 2011/12/10 18:11:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,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 ="<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);
+            &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);
@@ -387,23 +371,13 @@ sub start_import {
     my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval);
     if (($importmode eq 'problem') || ($importmode eq 'part')) {
 # We are using import to import published problems
-# This will require some on-the-fly rewriting
-       my $importid=&Apache::lonxml::get_param('id',$parstack,$safeeval);
-       if ($importid) {
-# Rewrite all internal IDs of the problem to avoid duplicates
-          $file=~s/id\s*=\s*([\"\'])(\w+)([\"\'])/id=$1$2DynPart$importid$3/gs;
-       }
        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
-          if ($importid) {
-             $file=~s/^\s*<problem>/<library><part id="DynPart$importid">/s;
-          } else {
-             $file=~s/^\s*<problem>/<library><part>/s;
-          }
+          $file=~s/^\s*<problem>/<library><part>/s;
 	  $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
        }
     }
@@ -450,7 +424,7 @@ sub start_import {
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -637,7 +611,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,undef,$target,$style,$parstack,$safeeval);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }