--- loncom/xml/scripttag.pm	2010/05/26 02:04:20	1.154
+++ loncom/xml/scripttag.pm	2010/08/08 03:00:56	1.157
@@ -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.157 2010/08/08 03:00:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -387,23 +387,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 +440,7 @@ sub start_import {
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -637,7 +627,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;
     }