--- loncom/homework/structuretags.pm 2007/07/23 23:30:47 1.384
+++ loncom/homework/structuretags.pm 2007/08/08 19:13:19 1.387
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.384 2007/07/23 23:30:47 albertel Exp $
+# $Id: structuretags.pm,v 1.387 2007/08/08 19:13:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -319,7 +319,7 @@ sub problem_web_to_edit_header {
$result.= ' />'.$show_all_foils_text.''.
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
'
';
- $result.=&mt('Apply style file').'
+ $result.=&mt('Apply style file: ').'
&').'" />
'.&mt('Select').'
@@ -458,7 +458,6 @@ sub finalize_storage {
}
return $result;
}
-use Data::Dumper;
# -------------------------------------------------------------store_aggregates
# Sends hash of values to be incremented in nohist_resourcetracker.db
@@ -1081,7 +1080,7 @@ sub start_block {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
my $code = $token->[2]->{'condition'};
- if (defined($code)) {
+ if (defined($code) && $code ne '') {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -1375,8 +1374,7 @@ sub start_part {
# duedates.
}
my $result='';
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
+ my $id= &Apache::lonxml::get_id($parstack,$safeeval);
$Apache::inputtags::part=$id;
push(@Apache::inputtags::partlist,$id);
@Apache::inputtags::response=();