[popfile-commit] engine/POPFile History.pm,1.29.4.3,1.29.4.4

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9268/POPFile

Modified Files:
      Tag: b0_22_2
	History.pm 
Log Message:
1. Apply Brian's patch to speed up history cleanup.
2. Make the history tests work on my system where there are no CVS subdirs.


Index: History.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/History.pm,v
retrieving revision 1.29.4.3
retrieving revision 1.29.4.4
diff -C2 -d -r1.29.4.3 -r1.29.4.4
*** History.pm	7 Feb 2008 15:36:35 -0000	1.29.4.3
--- History.pm	17 Apr 2008 09:29:28 -0000	1.29.4.4
***************
*** 346,350 ****
      unlink $file;
  
!     # It's not possible that the directory for the slot file is empty
      # and we want to delete it so that things get cleaned up automatically
  
--- 346,350 ----
      unlink $file;
  
!     # It's now possible that the directory for the slot file is empty
      # and we want to delete it so that things get cleaned up automatically
  
***************
*** 354,368 ****
  
      while ( $depth > 0 ) {
!         my @files = glob( $file . '*' );
! 
!         if ( $#files == -1 ) {
!             if ( !( rmdir( $file ) ) ) {
!                 last;
!             }
!             $file =~ s![a-f0-9]{2}/$!!i;
!         } else {
              last;
          }
! 
          $depth--;
      }
--- 354,361 ----
  
      while ( $depth > 0 ) {
!         if ( !( rmdir( $file ) ) ) {
              last;
          }
!         $file =~ s![a-f0-9]{2}/$!!i;
          $depth--;
      }
***************
*** 588,592 ****
                   $self->{classifier__}->{parser__}->decode_string(
                       ${$header{$h}}[0] );
!             
              if ( !defined ${$header{$h}}[0] || ${$header{$h}}[0] =~ /^\s*$/ ) {
                  if ( $h ne 'cc' ) {
--- 581,585 ----
                   $self->{classifier__}->{parser__}->decode_string(
                       ${$header{$h}}[0] );
! 
              if ( !defined ${$header{$h}}[0] || ${$header{$h}}[0] =~ /^\s*$/ ) {
                  if ( $h ne 'cc' ) {
***************
*** 596,600 ****
                  }
              }
!             
              ${$header{$h}}[0] =~ s/\0//g;
              ${$header{$h}}[0] = $self->db__()->quote( ${$header{$h}}[0] );
--- 589,593 ----
                  }
              }
! 
              ${$header{$h}}[0] =~ s/\0//g;
              ${$header{$h}}[0] = $self->db__()->quote( ${$header{$h}}[0] );