Diff for /loncom/interface/lonevaluate.pm between versions 1.5 and 1.10

version 1.5, 2001/12/21 20:42:11 version 1.10, 2002/08/26 12:47:28
Line 33 Line 33
 #  #
 # 3/1/1 Gerd Kortemeyer)  # 3/1/1 Gerd Kortemeyer)
 #  #
 # 3/1,12/6,12/12,12/21 Gerd Kortemeyer  # 3/1,12/6,12/12,12/21,12/22 Gerd Kortemeyer
 #  #
 package Apache::lonevaluate;  package Apache::lonevaluate;
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use Apache::loncommon;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 47  sub handler { Line 48  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
   my $feedurl=$ENV{'form.postdata'};    my $feedurl=$ENV{'form.postdata'};
   $feedurl=~s/^http\:\/\///;    $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;    $feedurl=~s/^$ENV{'SERVER_NAME'}//;
Line 57  sub handler { Line 59  sub handler {
   
     my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);      my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);
   
     my $prefix=$ENV{'user.name.'}.'@'.$ENV{'user.domain'}.'___'.      my $prefix=$ENV{'user.name'}.'@'.$ENV{'user.domain'}.'___'.
  $feedurl.'___';   $feedurl.'___';
   
     my @items=('correct','helpful','depth','clear','technical','comments',      my @items=('correct','helpful','depth','clear','technical','comments',
Line 66  sub handler { Line 68  sub handler {
     my @retrieve=map{ $prefix.$_ } @items;      my @retrieve=map{ $prefix.$_ } @items;
   
     my %currenteval=      my %currenteval=
        &Apache::lonnet::get('resevaldata',\@retrieve,$rdomain,$rauth);         &Apache::lonnet::get('nohist_resevaldata',\@retrieve,$rdomain,$rauth);
   
     my $already=($currenteval{$prefix.'timestamp'} ne '');      my $already=($currenteval{$prefix.'timestamp'} ne '');
   
Line 74  sub handler { Line 76  sub handler {
   
     my $warning='';      my $warning='';
   
       my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource');
   
     if ($ENV{'form.submiteval'} eq 'true') {      if ($ENV{'form.submiteval'} eq 'true') {
 # ------------------------------------------------ User is submitting something  # ------------------------------------------------ User is submitting something
         my $complete=1;          my $complete=1;
Line 89  sub handler { Line 93  sub handler {
 <html>  <html>
 <head>  <head>
 <title>Evaluation submitted</title>  <title>Evaluation submitted</title>
   <script>
       function go() {
    if (window.name!='LONcatInfo') {
               window.location='/res/$feedurl';
           }
       }
   </script>
 <meta http-equiv="pragma" content="no-cache"></meta>  <meta http-equiv="pragma" content="no-cache"></meta>
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=/res/$feedurl">  
 </head>  </head>
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Thank you for your input!</h1>  <h1>Thank you for your input!</h1>
 ENDHEADER  ENDHEADER
        $r->print('Storing feedback: '.         $r->print('Storing feedback: '.
            &Apache::lonnet::put('resevaldata',\%currenteval,$rdomain,$rauth));             &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
            unless ($already) {             unless ($already) {
        $r->print('<br>Logging first evaluation');         $r->print('<br>Logging first evaluation');
            }             }
            $r->print('</body></html>');             $r->print(
               '<script>setTimeout("go()",2000);</script></body></html>');
            return OK;             return OK;
         } else {          } else {
     $warning='Please fill out all fields below';      $warning='Please fill out all fields below';
         }          }
          
     }      }
   
 # ---------------------------------------------------------- Dial in old values  # ---------------------------------------------------------- Dial in old values
Line 139  ENDOPTIONS Line 150  ENDOPTIONS
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 </head>  </head>
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Evaluate Resource</h1>  
 <tt>$feedurl</tt><p>  <tt>$feedurl</tt><p>
 <h3><font color="red">$warning</font></h3>  <h3><font color="red">$warning</font></h3>
 Please rank the following criteria:  Please rank the following criteria:

Removed from v.1.5  
changed lines
  Added in v.1.10


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>