[popfile-commit] engine/UI HTML.pm,1.107,1.108

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv11237/UI

Modified Files:
	HTML.pm 
Log Message:
Magnets now work

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** HTML.pm	5 Mar 2003 21:36:58 -0000	1.107
--- HTML.pm	5 Mar 2003 21:58:21 -0000	1.108
***************
*** 1318,1322 ****
          my $found = 0;
          for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!             if ( defined($self->{classifier__}->{magnets}{$bucket}{$self->{form__}{type}}{$self->{form__}{text}}) ) {
                  $found  = 1;
                  $magnet_message = "<blockquote>\n<div class=\"error02\">\n<b>";
--- 1318,1323 ----
          my $found = 0;
          for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!             my %magnets = $self->{classifier__}->get_magnets( $bucket, $self->{form__}{type} );
!             if ( defined( $magnets{$self->{form__}{text}}) ) {
                  $found  = 1;
                  $magnet_message = "<blockquote>\n<div class=\"error02\">\n<b>";
***************
*** 1327,1332 ****
  
          if ( $found == 0 )  {
!             for my $bucket (keys %{$self->{classifier__}->{magnets}}) {
!                 for my $from (keys %{$self->{classifier__}->{magnets}{$bucket}{$self->{form__}{type}}})  {
                      if ( ( $self->{form__}{text} =~ /\Q$from\E/ ) || ( $from =~ /\Q$self->{form__}{text}\E/ ) )  {
                          $found = 1;
--- 1328,1334 ----
  
          if ( $found == 0 )  {
!             for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!             my %magnets = $self->{classifier__}->get_magnets( $bucket, $self->{form__}{type} );
!                 for my $from (keys %magnets)  {
                      if ( ( $self->{form__}{text} =~ /\Q$from\E/ ) || ( $from =~ /\Q$self->{form__}{text}\E/ ) )  {
                          $found = 1;
***************
*** 1347,1359 ****
              $self->{form__}{text} =~ s/[ \t]+$//;
  
!             $self->{classifier__}->{magnets}{$self->{form__}{bucket}}{$self->{form__}{type}}{$self->{form__}{text}} = 1;
              $magnet_message = "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$self->{form__}{type}: $self->{form__}{text}", $self->{form__}{bucket} ) . "</blockquote>";
-             $self->{classifier__}->save_magnets();
          }
      }
  
      if ( defined($self->{form__}{dtype}) )  {
!         delete $self->{classifier__}->{magnets}{$self->{form__}{bucket}}{$self->{form__}{dtype}}{$self->{form__}{dmagnet}};
!         $self->{classifier__}->save_magnets();
      }
  
--- 1349,1359 ----
              $self->{form__}{text} =~ s/[ \t]+$//;
  
! 	    $self->{classifier__}->create_magnet( $self->{form__}{bucket}, $self->{form__}{type}, $self->{form__}{text});
              $magnet_message = "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$self->{form__}{type}: $self->{form__}{text}", $self->{form__}{bucket} ) . "</blockquote>";
          }
      }
  
      if ( defined($self->{form__}{dtype}) )  {
!         $self->{classifier__}->delete_magnet( $self->{form__}{bucket}, $self->{form__}{dtype}, $self->{form__}{dmagnet});
      }
  
***************
*** 1370,1376 ****
      # magnet listing
      my $stripe = 0;
!     for my $bucket (sort keys %{$self->{classifier__}->{magnets}}) {
!         for my $type (sort keys %{$self->{classifier__}->{magnets}{$bucket}}) {
!             for my $magnet (sort keys %{$self->{classifier__}->{magnets}{$bucket}{$type}})  {
                  $body .= "<tr ";
                  if ( $stripe )  {
--- 1370,1376 ----
      # magnet listing
      my $stripe = 0;
!     for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!         for my $type ($self->{classifier__}->get_magnet_types_in_bucket($bucket)) {
!             for my $magnet ($self->{classifier__}->get_magnets( $bucket, $type))  {
                  $body .= "<tr ";
                  if ( $stripe )  {
***************
*** 2897,2901 ****
                  $body .= "<td class=\"top20\" valign=\"top\">\n";
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form__}{view}");
!                 $body .= $self->{classifier__}->{scores};
                  $body .= "</td>\n</tr>\n";
              }
--- 2897,2901 ----
                  $body .= "<td class=\"top20\" valign=\"top\">\n";
                  $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . "$self->{form__}{view}");
!                 $body .= $self->{classifier__}->{scores__};
                  $body .= "</td>\n</tr>\n";
              }