[LON-CAPA-cvs] cvs: loncom /xml scripttag.pm
www
www@source.lon-capa.org
Wed, 26 May 2010 12:22:54 -0000
www Wed May 26 12:22:54 2010 EDT
Modified files:
/loncom/xml scripttag.pm
Log:
Internal rewriting might not be needed
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.154 loncom/xml/scripttag.pm:1.155
--- loncom/xml/scripttag.pm:1.154 Wed May 26 02:04:20 2010
+++ loncom/xml/scripttag.pm Wed May 26 12:22:54 2010
@@ -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.155 2010/05/26 12:22:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -387,23 +387,13 @@
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;
}
}