[popfile-commit] engine/UI HTML.pm,1.73,1.74

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

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

Modified Files:
	HTML.pm 
Log Message:
Merge helphand patch that prevents various unintialized variable warnings, greatly improves URL encoding and makes loading of the corpus safer so that corrupted information in the corpus is discarded

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** HTML.pm	19 Feb 2003 17:30:32 -0000	1.73
--- HTML.pm	20 Feb 2003 16:25:54 -0000	1.74
***************
*** 1149,1167 ****
  # ---------------------------------------------------------------------------------------------
  #
! # encode
  #
  # $text     Text to encode for URL safety
  #
! # Encode a URL so that it can be safely passed in a URL
  #
  # ---------------------------------------------------------------------------------------------
  
! sub encode
  {
      my ( $self, $text ) = @_;
  
      $text =~ s/ /\+/;
!     $text =~ s/%/%25/g;
!     $text =~ s/#/%23/g;
  
      return $text;
--- 1149,1166 ----
  # ---------------------------------------------------------------------------------------------
  #
! # url_encode
  #
  # $text     Text to encode for URL safety
  #
! # Encode a URL so that it can be safely passed in a URL as per RFC2396
  #
  # ---------------------------------------------------------------------------------------------
  
! sub url_encode
  {
      my ( $self, $text ) = @_;
  
      $text =~ s/ /\+/;
!     $text =~ s/([^a-zA-Z0-9_\-.+])/sprintf("%%%02x",ord($1))/eg;
  
      return $text;
***************
*** 1245,1249 ****
                  $body .= "<td><font color=\"$self->{classifier}->{colors}{$bucket}\">$bucket</font></td>\n" ;
                  $body .= "<td><a class=\"removeLink\" href=\"/magnets?bucket=$bucket&amp;dtype=$type&amp;";
!                 $body .= encode($self, "dmagnet=$validatingMagnet");
                  $body .= "&amp;session=$self->{session_key}\">\n[$self->{language}{Delete}]</a></td>\n";
                  $body .= "</tr>";
--- 1244,1248 ----
                  $body .= "<td><font color=\"$self->{classifier}->{colors}{$bucket}\">$bucket</font></td>\n" ;
                  $body .= "<td><a class=\"removeLink\" href=\"/magnets?bucket=$bucket&amp;dtype=$type&amp;";
!                 $body .= "dmagnet=" . url_encode($self, $validatingMagnet);
                  $body .= "&amp;session=$self->{session_key}\">\n[$self->{language}{Delete}]</a></td>\n";
                  $body .= "</tr>";
***************
*** 1346,1350 ****
              # Add the link to the corpus lookup
  
!             $j =~ s/([^ ,\*]+) ([^ ,\*]+)/"<a class=\"wordListLink\" href=\"\/buckets\?session=$self->{session_key}\&amp;lookup=Lookup\&amp;word=" . encode($self,$1) . "#Lookup\">$1<\/a> $2"/ge;
  
              # Add the bucket color if this word was used this session. IMPORTANT: this regex relies
--- 1345,1349 ----
              # Add the link to the corpus lookup
  
!             $j =~ s/([^ ,\*]+) ([^ ,\*]+)/"<a class=\"wordListLink\" href=\"\/buckets\?session=$self->{session_key}\&amp;lookup=Lookup\&amp;word=" . url_encode($self,$1) . "#Lookup\">$1<\/a> $2"/ge;
  
              # Add the bucket color if this word was used this session. IMPORTANT: this regex relies
***************
*** 1457,1466 ****
      }
  
!     if ( ( defined($self->{form}{bucket}) ) && ( $self->{form}{subject} > 0 ) ) {
          $self->{classifier}->{parameters}{$self->{form}{bucket}}{subject} = $self->{form}{subject} - 1;
          $self->{classifier}->write_parameters();
      }
  
!     if ( ( defined($self->{form}{bucket}) ) && ( $self->{form}{quarantine} > 0 ) ) {
          $self->{classifier}->{parameters}{$self->{form}{bucket}}{quarantine} = $self->{form}{quarantine} - 1;
          $self->{classifier}->write_parameters();
--- 1456,1465 ----
      }
  
!     if ( ( defined($self->{form}{bucket}) ) && ( defined($self->{form}{subject}) ) && ( $self->{form}{subject} > 0 ) ) {
          $self->{classifier}->{parameters}{$self->{form}{bucket}}{subject} = $self->{form}{subject} - 1;
          $self->{classifier}->write_parameters();
      }
  
!     if ( ( defined($self->{form}{bucket}) ) &&  ( defined($self->{form}{quarantine}) ) && ( $self->{form}{quarantine} > 0 ) ) {
          $self->{classifier}->{parameters}{$self->{form}{bucket}}{quarantine} = $self->{form}{quarantine} - 1;
          $self->{classifier}->write_parameters();
***************
*** 1471,1475 ****
              $create_message = "<blockquote><div class=\"error01\">$self->{language}{Bucket_Error1}</div></blockquote>";
          } else {
!             if ( $self->{classifier}->{total}{$self->{form}{cname}} > 0 )  {
                  $create_message = "<blockquote><b>" . sprintf( $self->{language}{Bucket_Error2}, $self->{form}{cname} ) . "</b></blockquote>";
              } else {
--- 1470,1474 ----
              $create_message = "<blockquote><div class=\"error01\">$self->{language}{Bucket_Error1}</div></blockquote>";
          } else {
!             if ( ( defined($self->{classifier}->{total}{$self->{form}{cname}}) ) && ( $self->{classifier}->{total}{$self->{form}{cname}} > 0 ) )  {
                  $create_message = "<blockquote><b>" . sprintf( $self->{language}{Bucket_Error2}, $self->{form}{cname} ) . "</b></blockquote>";
              } else {
***************
*** 2150,2154 ****
                              next;
                          }
!                         $temp_words{$newbucket}{$1} = $2 if ( /(.+) (.+)/ );
                      }
                      close WORDS;
--- 2149,2153 ----
                              next;
                          }
!                         $temp_words{$newbucket}{$1} = $2 if ( /([^\s]+) (\d+)/ );
                      }
                      close WORDS;
***************
*** 2243,2249 ****
                              next;
                          }
! 
!                         $temp_words{$bucket}{$1} = $2 if ( /(.+) (.+)/ );
!                     }
                       close WORDS;
                  }
--- 2242,2246 ----
                              next;
                          }
!                         $temp_words{$bucket}{$1} = $2 if ( /([^\s]+) (\d+)/ );                    }
                       close WORDS;
                  }