--- loncom/interface/statistics/lonstathelpers.pm 2004/11/03 16:13:08 1.29 +++ loncom/interface/statistics/lonstathelpers.pm 2008/10/30 17:45:25 1.56 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.29 2004/11/03 16:13:08 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.56 2008/10/30 17:45:25 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,7 @@ routines that are needed across multiple package Apache::lonstathelpers; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -60,6 +60,9 @@ use Time::Local(); use Spreadsheet::WriteExcel(); use GDBM_File; use Storable qw(freeze thaw); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + #################################################### #################################################### @@ -68,8 +71,7 @@ use Storable qw(freeze thaw); =item &render_resource($resource) -Input: a resource generated from -&Apache::loncoursedata::get_sequence_assessment_data(). +Input: a navmaps resource Retunrs: a scalar containing html for a rendering of the problem within a table. @@ -82,11 +84,10 @@ sub render_resource { my ($resource) = @_; ## ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}); + my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); + $base="http://".$ENV{'SERVER_NAME'}.$base; + my ($src,$symb)=($resource->link,&escape($resource->shown_symb)); + my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; return ''.$/; } else { if (defined($target)) { @@ -326,15 +348,10 @@ sub new_accumulator { sub get_selected_symbs { my ($inputfield) = @_; my $field = 'form.'.$inputfield; - my @Symbs; - if (exists($ENV{$field})) { - if (! ref($ENV{$field})) { - @Symbs = (&Apache::lonnet::unescape($ENV{$field})); - } else { - @Symbs = (map {&Apache::lonnet::unescape($_);} @{$ENV{$field}}); - } - } - return @Symbs; + my @symbs = (map { + &unescape($_); + } &Apache::loncommon::get_env_multiple($field)); + return @symbs; } #################################################### @@ -359,10 +376,10 @@ Used by Apache::lonstathelpers::ProblemS #################################################### sub make_target_id { my ($target) = @_; - my $id = &Apache::lonnet::escape($target->{'symb'}).':'. - &Apache::lonnet::escape($target->{'part'}).':'. - &Apache::lonnet::escape($target->{'respid'}).':'. - &Apache::lonnet::escape($target->{'resptype'}); + my $id = &escape($target->{'symb'}).':'. + &escape($target->{'part'}).':'. + &escape($target->{'respid'}).':'. + &escape($target->{'resptype'}); return $id; } @@ -387,18 +404,18 @@ sub get_target_from_id { my ($id) = @_; if (! ref($id)) { my ($symb,$part,$respid,$resptype) = split(':',$id); - return ({ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + return ({ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } elsif (ref($id) eq 'ARRAY') { my @Return; foreach my $selected (@$id) { my ($symb,$part,$respid,$resptype) = split(':',$selected); - push(@Return,{ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + push(@Return,{ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } return \@Return; } @@ -417,7 +434,7 @@ current resource. Inputs: $target (see &Apache::lonstathelpers::get_target_from_id()) $AcceptableResponseTypes, regular expression matching acceptable response types, - $granularity, either 'part', 'response', or 'part_survey' + $granularity, either 'part', 'response', 'part_survey', or 'part_task' Returns: three hash references, $prev, $curr, $next, which refer to the preceeding, current, or following problem parts or responses, depending @@ -440,36 +457,46 @@ sub get_prev_curr_next { # # Build an array with the data we need to search through my @Resource; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - if ($partdata->{'Survey'} && ($granularity eq 'part_survey')){ + my ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments('all'); + return $navmap if (! ref($navmap)); + foreach my $seq (@sequences) { + my @resources = &get_resources($navmap,$seq); + foreach my $res (@resources) { + foreach my $part (@{$res->parts}) { + if ($res->is_survey($part) && ($granularity eq 'part_survey')){ + push (@Resource, + { symb => $res->symb, + part => $part, + resource => $res, + } ); + } elsif ($res->is_task($part) && ($granularity eq 'part_task')){ push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, part => $part, resource => $res, } ); } elsif ($granularity eq 'part') { push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, part => $part, resource => $res, } ); } elsif ($granularity eq 'response') { + my @response_ids = $res->responseIds($part); + my @response_types = $res->responseType($part); for (my $i=0; - $i{'ResponseTypes'}}); + $i{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; + my $respid = $response_ids[$i]; + my $resptype = $response_types[$i]; next if ($resptype !~ m/$AcceptableResponseTypes/); push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, part => $part, - respid => $partdata->{'ResponseIds'}->[$i], + respid => $respid, + resptype => $resptype, resource => $res, - resptype => $resptype } ); } } @@ -481,7 +508,7 @@ sub get_prev_curr_next { my $curr_idx; for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} eq $target->{'symb'} && $curr_item->{'part'} eq $target->{'part'}) { last; @@ -496,7 +523,7 @@ sub get_prev_curr_next { } } my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} ne $target->{'symb'} || $curr_item->{'part'} ne $target->{'part'}) { # bogus symb - return nothing @@ -527,7 +554,7 @@ sub get_prev_curr_next { $curr = $Resource[$curr_idx ]; $next = $Resource[$curr_idx+1]; } - return ($prev,$curr,$next); + return ($navmap,$prev,$curr,$next); } @@ -555,6 +582,7 @@ Returns: nothing ##################################################### sub GetStudentAnswers { my ($r,$problem,$Students,$formname,$inputname) = @_; + my %answers; my $status_type; if (defined($formname)) { $status_type = 'inline'; @@ -578,10 +606,11 @@ sub GetStudentAnswers { last if ($c->aborted()); my $sname = $student->{'username'}; my $sdom = $student->{'domain'}; - my $answer = &Apache::lonstathelpers::analyze_problem_as_student + my $answer = &Apache::lonstathelpers::get_student_answer ($resource,$sname,$sdom,$partid,$respid); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); + $answers{$answer}++; $student->{'answer'} = $answer; } &Apache::lonstathelpers::write_analysis_cache(); @@ -589,7 +618,7 @@ sub GetStudentAnswers { $r->rflush(); # close progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - return; + return \%answers; } ##################################################### @@ -599,27 +628,19 @@ sub GetStudentAnswers { =item analyze_problem_as_student -Analyzes a homework problem for a student and returns the correct answer -for the student. Attempts to put together an answer for problem types -that do not natively support it. +Analyzes a homework problem for a student Inputs: $resource: a resource object $sname, $sdom, $partid, $respid -Returns: $answer - -If $partid and $respid are specified, $answer is simply a scalar containing -the correct answer for the response. - -If $partid or $respid are undefined, $answer will be a hash reference with -keys $partid.'.'.$respid.'.answer'. +Returns: the problem analysis hash =cut ##################################################### ##################################################### sub analyze_problem_as_student { - my ($resource,$sname,$sdom,$partid,$respid) = @_; + my ($resource,$sname,$sdom) = @_; if (ref($resource) ne 'HASH') { my $res = $resource; $resource = { 'src' => $res->src, @@ -630,13 +651,11 @@ sub analyze_problem_as_student { [$res->responseIds($part)]; } } - my $returnvalue; my $url = $resource->{'src'}; my $symb = $resource->{'symb'}; my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); if (! defined($analysis)) { - &Apache::lonnet::logthis('uncached analysis'); - my $courseid = $ENV{'request.course.id'}; + my $courseid = $env{'request.course.id'}; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', 'grade_domain' => $sdom, 'grade_username' => $sname, @@ -647,15 +666,62 @@ sub analyze_problem_as_student { } my %Answer=&Apache::lonnet::str2hash($analysis); # + return \%Answer; +} + +##################################################### +##################################################### + +=pod + +=item get_student_answer + +Analyzes a homework problem for a particular student and returns the correct +answer. Attempts to put together an answer for problem types +that do not natively support it. + +Inputs: $resource: a resource object (from navmaps or hash from loncoursedata) + $sname, $sdom, $partid, $respid + +Returns: $answer + +If $partid and $respid are specified, $answer is simply a scalar containing +the correct answer for the response. + +If $partid or $respid are undefined, $answer will be a hash reference with +keys $partid.'.'.$respid.'.answer'. + +=cut + +##################################################### +##################################################### +sub get_student_answer { + my ($resource,$sname,$sdom,$partid,$respid) = @_; + # + if (ref($resource) ne 'HASH') { + my $res = $resource; + $resource = { 'src' => $res->src, + 'symb' => $res->symb, + 'parts' => $res->parts }; + foreach my $part (@{$resource->{'parts'}}) { + $resource->{'partdata'}->{$part}->{'ResponseIds'}= + [$res->responseIds($part)]; + } + } + # + my $analysis = + &analyze_problem_as_student($resource,$sname,$sdom); my $answer; foreach my $partid (@{$resource->{'parts'}}) { my $partdata = $resource->{'partdata'}->{$partid}; foreach my $respid (@{$partdata->{'ResponseIds'}}) { my $prefix = $partid.'.'.$respid; my $key = $prefix.'.answer'; - $answer->{$partid}->{$respid} = &get_answer($prefix,$key,%Answer); + $answer->{$partid}->{$respid} = + &get_answer($prefix,$key,%$analysis); } } + my $returnvalue; if (! defined($partid)) { $returnvalue = $answer; } elsif (! defined($respid)) { @@ -670,11 +736,16 @@ sub get_answer { my ($prefix,$key,%Answer) = @_; my $returnvalue; if (exists($Answer{$key})) { - my $student_answer = $Answer{$key}->[0]; - if (! defined($student_answer)) { - $student_answer = $Answer{$key}->[1]; - } - $returnvalue = $student_answer; + if (ref($Answer{$key}) eq 'HASH') { + my $which = 'INTERNAL'; + if (!exists($Answer{$key}{$which})) { + $which = (sort(keys(%{ $Answer{$key} })))[0]; + } + my $student_answer = $Answer{$key}{$which}[0][0]; + $returnvalue = $student_answer; + } else { + &Apache::lonnet::logthis("error analyzing problem. got a answer of type ".ref($Answer{$key})); + } } else { if (exists($Answer{$prefix.'.shown'})) { # The response has foils @@ -732,7 +803,7 @@ sub load_analysis_cache { my $storedstring; my %cache_db; if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_READER(),0640)) { - $storedstring = $cache_db{&Apache::lonnet::escape($symb)}; + $storedstring = $cache_db{&escape($symb)}; untie(%cache_db); } if (defined($storedstring)) { @@ -784,7 +855,7 @@ Writes the in memory cache to disk so th sub write_analysis_cache { return if (! defined($current_symb) || ! defined($cache_filename)); my %cache_db; - my $key = &Apache::lonnet::escape($current_symb); + my $key = &escape($current_symb); if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_WRCREAT(),0640)) { my $storestring = freeze(\%cache); $cache_db{$key}=$storestring; @@ -813,7 +884,7 @@ prior to every analysis lookup. ##################################################### sub ensure_proper_cache { my ($symb) = @_; - my $cid = $ENV{'request.course.id'}; + my $cid = $env{'request.course.id'}; my $new_filename = '/home/httpd/perl/tmp/'. 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || @@ -1078,8 +1149,8 @@ sub get_problem_data { } } # End of logging code - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; + next if ($key !~ /^\Q$part\E/); + $key =~ s/^\Q$part\E\.//; if (ref($value) eq 'ARRAY') { if ($key eq 'options') { $Partdata{$part}->{'_Options'}=$value; @@ -1093,7 +1164,7 @@ sub get_problem_data { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } - } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high|str_type)$/) { + } elsif ($key =~ /^(unit|incorrect|answer|ans_low|ans_high|str_type)$/) { $Partdata{$part}->{$key}=$value; } } else { @@ -1202,7 +1273,7 @@ sub limit_by_time_form { } $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" '; $timecheckbox .= ' />'; - $Str .= ''.&mt('[_1] Limit by time',$timecheckbox).''; + $Str .= ''; $Str .= &mt('Start Time: [_1]',$startdateform).'
'; $Str .= &mt(' End Time: [_1]',$enddateform).'
'; $Str .= ''; @@ -1210,8 +1281,8 @@ sub limit_by_time_form { } sub limit_by_time { - if (exists($ENV{'form.limit_by_time'}) && - $ENV{'form.limit_by_time'} ne '' ) { + if (exists($env{'form.limit_by_time'}) && + $env{'form.limit_by_time'} ne '' ) { return 1; } else { return 0; @@ -1226,43 +1297,6 @@ sub get_time_limits { return ($starttime,$endtime); } - - -#################################################### -#################################################### - -=pod - -=item sections_description - -Inputs: @Sections, an array of sections - -Returns: A text description of the sections selected. - -=cut - -#################################################### -#################################################### -sub sections_description { - my @Sections = @_; - my $sectionstring = ''; - if (scalar(@Sections) > 1) { - if (scalar(@Sections) > 2) { - my $last = pop(@Sections); - $sectionstring = "Sections ".join(', ',@Sections).', and '.$last; - } else { - $sectionstring = "Sections ".join(' and ',@Sections); - } - } else { - if ($Sections[0] eq 'all') { - $sectionstring = "All sections"; - } else { - $sectionstring = "Section ".$Sections[0]; - } - } - return $sectionstring; -} - #################################################### #################################################### @@ -1284,24 +1318,25 @@ sub manage_caches { my $sectionkey = join(',', map { - &Apache::lonnet::escape($_); - } sort(@Apache::lonstatistics::SelectedSections) + &escape($_); + } sort(&Apache::lonstatistics::get_selected_sections()) ); my $statuskey = $Apache::lonstatistics::enrollment_status; - if (exists($ENV{'form.ClearCache'}) || - exists($ENV{'form.updatecaches'}) || - (exists($ENV{'form.firstrun'}) && $ENV{'form.firstrun'} ne 'no') || - (exists($ENV{'form.prevsection'}) && - $ENV{'form.prevsection'} ne $sectionkey) || - (exists($ENV{'form.prevenrollstatus'}) && - $ENV{'form.prevenrollstatus'} ne $statuskey) + if (exists($env{'form.ClearCache'}) || + exists($env{'form.updatecaches'}) || + (exists($env{'form.firstrun'}) && $env{'form.firstrun'} ne 'no') || + (exists($env{'form.prevsection'}) && + $env{'form.prevsection'} ne $sectionkey) || + (exists($env{'form.prevenrollstatus'}) && + $env{'form.prevenrollstatus'} ne $statuskey) ) { if (defined($update_message)) { $r->print($update_message); } - &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname, - $inputname); - + if (0) { + &Apache::lonnet::logthis('Updating mysql student data caches'); + } + &gather_full_student_data($r,$formname,$inputname); } # my @Buttons = @@ -1314,7 +1349,7 @@ sub manage_caches { '' ); # - if (! exists($ENV{'form.firstrun'})) { + if (! exists($env{'form.firstrun'})) { $r->print(''); } else { $r->print(''); @@ -1323,8 +1358,90 @@ sub manage_caches { return @Buttons; } +sub gather_full_student_data { + my ($r,$formname,$inputname) = @_; + my $status_type; + if (defined($formname)) { + $status_type = 'inline'; + } else { + $status_type = 'popup'; + } + my $c = $r->connection(); + # + &Apache::loncoursedata::clear_internal_caches(); + # + my @Students = @Apache::lonstatistics::Students; + # + # Open the progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,&mt('Student Data Compilation Status'), + &mt('Student Data Compilation Progress'), scalar(@Students), + $status_type,undef,$formname,$inputname); + # + while (my $student = shift @Students) { + return if ($c->aborted()); + my $status = &Apache::loncoursedata::ensure_current_full_data + ($student->{'username'},$student->{'domain'}, + $env{'request.course.id'}); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->rflush(); + return; +} + +#################################################### +#################################################### + +=pod + +=item &submission_report_form +Input: The originating reportSelected value for the current stats page. +Output: Scalar containing HTML with needed form elements and a link to +the student submission reports page. + +=cut + +#################################################### +#################################################### +sub submission_report_form { + my ($original_report) = @_; + # Note: In the link below we change the reportSelected value. If + # the user hits the 'back' button on the browser after getting their + # student submissions report, this value may still be around. So we + # output a script block to set it properly. If the $original_report + # value is unset, you are just asking for trouble. + if (! defined($original_report)) { + &Apache::lonnet::logthis + ('someone called lonstathelpers::submission_report_form without '. + ' enough input.'); + } + my $html = $/. + ''. + ''. + ''. + ''; + my $output_selector = $/.''.$/; + my $link = ''; + $html.= &mt('View data as [_1] [_2]go[_3]',$output_selector, + $link,'').$/; + return $html +} #################################################### ####################################################
'. @@ -100,7 +101,26 @@ sub render_resource { =pod -=item &ProblemSelector($AcceptedResponseTypes) +=item &get_resources + +=cut + +#################################################### +#################################################### +sub get_resources { + my ($navmap,$sequence) = @_; + my @resources = $navmap->retrieveResources($sequence, + sub { shift->is_problem(); }, + 0,0,0); + return @resources; +} + +#################################################### +#################################################### + +=pod + +=item &problem_selector($AcceptedResponseTypes) Input: scalar containing regular expression which matches response types to show. '.' will yield all, '(option|radiobutton)' will match @@ -114,43 +134,46 @@ Skips 'survey' problems. #################################################### #################################################### -sub ProblemSelector { - my ($AcceptedResponseTypes) = @_; +sub problem_selector { + my ($AcceptedResponseTypes,$sequence_addendum) = @_; my $Str; $Str = "\n\n"; my $rb_count =0; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { - next if ($seq->{'num_assess'}<1); + my ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments('all'); + return $navmap if (! ref($navmap)); # error + foreach my $seq (@sequences) { my $seq_str = ''; - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - for (my $i=0;$i{'ResponseTypes'}});$i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; + foreach my $res (&get_resources($navmap,$seq)) { + foreach my $part (@{$res->parts}) { + my @response_ids = $res->responseIds($part); + my @response_types = $res->responseType($part); + for (my $i=0;$i$res->{'symb'}, + my $value = &make_target_id({symb=>$res->symb, part=>$part, respid=>$respid, resptype=>$resptype}); my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { - $checked = 'checked '; + if ($env{'form.problemchoice'} eq $value) { + $checked = 'checked="checked" '; } - my $title = $res->{'title'}; + my $title = $res->compTitle; if (! defined($title) || $title eq '') { - ($title) = ($res->{'src'} =~ m:/([^/]*)$:); + ($title) = ($res->src =~ m:/([^/]*)$:); } $seq_str .= ''. qq{}. ''. '\n"; $rb_count++; } @@ -158,8 +181,15 @@ sub ProblemSelector { } } if ($seq_str ne '') { - $Str .= ''. + $Str .= ''. + ''. "\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= ''. + (''x2). + ''. + "\n"; + } } } $Str .= "
'; - if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { + if (scalar(@response_ids) > 1) { $seq_str .= &mt('response').' '.$respid; } + my $link = $res->link.'?symb='.&escape($res->shown_symb); $seq_str .= (' 'x2). - qq{view}; + ''.&mt('view').''; $seq_str .= "
 '.$seq->{'title'}.'
 '.$seq->compTitle.'
 '.$sequence_addendum.'
