[LON-CAPA-cvs] cvs: loncom /interface lonpickcode.pm lonprintout.pm

[raeburn]

raeburn		Thu Jan 31 16:08:07 2019 EDT

  Modified files:              
    /loncom/interface	lonpickcode.pm lonprintout.pm 
  Log:
  - &get_scantronformat_file() and &get_scantron_config() moved from grades.pm
    to lonnet.pm
  
  
Index: loncom/interface/lonpickcode.pm
diff -u loncom/interface/lonpickcode.pm:1.16 loncom/interface/lonpickcode.pm:1.17
--- loncom/interface/lonpickcode.pm:1.16	Fri Feb  1 18:46:37 2013
+++ loncom/interface/lonpickcode.pm	Thu Jan 31 16:08:06 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.16 2013/02/01 18:46:37 bisitz Exp $
+# $Id: lonpickcode.pm,v 1.17 2019/01/31 16:08:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@
     my ($r)=@_;
     my %codes;
     my %scantron_config=
-	&Apache::grades::get_scantron_config($env{'form.scantron_format'});
+	&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
     $r->rflush();
     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.667 loncom/interface/lonprintout.pm:1.668
--- loncom/interface/lonprintout.pm:1.667	Sun Dec 30 19:53:34 2018
+++ loncom/interface/lonprintout.pm	Thu Jan 31 16:08:07 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.667 2018/12/30 19:53:34 raeburn Exp $
+# $Id: lonprintout.pm,v 1.668 2019/01/31 16:08:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1233,7 +1233,7 @@
 sub is_code_valid {
     my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
-    my @lines = &Apache::grades::get_scantronformat_file();
+    my @lines = &Apache::lonnet::get_scantronformat_file();
     foreach my $line (@lines) {
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
@@ -3233,7 +3233,7 @@
 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-         my @lines = &Apache::grades::get_scantronformat_file();
+         my @lines = &Apache::lonnet::get_scantronformat_file();
 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
 	 foreach my $line (@lines) {
              chomp($line);
@@ -4520,7 +4520,7 @@
 
 	}
 
-        my @lines = &Apache::grades::get_scantronformat_file();
+        my @lines = &Apache::lonnet::get_scantronformat_file();
 	my $codechoice='';
 	foreach my $line (@lines) {
             next if (($line =~ /^\#/) || ($line eq ''));