[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Mon, 11 Nov 2002 20:13:47 -0000


sakharuk		Mon Nov 11 15:13:47 2002 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  Changed according to Ed's desire.
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.60 loncom/homework/optionresponse.pm:1.61
--- loncom/homework/optionresponse.pm:1.60	Mon Nov 11 10:58:51 2002
+++ loncom/homework/optionresponse.pm	Mon Nov 11 15:13:47 2002
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.60 2002/11/11 15:58:51 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.61 2002/11/11 20:13:47 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -383,10 +383,7 @@
 	          $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
 	        }
 	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
-		  $texoptionlist = &texoptionlist_correction($texoptionlist);
-	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>|$texoptionlist|;
-	          $result.= $Apache::response::foilgroup{$name.'.text'};
-	        } else {
+	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
 	          $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
 	        }
 	      } else {
@@ -406,8 +403,7 @@
 		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
 		  }
 	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
-		  $texoptionlist = &texoptionlist_correction($texoptionlist);
-	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>|$texoptionlist|;
+	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
 	        }
 		$result.= $Apache::response::foilgroup{$name.'.text'};
 	      } else {
@@ -444,14 +440,6 @@
     $texoptionlist =~ s/>/\$>\$/g;
     $texoptionlist =~ s/</\$<\$/g;
     $texoptionlist =~ s/=/\$=\$/g;
-    return $texoptionlist;
-}
-
-
-sub texoptionlist_correction {
-    my $texoptionlist = shift;
-    $texoptionlist =~ s/\\item \[\] Possible answers are:\s*/\\fbox\{/;
-    $texoptionlist =~ s/\.$/}/;
     return $texoptionlist;
 }