[LON-CAPA-cvs] cvs: loncom /homework chemresponse.pm essayresponse.pm externalresponse.pm imageresponse.pm matchresponse.pm optionresponse.pm radiobuttonresponse.pm rankresponse.pm response.pm
raeburn
lon-capa-cvs-allow@mail.lon-capa.org
Fri, 01 Feb 2008 22:05:47 -0000
raeburn Fri Feb 1 17:05:47 2008 EDT
Modified files:
/loncom/homework chemresponse.pm essayresponse.pm
externalresponse.pm imageresponse.pm
matchresponse.pm optionresponse.pm
radiobuttonresponse.pm rankresponse.pm response.pm
Log:
When the target is 'analyze', include the responsetype of the current item in the lonhomework::analyze hash, for use later on, e.g., for scantron grading.
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.75 loncom/homework/chemresponse.pm:1.76
--- loncom/homework/chemresponse.pm:1.75 Mon Oct 15 05:47:29 2007
+++ loncom/homework/chemresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.75 2007/10/15 09:47:29 foxr Exp $
+# $Id: chemresponse.pm,v 1.76 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -337,6 +337,7 @@
&Apache::lonxml::increment_counter(&Apache::response::repetition(),
"$partid.$id"); # part.response
if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
&Apache::lonhomework::set_bubble_lines();
}
}
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.86 loncom/homework/essayresponse.pm:1.87
--- loncom/homework/essayresponse.pm:1.86 Mon Oct 15 05:47:29 2007
+++ loncom/homework/essayresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.86 2007/10/15 09:47:29 foxr Exp $
+# $Id: essayresponse.pm,v 1.87 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -187,6 +187,7 @@
&Apache::lonxml::increment_counter($increment, "$part.$id");
if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse';
&Apache::lonhomework::set_bubble_lines();
}
}
Index: loncom/homework/externalresponse.pm
diff -u loncom/homework/externalresponse.pm:1.12 loncom/homework/externalresponse.pm:1.13
--- loncom/homework/externalresponse.pm:1.12 Mon Oct 15 05:47:29 2007
+++ loncom/homework/externalresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# external style responses
#
-# $Id: externalresponse.pm,v 1.12 2007/10/15 09:47:29 foxr Exp $
+# $Id: externalresponse.pm,v 1.13 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -125,6 +125,7 @@
&Apache::lonxml::increment_counter($increment, "$part.$id");
if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'externalresponse';
&Apache::lonhomework::set_bubble_lines();
}
}
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.91 loncom/homework/imageresponse.pm:1.92
--- loncom/homework/imageresponse.pm:1.91 Mon Oct 15 16:20:49 2007
+++ loncom/homework/imageresponse.pm Fri Feb 1 17:05:45 2008
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.91 2007/10/15 20:20:49 albertel Exp $
+# $Id: imageresponse.pm,v 1.92 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,6 +59,7 @@
$result=&Apache::response::meta_package_write('imageresponse');
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'imageresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
1);
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.68 loncom/homework/matchresponse.pm:1.69
--- loncom/homework/matchresponse.pm:1.68 Wed Jan 30 12:50:13 2008
+++ loncom/homework/matchresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.68 2008/01/30 17:50:13 raeburn Exp $
+# $Id: matchresponse.pm,v 1.69 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,6 +70,7 @@
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
1);
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.148 loncom/homework/optionresponse.pm:1.149
--- loncom/homework/optionresponse.pm:1.148 Thu Jan 31 00:14:06 2008
+++ loncom/homework/optionresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.148 2008/01/31 05:14:06 raeburn Exp $
+# $Id: optionresponse.pm,v 1.149 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,6 +70,7 @@
$result=&Apache::response::meta_package_write('optionresponse');
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.130 loncom/homework/radiobuttonresponse.pm:1.131
--- loncom/homework/radiobuttonresponse.pm:1.130 Mon Oct 22 05:29:58 2007
+++ loncom/homework/radiobuttonresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.130 2007/10/22 09:29:58 foxr Exp $
+# $Id: radiobuttonresponse.pm,v 1.131 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -103,6 +103,7 @@
$result .= '\begin{enumerate}';
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
Index: loncom/homework/rankresponse.pm
diff -u loncom/homework/rankresponse.pm:1.55 loncom/homework/rankresponse.pm:1.56
--- loncom/homework/rankresponse.pm:1.55 Mon Oct 15 05:47:29 2007
+++ loncom/homework/rankresponse.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# rank style response
#
-# $Id: rankresponse.pm,v 1.55 2007/10/15 09:47:29 foxr Exp $
+# $Id: rankresponse.pm,v 1.56 2008/02/01 22:05:45 raeburn Exp $
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -66,6 +66,7 @@
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'rankresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.186 loncom/homework/response.pm:1.187
--- loncom/homework/response.pm:1.186 Sat Jan 19 09:56:54 2008
+++ loncom/homework/response.pm Fri Feb 1 17:05:45 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.186 2008/01/19 14:56:54 raeburn Exp $
+# $Id: response.pm,v 1.187 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -454,6 +454,7 @@
&Apache::lonxml::increment_counter(&Apache::response::repetition(),
"$part.$id");
if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
&Apache::lonhomework::set_bubble_lines();
}
}