Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23951/UI
Modified Files:
HTML.pm
Log Message:
Make template system work even with strict-params enabled. Had to remove some cruft
to make this work and I removed Jim's patches from HTML.pm and corpus-page.thtml.
I want to try and get the best out of Jim's and Brian's corpus page, but a fresh
start seems to be the best solution.
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.359
retrieving revision 1.360
diff -C2 -d -r1.359 -r1.360
*** HTML.pm 24 Sep 2005 20:10:41 -0000 1.359
--- HTML.pm 28 Sep 2005 18:48:36 -0000 1.360
***************
*** 820,824 ****
$selected = -1 if ( !defined( $selected ) );
! my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' );
$tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) );
--- 820,824 ----
$selected = -1 if ( !defined( $selected ) );
! my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' );
$tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) );
***************
*** 1155,1159 ****
$templ->param( 'Security_If_Local' => ( $self->config_( 'local' ) == 1 ) );
! $templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) );
$templ->param( 'Security_If_Update_Check' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) == 1 ) );
$templ->param( 'Security_If_Send_Stats' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) == 1 ) );
--- 1155,1159 ----
$templ->param( 'Security_If_Local' => ( $self->config_( 'local' ) == 1 ) );
! #$templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) );
$templ->param( 'Security_If_Update_Check' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) == 1 ) );
$templ->param( 'Security_If_Send_Stats' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) == 1 ) );
***************
*** 2125,2129 ****
$bucket_row_data{bar_bucket_name2} = $bucket;
$bucket_row_data{bar_width} = $percent;
! $bucket_row_data{Skin_Root} = $self->{skin_root};
}
else {
--- 2125,2129 ----
$bucket_row_data{bar_bucket_name2} = $bucket;
$bucket_row_data{bar_width} = $percent;
! #$bucket_row_data{Skin_Root} = $self->{skin_root};
}
else {
***************
*** 2277,2302 ****
my @corpus_data;
-
- #***** Jim's stuff 1 *****
- my $total_messages = $self->mcount__( $session );
- if ( $total_messages != 0 ) {
- $templ->param( 'Corpus_If_Message_Count' => 1 );
- }
- else {
- $templ->param( 'Corpus_If_Message_Count' => 0 );
- }
- my $total_words = 0;
- for my $bucket (@buckets) {
- $total_words += $self->classifier_()->get_bucket_word_count( $session, $bucket );
- }
- $templ->param( 'Corpus_Word_Count' => $self->pretty_number( $total_words ) );
- if ( $total_words != 0 ) {
- $templ->param( 'Corpus_If_Word_Count' => 1 );
- }
- else {
- $templ->param( 'Corpus_If_Word_Count' => 0 );
- }
- #**** end Jim's stuff 1 ****
-
foreach my $bucket ( @buckets ) {
my %row_data;
--- 2277,2280 ----
***************
*** 2316,2365 ****
push ( @color_data, \%color_row );
}
- $row_data{Localize_Apply} = $self->{language__}{Apply};
$row_data{Corpus_Loop_Loop_Colors} = \@color_data;
! #************ Jim's stuff 2 *********
! my $messages = $self->get_bucket_parameter__( $session, $bucket, 'count' ) || 0;
! if ( $total_messages == 0 ) {
! $total_messages = 1; # prevent div by 0 with empty corpus (needs better solution)
! }
! $row_data{Bucket_Message_Percent} = sprintf( "%.2f", ( 100 * ( $messages / $total_messages ) ) );
! $row_data{Bucket_Message_Count} = $self->pretty_number( $messages );
! my $positives = $self->get_bucket_parameter__($session, $bucket, 'fpcount' ) || 0;
! $row_data{Bucket_False_Positive} = $self->pretty_number( $positives );
! if ( ( $total_messages - $messages ) == 0 ) {
! $row_data{Bucket_Strike_Rate} = "n/a";
! }
! else {
! $row_data{Bucket_Strike_Rate} = sprintf( "%.2f%%", ( 100 * ( $positives ) / ( $total_messages - $messages ) ) );
! }
! my $negatives = $self->get_bucket_parameter__( $session, $bucket, 'fncount' ) || 0;
! $row_data{Bucket_False_Negative} = $self->pretty_number( $negatives );
! if ( ( $messages + $negatives ) == 0 ) {
! $row_data{Bucket_Hit_Rate} = "n/a";
! }
! else {
! $row_data{Bucket_Hit_Rate} = sprintf( "%.2f%%", ( 100 * ( $messages ) / ( $messages + $negatives ) ) );
! }
! my $words = $self->classifier_()->get_bucket_word_count( $session, $bucket ) || 0;
! $row_data{Bucket_Word_Count} = $self->pretty_number( $words );
! if ( $total_words != 0 ) {
! $row_data{Bucket_Word_Percent} = sprintf( "%.2f", ( 100 * ( $words / $total_words ) ) );
! }
! else {
! $row_data{Bucket_Word_Percent} = " ";
! }
! if ( $messages != 0 ) {
! $row_data{Bar_If_Message_Count} = 1;
! }
! else {
! $row_data{Bar_If_Message_Count} = 0;
! }
! if ( $words != 0 ) {
! $row_data{Bar_If_Word_Count} = 1;
! }
! else {
! $row_data{Bar_If_Word_Count} = 0;
! }
! #********* end Jim's stuff 2 ********
push ( @corpus_data, \%row_data );
}
--- 2294,2299 ----
push ( @color_data, \%color_row );
}
$row_data{Corpus_Loop_Loop_Colors} = \@color_data;
!
push ( @corpus_data, \%row_data );
}
***************
*** 2983,2987 ****
$row_data{Localize_tip_History_MoveLeft} = $self->{language__}{tip_History_MoveLeft};
$row_data{Localize_tip_History_MoveRight} = $self->{language__}{tip_History_MoveRight};
- $row_data{Skin_Root} = $self->{skin_root};
push ( @header_data, \%row_data );
$length -= 10;
--- 2917,2920 ----
***************
*** 3018,3022 ****
foreach my $row (@rows) {
my %row_data;
! my $mail_file = $row_data{History_Mail_File} = $$row[0];
my @column_data;
my @cols = split(',', $self->user_config_( $self->{sessions__}{$session}{user}, 'columns' ));
--- 2951,2955 ----
foreach my $row (@rows) {
my %row_data;
! my $mail_file = $$row[0];
my @column_data;
my @cols = split(',', $self->user_config_( $self->{sessions__}{$session}{user}, 'columns' ));
***************
*** 3054,3058 ****
if ($header eq 'subject') {
$col_data{History_If_Subject_Column} = 1;
!
if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' ) {
# Remove wrong characters as euc-jp.
--- 2987,2991 ----
if ($header eq 'subject') {
$col_data{History_If_Subject_Column} = 1;
!
if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' ) {
# Remove wrong characters as euc-jp.
***************
*** 3102,3108 ****
$col_data{History_If_Bucket_Column} = 1;
my $bucket = $col_data{History_Bucket} = $$row[8];
! $col_data{History_If_Magnetized} = ($$row[11] ne '');
! $col_data{History_Magnet} = $$row[11];
! $col_data{Skin_Root} = $self->{skin_root};
$col_data{History_If_Not_Pseudo} =
!$self->classifier_()->is_pseudo_bucket(
--- 3035,3042 ----
$col_data{History_If_Bucket_Column} = 1;
my $bucket = $col_data{History_Bucket} = $$row[8];
! if ( $$row[11] ne '' ) {
! $col_data{History_If_Magnetized} = 1;
! $col_data{History_Magnet} = $$row[11];
! }
$col_data{History_If_Not_Pseudo} =
!$self->classifier_()->is_pseudo_bucket(
|
