--- loncom/homework/grades.pm	2005/04/01 23:56:52	1.252
+++ loncom/homework/grades.pm	2005/04/02 18:44:39	1.254
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.252 2005/04/01 23:56:52 banghart Exp $
+# $Id: grades.pm,v 1.254 2005/04/02 18:44:39 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2191,20 +2191,18 @@ sub version_portfiles {
         if ($key =~ /^resource\.($parts)\./ && $key =~ /\.portfiles$/) {
             my @portfiles = split /,/,$$record{$key};
             foreach my $file (@portfiles) {
-                $file =~ /^(.*?)([^\/]*$)/;
-                my $directory = $1;
+                my ($directory,$answer_file) =( $file =~ /^(.*?)([^\/]*$)/);
                 my $version = 0;
-                my $answer_file = $2;
                 my @answer_file_parts = split /\./, $answer_file;
                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);
                 my @file_names;
                 my @file_name_parts;
-                foreach ( @dir_list) {
-                    @file_names = split /\&/,$_,2;
-                    @file_name_parts = split /\./, $file_names[0];
+                foreach my $row (@dir_list) {
+                    @file_names = split (/\&/,$row,2);
+                    @file_name_parts = split (/\./, $file_names[0]);
                     # ($file_name_parts[scalar @file_name_parts] eq $answer_file_parts[scalar @answer_file_parts])
                     if (($file_name_parts[0] eq $answer_file_parts[0]) && 
-                        ($file_name_parts[(scalar @file_name_parts)-1] eq $answer_file_parts[(scalar @answer_file_parts)-1])) {
+                        ($file_name_parts[-1] eq $answer_file_parts[-1])) {
                         # gets here if filename and extension match, regardless of version
                         if (scalar @file_name_parts == 3) { # a versioned file is found
                             # so save it for later