[popfile-commit] engine/Proxy POP3.pm,1.58,1.59

[<ssc...@us...>]

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv26651

Modified Files:
	POP3.pm 
Log Message:
cleanup toptoo comments, remove some dead code

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** POP3.pm	24 Jun 2003 13:38:27 -0000	1.58
--- POP3.pm	24 Jun 2003 16:07:20 -0000	1.59
***************
*** 248,259 ****
          #
          # 2. The toptoo configuration controls whether email downloaded using the
!         #    TOP command is classified or not (note that it is *never* placed in
!         #    the history; with the expection of (1) above).  There are two cases:
          #
          # 2a If toptoo is 0 then POPFile will pass a TOP from the client through
          #    as a TOP and do no classification on the message.
          #
!         # 2b If toptoo is 1 then POPFile first does a RETR on the message without
!         #    saving it in the history so that it can get the classification on the
          #    message which is stores in $class.  Then it gets the message again
          #    by sending the TOP command and passing the result through
--- 248,260 ----
          #
          # 2. The toptoo configuration controls whether email downloaded using the
!         #    TOP command is classified or not (It may be downloaded and cached for
!         #    bandwidth efficiency, and thus appear in the history).
!         #    There are two cases:
          #
          # 2a If toptoo is 0 then POPFile will pass a TOP from the client through
          #    as a TOP and do no classification on the message.
          #
!         # 2b If toptoo is 1 then POPFile first does a RETR on the message and
!         #    saves it in the history so that it can get the classification on the
          #    message which is stores in $class.  Then it gets the message again
          #    by sending the TOP command and passing the result through
***************
*** 265,271 ****
          #    we are guaranteed to be able to do our header modifications.
          #
!         #    NOTE using toptoo=1 on a slow link could cause performance problems,
!         #    it is only intended for use where there is high bandwidth between
!         #    POPFile and the POP3 server.
  
          if ( $command =~ /TOP (.*) (.*)/i ) {
--- 266,278 ----
          #    we are guaranteed to be able to do our header modifications.
          #
!         #    NOTE messages retrieved using TOPTOO are visible in the history as they
!         #    are "cached" to avoid requiring repeated downloads if the client issues
!         #    a RETR for the message in the same session   
!         #
!         #    NOTE using toptoo=1 on a slow link could cause performance problems, in
!         #    cases where only the headers, but not classification, is required.
!         #    toptoo=1 is, however, appropriate for normal use via a mail client and
!         #    won't significantly increase bandwidth unless the mail client is selectively
!         #    downloading messages based on non-classification data in the TOP headers.
  
          if ( $command =~ /TOP (.*) (.*)/i ) {
***************
*** 345,348 ****
--- 352,356 ----
              my $count = $1;
              my $class;
+ 
              my $file = $self->{classifier__}->history_filename($download_count, $count);
  
***************
*** 355,367 ****
                  $self->log_( "Printing message from cache" );
  
-                 if (0) {
-                     # Ensure a .CRLF is on the end of the file (may be neccessary)
-                     open APPEND, ">>$file";
-                     binmode APPEND;
-                     print APPEND ".$eol";
-                     close APPEND;
-                 }
- 
                  # Give the client an +OK:
                  print $client "+OK file data cached by POPFile$eol";
  
--- 363,368 ----
                  $self->log_( "Printing message from cache" );
  
                  # Give the client an +OK:
+ 
                  print $client "+OK file data cached by POPFile$eol";
  
***************
*** 380,385 ****
  
                      print $pipe "CLASS:$class$eol";
- 
                  }
                  close RETRFILE;
                  print $client ".$eol";
--- 381,386 ----
  
                      print $pipe "CLASS:$class$eol";
                  }
+ 
                  close RETRFILE;
                  print $client ".$eol";