--- loncom/interface/lonevaluate.pm 2001/12/21 20:42:11 1.5 +++ loncom/interface/lonevaluate.pm 2004/11/11 22:47:55 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # Evaluate # -# $Id: lonevaluate.pm,v 1.5 2001/12/21 20:42:11 www Exp $ +# $Id: lonevaluate.pm,v 1.14 2004/11/11 22:47:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,13 +33,15 @@ # # 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; use strict; -use Apache::lonnet; +use Apache::lonnet(); use Apache::Constants qw(:common); +use Apache::loncommon(); +use Apache::lonenc(); sub handler { my $r = shift; @@ -47,17 +49,20 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - my $feedurl=$ENV{'form.postdata'}; - $feedurl=~s/^http\:\/\///; - $feedurl=~s/^$ENV{'SERVER_NAME'}//; - $feedurl=~s/^$ENV{'HTTP_HOST'}//; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']); + my $feedurl=$ENV{'form.postdata'}; + $feedurl=~s/^http\:\/\///; + $feedurl=~s/^$ENV{'SERVER_NAME'}//; + $feedurl=~s/^$ENV{'HTTP_HOST'}//; - $feedurl=&Apache::lonnet::declutter($feedurl); - my $symb=&Apache::lonnet::symbread($feedurl); + $feedurl=&Apache::lonnet::declutter($feedurl); + + my $title=&Apache::lonnet::gettitle($feedurl); + my $showurl=&Apache::lonenc::check_encrypt($feedurl); my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//); - my $prefix=$ENV{'user.name.'}.'@'.$ENV{'user.domain'}.'___'. + my $prefix=$ENV{'user.name'}.'@'.$ENV{'user.domain'}.'___'. $feedurl.'___'; my @items=('correct','helpful','depth','clear','technical','comments', @@ -66,7 +71,7 @@ sub handler { my @retrieve=map{ $prefix.$_ } @items; my %currenteval= - &Apache::lonnet::get('resevaldata',\@retrieve,$rdomain,$rauth); + &Apache::lonnet::get('nohist_resevaldata',\@retrieve,$rdomain,$rauth); my $already=($currenteval{$prefix.'timestamp'} ne ''); @@ -74,6 +79,8 @@ sub handler { my $warning=''; + my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource'); + if ($ENV{'form.submiteval'} eq 'true') { # ------------------------------------------------ User is submitting something my $complete=1; @@ -85,27 +92,37 @@ sub handler { } } if ($complete) { + my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl)); $r->print(< Evaluation submitted + - - +$bodytag

Thank you for your input!

ENDHEADER $r->print('Storing feedback: '. - &Apache::lonnet::put('resevaldata',\%currenteval,$rdomain,$rauth)); + &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth)); unless ($already) { $r->print('
Logging first evaluation'); } - $r->print(''); + $r->print( + ''); return OK; } else { $warning='Please fill out all fields below'; } - + } # ---------------------------------------------------------- Dial in old values @@ -114,7 +131,8 @@ ENDHEADER foreach my $item (@items) { unless ($item eq 'comments') { - unless ($item eq 'timestamp') { + unless (($item eq 'timestamp') || + (!defined($currenteval{$prefix.$item}))) { $dialold.= 'document.evaluation.'.$item.'.selectedIndex='. $currenteval{$prefix.$item}.";\n"; @@ -123,7 +141,6 @@ ENDHEADER $oldcomments=$currenteval{$prefix.$item}; } } - # ------------------------------------------------------- Print out eval screen my $standardoptions=(<- @@ -139,14 +156,13 @@ ENDOPTIONS The LearningOnline Network with CAPA - -

Evaluate Resource

-$feedurl

+$bodytag +$title

$warning

Please rank the following criteria:
- + The material appears to be correct