[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm response.pm /xml lonxml.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 04 Apr 2005 18:14:58 -0000


This is a MIME encoded message

--albertel1112638498
Content-Type: text/plain

albertel		Mon Apr  4 14:14:58 2005 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm response.pm 
    /loncom/xml	lonxml.pm 
  Log:
  - making bridge tasks randomize whihc instance in a dimension is shown
  
  
  
--albertel1112638498
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20050404141458.txt"

Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.8 loncom/homework/bridgetask.pm:1.9
--- loncom/homework/bridgetask.pm:1.8	Thu Mar 31 16:24:29 2005
+++ loncom/homework/bridgetask.pm	Mon Apr  4 14:14:58 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.8 2005/03/31 21:24:29 albertel Exp $
+# $Id: bridgetask.pm,v 1.9 2005/04/04 18:14:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,10 +37,23 @@
 use Apache::lonlocal;
 use Apache::lonxml;
 use Time::HiRes qw( gettimeofday tv_interval );
+
 BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
 }
 
+sub initialize_bridgetask {
+    # id of current Dimension, 0 means that no dimension is current 
+    # (inside <Task> only)
+    $Apache::bridgetask::dimension='';
+    # list of all Dimension ids seen
+    @Apache::bridgetask::dimensionlist=();
+    # list of all current Instance ids
+    @Apache::bridgetask::instance=();
+    # list of all Instance ids seen in this problem
+    @Apache::bridgetask::instancelist=();
+}
+
 sub proctor_check_auth {
     my ($slot)=@_;
     my $user=$ENV{'form.proctorname'};
@@ -63,9 +76,9 @@
 
 sub add_previous_version_button {
     my $result;
-    $result.=' Show a previously done version: <select name="previousversion">
+    $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
 <option>Pick one</option>
-</select>';
+</select>');
     return $result;
 }
 
@@ -88,7 +101,7 @@
 	$target eq 'tex') {
 	($status,$accessmsg,$slot) = 
 	    &Apache::lonhomework::check_task_access('0');
-	push (@Apache::inputtags::status,$status);
+	push(@Apache::inputtags::status,$status);
 	my $expression='$external::datestatus="'.$status.'";';
 	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
@@ -164,10 +177,13 @@
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($target eq 'web') {
-		$result.='<table border="1">'.
-		    &Apache::inputtags::file_selector("bridge","task","*",
-						      'portfolioonly').
-						      "</table>";
+		if ($status eq 'CAN_ANSWER') {
+		    $result.='<table border="1">'.
+			&Apache::inputtags::file_selector('0',"bridgetask","*",
+							  'portfolioonly').
+							  "</table>";
+		    $result.=&Apache::inputtags::gradestatus('0');
+		}
 		$result.=&Apache::lonxml::xmlend().'</html>';
 	    }
 	}
@@ -201,11 +217,13 @@
 }
 
 my %dimension;
-my $dim_id;
 sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);
-    $dim_id=$Apache::lonxml::curdepth;
+    my $dim_id=$Apache::lonxml::curdepth;
+    $Apache::bridgetask::dimension=$dim_id;
+    push(@Apache::bridgetask::dimensionlist,$dim_id);
+    undef(@Apache::bridgetask::instance);
     return '';
 }
 
@@ -216,9 +234,11 @@
 	#FIXME just grabbing the first one for now, need
 	#to randomly pick one until all have been seen
 	#then start repicking
-	my $instance=$dimension{'instances'}->[0];
-	$result=$dimension{'intro'}.
-	    $dimension{$instance.'.text'};
+	&Apache::response::pushrandomnumber();
+	my $num_instances=scalar(@{$dimension{'instances'}});
+	my $which=&Math::Random::random_uniform_integer(1,0,$num_instances-1);
+	my $instance=$dimension{'instances'}->[$which];
+	$result=$dimension{'intro'}.$dimension{$instance.'.text'};
 	#FIXME: don't show the criteria yet
 	#foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 	#    $result.=$dimension{$instance.'.criteria.'.$id};
@@ -249,11 +269,11 @@
     return $result;
 }
 
-my $instance_id;
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
-    $instance_id=$Apache::lonxml::curdepth;
+    push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
+    push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
     return '';
 }
 
@@ -272,6 +292,7 @@
 
 sub end_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web') {
 	$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
     }
@@ -288,6 +309,7 @@
 
 sub end_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web') {
 	my $criteria=&Apache::lonxml::endredirection();
 	my $id=$Apache::lonxml::curdepth;
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.118 loncom/homework/response.pm:1.119
--- loncom/homework/response.pm:1.118	Mon Apr  4 06:04:09 2005
+++ loncom/homework/response.pm	Mon Apr  4 14:14:58 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.118 2005/04/04 10:04:09 foxr Exp $
+# $Id: response.pm,v 1.119 2005/04/04 18:14:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,22 +119,34 @@
     #  $rndseed=unpack("%32i",$rndseed);
     my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $rndmod;
-    if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
-	$rand_alg eq '64bit2') {
-	$rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);
+
+    my ($id1,$id2,$shift_amt);
+    if ($Apache::lonhomework::parsing_a_problem) {
+	$id1=$Apache::inputtags::part;
 	if (defined($Apache::inputtags::response[-1])) {
-	    $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
+	    $id2=$Apache::inputtags::response[-1];
 	}
+	$shift_amt=scalar(@Apache::inputtags::responselist);
+    } elsif ($Apache::lonhomework::parsing_a_task) {
+	$id1=$Apache::bridgetask::dimension;
+	if (defined($Apache::bridgetask::instance[-1])) {
+	    $id2=$Apache::bridgetask::instance[-1];
+	}
+	$shift_amt=scalar(@Apache::bridgetask::instance);
+    } 
+    &Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
+    if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
+	$rand_alg eq '64bit2') {
+	$rndmod=(&Apache::lonnet::numval($id1) << 10);
+	if (defined($id2)) { $rndmod+=&Apache::lonnet::numval($id2); }
     } elsif ($rand_alg eq '64bit3') {
-	$rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);
-	if (defined($Apache::inputtags::response[-1])) {
-	    $rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]);
-	}
+	$rndmod=(&Apache::lonnet::numval2($id1) << 10);
+	if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }
     } else {
-	my $shift=(4*scalar(@Apache::inputtags::responselist))%30;
-	$rndmod=(&Apache::lonnet::numval3($Apache::inputtags::part) << (($shift+15)%30));
-	if (defined($Apache::inputtags::response[-1])) {
-	    $rndmod+=(&Apache::lonnet::numval3($Apache::inputtags::response[-1]) << $shift );
+	my $shift=(4*$shift_amt)%30;
+	$rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30));
+	if (defined($id2)) {
+	    $rndmod+=(&Apache::lonnet::numval3($id2) << $shift );
 	}
     }
     if ($rndseed =~/([,:])/) {
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.369 loncom/xml/lonxml.pm:1.370
--- loncom/xml/lonxml.pm:1.369	Fri Apr  1 13:08:14 2005
+++ loncom/xml/lonxml.pm	Mon Apr  4 14:14:58 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.369 2005/04/01 18:08:14 albertel Exp $
+# $Id: lonxml.pm,v 1.370 2005/04/04 18:14:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -321,6 +321,7 @@
 
  &setup_globals($request,$target);
  &Apache::inputtags::initialize_inputtags();
+ &Apache::bridgetask::initialize_bridgetask();
  &Apache::outputtags::initialize_outputtags();
  &Apache::edit::initialize_edit();
  &Apache::londefdef::initialize_londefdef();

--albertel1112638498--