\n"; @@ -193,14 +223,15 @@ and their contents. A checkbox is provi #################################################### sub MultipleProblemSelector { my ($navmap,$inputname,$formname)=@_; - my $cid = $ENV{'request.course.id'}; + my $cid = $env{'request.course.id'}; my $Str; # Massage the input as needed. if (! defined($navmap)) { $navmap = Apache::lonnavmaps::navmap->new(); if (! defined($navmap)) { - $Str .= - '

'.&mt('Error: cannot process course structure').'

'; + $Str .= '
' + .&mt('Error: cannot process course structure') + .'
'; return $Str; } } @@ -234,7 +265,7 @@ END my $iterator = $navmap->getIterator(undef, undef, undef, 1); my $sequence_string; my $seq_id = 0; - my @Accumulator = (&new_accumulator($ENV{'course.'.$cid.'.description'}, + my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, '', '', $seq_id++, @@ -280,16 +311,6 @@ END return $Str; } -sub get_title { - my ($title,$src) = @_; - if ($title eq '') { - ($title) = ($src =~ m|/([^/]+)$|); - } else { - $title =~ s/\:/:/g; - } - return $title; -} - sub new_accumulator { my ($title,$src,$symb,$seq_id,$inputname) = @_; my $target; @@ -301,14 +322,15 @@ sub new_accumulator { $target.='
'. (' 'x2).'view'. + 'href="'.$res->link.'?symb='. + &escape($res->shown_symb).'">'.&mt('view').''. '