From: <ssc...@us...> - 2003-05-29 04:40:13
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1:/tmp/cvs-serv29366 Modified Files: HTML.pm Log Message: make start_message handling resulting from jump_to_message more precise Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.161 retrieving revision 1.162 diff -C2 -d -r1.161 -r1.162 *** HTML.pm 23 May 2003 16:05:53 -0000 1.161 --- HTML.pm 29 May 2003 04:40:09 -0000 1.162 *************** *** 3071,3074 **** --- 3071,3076 ---- my $bucket = $self->{history__}{$mail_file}{bucket}; my $color = $self->{classifier__}->get_bucket_color($bucket); + + my $page_size = $self->config_( 'page_size' ); $self->{form_}{sort} = '' if ( !defined( $self->{form_}{sort} ) ); *************** *** 3077,3081 **** my $index = -1; ! foreach my $i ( $start_message .. $start_message + $self->config_( 'page_size' ) - 1) { if ( $self->{history_keys__}[$i] eq $mail_file ) { $index = $i; --- 3079,3083 ---- my $index = -1; ! foreach my $i ( $start_message .. $start_message + $page_size - 1) { if ( $self->{history_keys__}[$i] eq $mail_file ) { $index = $i; *************** *** 3090,3095 **** foreach my $i ( 0 .. $self->history_size()-1 ) { if ( $self->{history_keys__}[$i] eq $mail_file ) { $index = $i; ! $start_message = $i; last; } --- 3092,3099 ---- foreach my $i ( 0 .. $self->history_size()-1 ) { if ( $self->{history_keys__}[$i] eq $mail_file ) { + use integer; $index = $i; ! $start_message = ($i / $page_size ) * $page_size; ! $self->{form_}{start_message} = $start_message; last; } *************** *** 3113,3117 **** if ( $index > 0 ) { $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index - 1 ]; ! $body .= "&start_message=". ((( $index - 1 ) >= $start_message )?$start_message:($start_message - $self->config_( 'page_size' ))); $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\">< "; $body .= $self->{language__}{Previous}; --- 3117,3121 ---- if ( $index > 0 ) { $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index - 1 ]; ! $body .= "&start_message=". ((( $index - 1 ) >= $start_message )?$start_message:($start_message - $page_size)); $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\">< "; $body .= $self->{language__}{Previous}; *************** *** 3121,3125 **** if ( $index < ( $self->history_size() - 1 ) ) { $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index + 1 ]; ! $body .= "&start_message=". ((( $index + 1 ) < ( $start_message + $self->config_( 'page_size' ) ) )?$start_message:($start_message + $self->config_( 'page_size' ))); $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\"> "; $body .= $self->{language__}{Next}; --- 3125,3129 ---- if ( $index < ( $self->history_size() - 1 ) ) { $body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index + 1 ]; ! $body .= "&start_message=". ((( $index + 1 ) < ( $start_message + $page_size ) )?$start_message:($start_message + $page_size)); $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\"> "; $body .= $self->{language__}{Next}; |