--- loncom/interface/lonpdfupload.pm	2010/03/18 16:08:48	1.17
+++ loncom/interface/lonpdfupload.pm	2010/03/18 19:11:05	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.17 2010/03/18 16:08:48 raeburn Exp $
+# $Id: lonpdfupload.pm,v 1.18 2010/03/18 19:11:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,9 +32,11 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
+use Apache::lonnavmaps();
 use Apache::lonlocal;
 use File::MMagic;
 use CAM::PDF;
+use LONCAPA qw(:DEFAULT :match);
 
 use strict;
 
@@ -79,7 +81,8 @@ sub handler() {
         }
     } else {
         $r->print('<p class="LC_warning">'.
-                  &mt('Could not determine identity of this course. you may need to [_1]re-select[_2] the course.','<a href="/adm/roles">','</a>').
+                  &mt('Could not determine identity of this course.').' '.
+                  &mt('You may need to [_1]re-select[_2] the course.','<a href="/adm/roles">','</a>').
                   '</p>'.
                   &Apache::loncommon::end_page());
         return OK;
@@ -124,6 +127,7 @@ sub get_javascripts() {
     # it's only for giving a message to the user
     my $result .= <<END
   <script type="text/javascript">
+// <![CDATA[
     function checkFilename(form) {
         var fileExt = form.file.value;
         fileExt = fileExt.match(/[.]pdf\$/g);
@@ -133,6 +137,7 @@ sub get_javascripts() {
         alert("$message");
         return false;
     }
+// ]]>
   </script>
 END
 ;
@@ -150,8 +155,7 @@ sub get_uploadform() {
 
     my $result = 
         '<br />'
-       .'<form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);">'
-       .'<input type="hidden" name="type" value="upload" />'
+       .'<form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);" action="">'
        .&Apache::lonhtmlcommon::start_pick_box()
        .&Apache::lonhtmlcommon::row_headline()
        .'<h2>'.$lt{'title'}.'</h2>'
@@ -207,7 +211,22 @@ sub get_pdf_data() {
 sub grade_pdf {
     my $result = ();
     my @pdfdata = @_;
-    my ($result,$meta,%grades,%problems,$debug);   
+    my ($result,$meta,%grades,%problems,%foreigncourse,$debug);
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        $result = '<h3>'.&mt('Verification of PDF form items failed').'</h3>'.
+                  '<div class="LC_error">'.
+                  &mt('Unable to retrieve information about course contents').' '.
+                  &mt('You may need to [_1]re-select[_2] the course.','<a href="/adm/roles">','</a>').
+                  '</div>';
+        return $result;
+    }
+    my %restitles;
+    foreach my $res ($navmap->retrieveResources()) {
+        my $symb = $res->symb; 
+        $restitles{$symb} = $res->compTitle();
+    }
    
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
 
@@ -217,7 +236,6 @@ sub grade_pdf {
             my ($label, $value) = ($entry =~ /^([^?]*)\?(.*)/);
             my ($domain, $user) = split('&', $value);
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
-            
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {
                 return '<p class="LC_error">'
                       .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
@@ -231,7 +249,13 @@ sub grade_pdf {
             my ($label, $value) = ($entry =~ /^([^?]*)\?(.*)/);
             my ($symb, $part, $type, $HWVAL) = split('&', $label);
             my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);
-            next unless (&Apache::lonnet::is_on_map($resource));
+            if ($map =~ m{^uploaded/($match_domain)/($match_courseid)/default(_?\d*)\.(page|sequence)}) {
+                my $mapcid = $1.'_'.$2;
+                if ($mapcid ne $env{'request.course.id'}) {
+                    push(@{$foreigncourse{$mapcid}},$symb);
+                }
+            }
+            next unless (exists($restitles{$symb}));
             $value =~ s/(.*)\n/$1/; 
 
             #filter incorrect radiobuttons (Bug in CABAReT Stage)
@@ -257,7 +281,7 @@ sub grade_pdf {
     }
     #$result .= $debug;
 
-    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
+    $result .= '<h3>'.&mt('Result of PDF Form upload').'</h3>';
 
     if (keys(%problems) > 0) {
         $result .= &Apache::loncommon::start_data_table()
@@ -272,14 +296,18 @@ sub grade_pdf {
             my ($problemname, $grade) = &grade_problem(%problem);
 
             $result .= &Apache::loncommon::start_data_table_row();
-            $result .= "<td>$problemname</td><td class='";
+            $result .= '<td><a href="/res/'.$problem{'resource'}.
+                       '?symb='.
+                       &HTML::Entities::encode($problem{'symb'},'"&<>').
+                       '">'.$problemname.'</a></td><td class="';
             if ($grade eq "EXACT_ANS" || $grade eq "APPROX_ANS") {
-                $result .= "LC_answer_correct";
+                $result .= 'LC_answer_correct';
             } else { 
-                $result .= "LC_answer_charged_try";
+                $result .= 'LC_answer_charged_try';
             }
+            $result .= '">';
             $grade = &parse_grade_answer($grade);
-            $result .= "'>$grade</span></td>";
+            $result .= $grade.'</span></td>';
             $result .= &Apache::loncommon::end_data_table_row();
         }
         $result .= &Apache::loncommon::end_data_table();
@@ -288,8 +316,38 @@ sub grade_pdf {
                    &mt('As no gradable form items were found, no submissions have been recorded.').
                    '</p>';
     }
+    if (keys(%foreigncourse)) {
+        my ($numother,$othercrsmsg);
+        foreach my $cid (sort(keys(%foreigncourse))) {
+            my %coursehash = &Apache::lonnet::coursedescription($cid,
+                                                          {'one_time' => 1});
+            if (ref($foreigncourse{$cid}) eq 'ARRAY') {
+                if ($numother) {
+                    $othercrsmsg .= '</li><li>';
+                }
+                $othercrsmsg .= '<b>'.$coursehash{'description'}.'</b><ul>'."\n";
+                foreach my $symb (@{$foreigncourse{$cid}}) {
+                    my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);
+                    $othercrsmsg .= '<li>'.$resource.'</li>';
+                }
+                $othercrsmsg .= '</ul>';
+                $numother ++;
+            }
+        }
+        if ($numother) {
+            $result .= '<div class="LC_warning">';
+            if ($numother > 1) {
+                $result .= &mt('Your uploaded PDF form contained the following resource(s) from [_1] different courses:','<b>'.$numother.'</b>')."\n".'<ul><li>'.
+                           $othercrsmsg.'</li></ul>';
+            } else {
+                $result .= &mt('Your uploaded PDF form contained the following resource(s) from a different course:').' '.$othercrsmsg.
+                           &mt('Did you download the PDF form from another course and upload it to the wrong course?'); 
+            }
+            $result .= '</div>';
+        }
+    }
 
-    return $result;        
+    return $result;
 }
 
 sub grade_problem {