Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jgr...@us...> - 2003-07-26 14:59:50
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv13266/Proxy
Modified Files:
Proxy.pm
Log Message:
Small changes to help the coverage code spot blocks of code that are being executed; make coverage.pl warn if it detects an unterminated PROFILE BLOCK
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Proxy.pm 21 Jul 2003 19:53:56 -0000 1.24
--- Proxy.pm 26 Jul 2003 14:59:46 -0000 1.25
***************
*** 85,93 ****
# Open the socket used to receive request for proxy service
! $self->{server__} = IO::Socket::INET->new( Proto => 'tcp',
$self->config_( 'local' ) == 1 ? (LocalAddr => 'localhost') : (),
LocalPort => $self->config_( 'port' ),
Listen => SOMAXCONN,
! Reuse => 1 );
if ( !defined( $self->{server__} ) ) {
--- 85,93 ----
# Open the socket used to receive request for proxy service
! $self->{server__} = IO::Socket::INET->new( Proto => 'tcp', # PROFILE BLOCK START
$self->config_( 'local' ) == 1 ? (LocalAddr => 'localhost') : (),
LocalPort => $self->config_( 'port' ),
Listen => SOMAXCONN,
! Reuse => 1 ); # PROFILE BLOCK STOP
if ( !defined( $self->{server__} ) ) {
***************
*** 526,533 ****
# Connect to the real mail server on the standard port
! $mail = IO::Socket::INET->new(
Proto => "tcp",
PeerAddr => $hostname,
! PeerPort => $port );
# Check that the connect succeeded for the remote server
--- 526,533 ----
# Connect to the real mail server on the standard port
! $mail = IO::Socket::INET->new( # PROFILE BLOCK START
Proto => "tcp",
PeerAddr => $hostname,
! PeerPort => $port ); # PROFILE BLOCK STOP
# Check that the connect succeeded for the remote server
|
|
From: <jgr...@us...> - 2003-07-26 14:59:50
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv13266/tests
Modified Files:
TestBayes.tst
Log Message:
Small changes to help the coverage code spot blocks of code that are being executed; make coverage.pl warn if it detects an unterminated PROFILE BLOCK
Index: TestBayes.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestBayes.tst 13 Jul 2003 02:40:35 -0000 1.12
--- TestBayes.tst 26 Jul 2003 14:59:47 -0000 1.13
***************
*** 114,115 ****
--- 114,120 ----
}
}
+
+ # TODO test that stop writes the parameters to disk
+
+ $b->stop();
+
|
|
From: <jgr...@us...> - 2003-07-26 14:59:49
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv13266/Devel
Modified Files:
TestCoverage.pm
Log Message:
Small changes to help the coverage code spot blocks of code that are being executed; make coverage.pl warn if it detects an unterminated PROFILE BLOCK
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestCoverage.pm 13 Jul 2003 05:21:21 -0000 1.8
--- TestCoverage.pm 26 Jul 2003 14:59:46 -0000 1.9
***************
*** 99,102 ****
--- 99,108 ----
close SOURCE_FILE;
close LINE_DATA;
+
+ # Check for an unterminated PROFILE BLOCK and warn the user
+
+ if ( $block_executed ) {
+ print "WARNING: unterminated PROFILE BLOCK detected; did you forget a PROFILE BLOCK STOP in $file?\n";
+ }
}
}
|
|
From: <jgr...@us...> - 2003-07-26 14:59:49
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv13266/Classifier
Modified Files:
Bayes.pm
Log Message:
Small changes to help the coverage code spot blocks of code that are being executed; make coverage.pl warn if it detects an unterminated PROFILE BLOCK
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** Bayes.pm 18 Jul 2003 13:00:07 -0000 1.170
--- Bayes.pm 26 Jul 2003 14:59:46 -0000 1.171
***************
*** 64,69 ****
# The possible colors for buckets
! $self->{possible_colors__} = [ 'red', 'green', 'blue', 'brown', 'orange', 'purple', 'magenta', 'gray', 'plum', 'silver',
! 'pink', 'lightgreen', 'lightblue', 'lightcyan', 'lightcoral', 'lightsalmon', 'lightgrey', 'darkorange', 'darkcyan', 'feldspar' ];
# Precomputed per bucket probabilities
--- 64,72 ----
# The possible colors for buckets
! $self->{possible_colors__} = [ 'red', 'green', 'blue', 'brown', # PROFILE BLOCK START
! 'orange', 'purple', 'magenta', 'gray',
! 'plum', 'silver', 'pink', 'lightgreen',
! 'lightblue', 'lightcyan', 'lightcoral', 'lightsalmon',
! 'lightgrey', 'darkorange', 'darkcyan', 'feldspar' ]; # PROFILE BLOCK STOP
# Precomputed per bucket probabilities
|
|
From: <jgr...@us...> - 2003-07-26 14:42:21
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv10899
Modified Files:
coverage.pl
Log Message:
Added writing of HTML files for each file with coverage information coloring unexecuted lines red to make it easy to spot code for which we need tests
Index: coverage.pl
===================================================================
RCS file: /cvsroot/popfile/engine/coverage.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** coverage.pl 21 Jul 2003 19:53:36 -0000 1.4
--- coverage.pl 26 Jul 2003 14:42:18 -0000 1.5
***************
*** 85,86 ****
--- 85,115 ----
}
+ print "\nCreating HTML coverage files...\n\n";
+
+ foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
+
+ my $clean = $file;
+ $clean =~ s/^\.\.\/\///;
+
+ open HTML, ">../$clean.html";
+ open FILE, "<../$clean.pm";
+
+ print HTML "<html><head><title>$clean.pm</title></head><body><pre>";
+
+ my $line = 0;
+
+ while ( <FILE> ) {
+ $line += 1;
+ my $color = (defined($count{$file}{executed}{$line}) && ($count{$file}{executed}{$line}==0))?"red":"green";
+ my $block = ($color eq 'red')?"red":"white";
+ print HTML "<span style=\"background: $block\"> </span><font color=$color>$_</font>";
+ }
+
+ print HTML "</pre></body></html>";
+
+ close FILE;
+ close HTML;
+
+ print "Saved coverage view for $clean.pm in $clean.html\n";
+ }
+
|
|
From: <ssc...@us...> - 2003-07-26 10:49:03
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv13336
Modified Files:
HTML.pm
Log Message:
prevent cache misses on jump_to and view pages
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -d -r1.182 -r1.183
*** HTML.pm 13 Jul 2003 10:51:22 -0000 1.182
--- HTML.pm 26 Jul 2003 07:39:19 -0000 1.183
***************
*** 445,448 ****
--- 445,451 ----
my $found = 0;
my $file = $self->{form_}{view};
+
+ $self->copy_pre_cache__() if ($self->{need_resort__});
+
foreach my $akey ( keys %{ $self->{history__} } ) {
if ($akey eq $file) {
***************
*** 3325,3328 ****
--- 3328,3339 ----
$self->load_history_cache__() if ( $self->{history_invalid__} == 1 );
+ if ( $self->{need_resort__} == 1 ) {
+
+ $self->copy_pre_cache__();
+ $self->sort_filter_history( (defined($self->{form_}{filter})?$self->{form_}{filter}:''),
+ (defined($self->{form_}{search})?$self->{form_}{search}:''),
+ (defined($self->{form_}{sort})?$self->{form_}{sort}:'') );
+ }
+
my $mail_file = $self->{form_}{view};
my $start_message = $self->{form_}{start_message} || 0;
***************
*** 3362,3365 ****
--- 3373,3377 ----
if ( $index == -1 ) {
+ $self->log_("view page cache miss");
return $self->http_redirect_( $client, '/history' );
}
|
|
From: <xue...@us...> - 2003-07-24 19:00:49
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv5624
Modified Files:
pfi-library.nsh
Log Message:
Use a more flexible approach to un.GetCorpusPath (there are other 'popfile.cfg' parameters which specify a path).
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pfi-library.nsh 20 Jul 2003 14:11:17 -0000 1.5
--- pfi-library.nsh 24 Jul 2003 19:00:44 -0000 1.6
***************
*** 205,209 ****
#
# Inputs:
! # (top of stack) - the path where 'popfile.cfg' it to be found
#
# Outputs:
--- 205,209 ----
#
# Inputs:
! # (top of stack) - the path where 'popfile.cfg' is to be found
#
# Outputs:
***************
*** 236,240 ****
IfFileExists "${L_SOURCE}\popfile.cfg" 0 use_default_locn
-
ClearErrors
FileOpen ${L_FILE_HANDLE} "${L_SOURCE}\popfile.cfg" r
--- 236,239 ----
***************
*** 259,340 ****
cfg_file_done:
FileClose ${L_FILE_HANDLE}
-
Push ${L_CORPUS}
Call un.TrimNewlines
Pop ${L_CORPUS}
! StrCmp ${L_CORPUS} "" use_default_locn
- ; A non-null corpus parameter has been found in 'popfile.cfg'
; Strip leading/trailing quotes, if any
! StrCpy ${L_TEMP} ${L_CORPUS} 1
StrCmp ${L_TEMP} '"' 0 slashconversion
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 1
! StrCpy ${L_TEMP} ${L_CORPUS} 1 -1
StrCmp ${L_TEMP} '"' 0 slashconversion
! StrCpy ${L_CORPUS} ${L_CORPUS} -1
slashconversion:
! Push ${L_CORPUS}
! Call un.StrBackSlash ; ensure corpus path uses backslashes
! Pop ${L_CORPUS}
! StrCpy ${L_TEMP} ${L_CORPUS} 2
StrCmp ${L_TEMP} ".\" sub_folder
StrCmp ${L_TEMP} "\\" got_path
! StrCpy ${L_TEMP} ${L_CORPUS} 3
StrCmp ${L_TEMP} "..\" relative_folder
! StrCpy ${L_TEMP} ${L_CORPUS} 1
! StrCmp ${L_TEMP} "\" instdir_drive
! StrCpy ${L_TEMP} ${L_CORPUS} 1 1
StrCmp ${L_TEMP} ":" got_path
! ; Assume path can be safely added to $INSTDIR
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
Goto got_path
sub_folder:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 2
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
Goto got_path
relative_folder:
! StrCpy ${L_RESULT} $INSTDIR
relative_again:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 3
Push ${L_RESULT}
Call un.GetParent
Pop ${L_RESULT}
! StrCpy ${L_TEMP} ${L_CORPUS} 3
StrCmp ${L_TEMP} "..\" relative_again
! StrCpy ${L_CORPUS} ${L_RESULT}\${L_CORPUS}
! Goto got_path
!
! instdir_drive:
! StrCpy ${L_TEMP} $INSTDIR 2
! StrCpy ${L_CORPUS} ${L_TEMP}${L_CORPUS}
Goto got_path
! use_default_locn:
! StrCpy ${L_CORPUS} ${L_SOURCE}\corpus
got_path:
- StrCpy ${L_RESULT} ${L_CORPUS}
-
Pop ${L_TEMP}
! Pop ${L_FILE_HANDLE}
! Pop ${L_CORPUS}
! Pop ${L_SOURCE}
! Exch ${L_RESULT} ; place full path of 'corpus' directory on top of the stack
! !undef L_CORPUS
! !undef L_FILE_HANDLE
!undef L_RESULT
- !undef L_SOURCE
!undef L_TEMP
--- 258,402 ----
cfg_file_done:
FileClose ${L_FILE_HANDLE}
Push ${L_CORPUS}
Call un.TrimNewlines
Pop ${L_CORPUS}
! StrCmp ${L_CORPUS} "" use_default_locn use_cfg_data
!
! use_default_locn:
! StrCpy ${L_RESULT} ${L_SOURCE}\corpus
! Goto got_result
!
! use_cfg_data:
! Push ${L_SOURCE}
! Push ${L_CORPUS}
! Call un.GetDataPath
! Pop ${L_RESULT}
!
! got_result:
! Pop ${L_TEMP}
! Pop ${L_FILE_HANDLE}
! Pop ${L_CORPUS}
! Pop ${L_SOURCE}
! Exch ${L_RESULT} ; place full path of 'corpus' directory on top of the stack
!
! !undef L_CORPUS
! !undef L_FILE_HANDLE
! !undef L_RESULT
! !undef L_SOURCE
! !undef L_TEMP
!
! FunctionEnd
!
! #--------------------------------------------------------------------------
! # Function: un.GetDataPath
! #
! # This function is used to convert a 'base directory' and a 'data folder' parameter (usually
! # relative to the 'base directory') into a single, absolute path. For example, it will convert
! # 'C:\Program Files\POPFile' and 'corpus' into 'C:\Program Files\POPFile\corpus'.
! #
! # It is assumed that the 'base directory' is in standard Windows format.
! #
! # The 'data folder' may be supplied in a variety of different formats, for example:
! # corpus, ./corpus, "..\..\corpus", Z:/Data/corpus or even "\\server\share\corpus".
! #
! # Inputs:
! # (top of stack) - the 'data folder' parameter (eg "../../corpus")
! # (top of stack - 1) - the 'base directory' parameter
! #
! # Outputs:
! # (top of stack) - string containing the full (unambiguous) path to the data
! # (the string "" is returned if input data was null)
! #
! # Usage Example:
! # Push $INSTDIR
! # Push "../../corpus"
! # Call un.GetDataPath
! # Pop $R0
! #
! # ($R0 will be "C:\corpus", assuming $INSTDIR was "C:\Program Files\POPFile")
! #--------------------------------------------------------------------------
!
! Function un.GetDataPath
!
! !define L_BASEDIR $R9
! !define L_DATA $R8
! !define L_RESULT $R7
! !define L_TEMP $R6
!
! Exch ${L_DATA} ; the 'data folder' parameter (often a relative path)
! Exch
! Exch ${L_BASEDIR} ; the 'base directory' used for cases where 'data folder' is relative
! Push ${L_RESULT}
! Push ${L_TEMP}
!
! StrCmp ${L_DATA} "" 0 strip_quotes
! StrCpy ${L_DATA} ${L_BASEDIR}
! Goto got_path
!
! strip_quotes:
; Strip leading/trailing quotes, if any
! StrCpy ${L_TEMP} ${L_DATA} 1
StrCmp ${L_TEMP} '"' 0 slashconversion
! StrCpy ${L_DATA} ${L_DATA} "" 1
! StrCpy ${L_TEMP} ${L_DATA} 1 -1
StrCmp ${L_TEMP} '"' 0 slashconversion
! StrCpy ${L_DATA} ${L_DATA} -1
slashconversion:
! Push ${L_DATA}
! Call un.StrBackSlash ; ensure parameter uses backslashes
! Pop ${L_DATA}
! StrCpy ${L_TEMP} ${L_DATA} 2
StrCmp ${L_TEMP} ".\" sub_folder
StrCmp ${L_TEMP} "\\" got_path
! StrCpy ${L_TEMP} ${L_DATA} 3
StrCmp ${L_TEMP} "..\" relative_folder
! StrCpy ${L_TEMP} ${L_DATA} 1
! StrCmp ${L_TEMP} "\" basedir_drive
! StrCpy ${L_TEMP} ${L_DATA} 1 1
StrCmp ${L_TEMP} ":" got_path
! ; Assume path can be safely added to 'base directory'
! StrCpy ${L_DATA} ${L_BASEDIR}\${L_DATA}
Goto got_path
sub_folder:
! StrCpy ${L_DATA} ${L_DATA} "" 2
! StrCpy ${L_DATA} ${L_BASEDIR}\${L_DATA}
Goto got_path
relative_folder:
! StrCpy ${L_RESULT} ${L_BASEDIR}
relative_again:
! StrCpy ${L_DATA} ${L_DATA} "" 3
Push ${L_RESULT}
Call un.GetParent
Pop ${L_RESULT}
! StrCpy ${L_TEMP} ${L_DATA} 3
StrCmp ${L_TEMP} "..\" relative_again
! StrCpy ${L_DATA} ${L_RESULT}\${L_DATA}
Goto got_path
! basedir_drive:
! StrCpy ${L_TEMP} ${L_BASEDIR} 2
! StrCpy ${L_DATA} ${L_TEMP}${L_DATA}
got_path:
Pop ${L_TEMP}
! Pop ${L_RESULT}
! Pop ${L_BASEDIR}
! Exch ${L_DATA} ; place full path to the data directory on top of the stack
! !undef L_BASEDIR
! !undef L_DATA
!undef L_RESULT
!undef L_TEMP
|
|
From: <xue...@us...> - 2003-07-23 18:31:16
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17643
Modified Files:
installer.nsi
Log Message:
Make it easier to change the shutdown delay; use a longer delay to improve reliability.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** installer.nsi 22 Jul 2003 00:50:06 -0000 1.92
--- installer.nsi 23 Jul 2003 18:31:13 -0000 1.93
***************
*** 96,99 ****
--- 96,103 ----
!define C_PERL_DIR "C:\Perl"
+
+ ; Delay (in milliseconds) used after issuing a POPFile 'shutdown' request
+
+ !define C_SHUTDOWN_DELAY 1500
; Define PFI_VERBOSE to get more compiler output
***************
*** 887,891 ****
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep 250 ; milliseconds
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" exit_now
--- 891,895 ----
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" exit_now
***************
*** 899,903 ****
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep 250 ; milliseconds
Pop ${L_RESULT} ; Ignore the result
--- 903,907 ----
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT} ; Ignore the result
***************
*** 1616,1620 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
goto exit_without_banner
--- 1620,1624 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
goto exit_without_banner
***************
*** 1639,1643 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
--- 1643,1647 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
***************
*** 1659,1663 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
--- 1663,1667 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
***************
*** 1673,1677 ****
Pop ${L_RESULT} ; Did POPFile return an HTML page?
StrCmp ${L_RESULT} "success" remove_banner
! Sleep 250 ; milliseconds
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
--- 1677,1681 ----
Pop ${L_RESULT} ; Did POPFile return an HTML page?
StrCmp ${L_RESULT} "success" remove_banner
! Sleep 500 ; milliseconds
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
***************
*** 1891,1895 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep 250 ; milliseconds
Goto remove_shortcuts
--- 1895,1899 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep ${C_SHUTDOWN_DELAY}
Goto remove_shortcuts
***************
*** 1903,1907 ****
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep 250 ; milliseconds
remove_shortcuts:
--- 1907,1911 ----
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep ${C_SHUTDOWN_DELAY}
remove_shortcuts:
|
|
From: <jgr...@us...> - 2003-07-22 21:34:03
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv16953 Modified Files: Makefile Log Message: Include stopwords in ZIP file Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile 17 Jul 2003 20:13:43 -0000 1.16 --- Makefile 22 Jul 2003 21:34:00 -0000 1.17 *************** *** 53,57 **** $(POPFILE_ZIP): core manual skins ! core: popfile.pl otto.gif pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm *.change license rm -f $(POPFILE_ZIP) $(BUILD_ZIP) --- 53,57 ---- $(POPFILE_ZIP): core manual skins ! core: popfile.pl otto.gif pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm *.change license stopwords rm -f $(POPFILE_ZIP) $(BUILD_ZIP) |
|
From: <jgr...@us...> - 2003-07-22 21:24:40
|
Update of /cvsroot/popfile/engine/skins
In directory sc8-pr-cvs1:/tmp/cvs-serv15012
Modified Files:
orangeCream.css tinygrey.css
Log Message:
Fix footer problem
Index: orangeCream.css
===================================================================
RCS file: /cvsroot/popfile/engine/skins/orangeCream.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** orangeCream.css 24 Feb 2003 08:58:35 -0000 1.6
--- orangeCream.css 22 Jul 2003 21:24:37 -0000 1.7
***************
*** 121,132 ****
}
! td.footerBody {
text-align: center;
- padding-left: 20%;
- padding-right: 20%;
padding-top: 0.8em;
font-size: 75%;
}
-
td.naked {
--- 121,130 ----
}
! td.footerBody {
text-align: center;
padding-top: 0.8em;
font-size: 75%;
+ margin: auto;
}
td.naked {
Index: tinygrey.css
===================================================================
RCS file: /cvsroot/popfile/engine/skins/tinygrey.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tinygrey.css 25 Feb 2003 01:50:04 -0000 1.5
--- tinygrey.css 22 Jul 2003 21:24:37 -0000 1.6
***************
*** 122,133 ****
}
! td.footerBody {
text-align: center;
- padding-left: 20%;
- padding-right: 20%;
padding-top: 0.8em;
font-size: 75%;
}
-
td.naked {
--- 122,131 ----
}
! td.footerBody {
text-align: center;
padding-top: 0.8em;
font-size: 75%;
+ margin: auto;
}
td.naked {
|
|
From: <jgr...@us...> - 2003-07-22 19:13:29
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv20572/Classifier
Modified Files:
MailParse.pm
Log Message:
Fix another bug that could cause a message to get the wrong classification. This one would occur with base64 encoded data that was not flushed
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** MailParse.pm 21 Jul 2003 18:49:52 -0000 1.147
--- MailParse.pm 22 Jul 2003 19:13:21 -0000 1.148
***************
*** 955,963 ****
}
- $self->{colorized__} .= $self->clear_out_base64();
close MSG;
$self->stop_parse();
- $self->{in_html_tag__} = 0;
if ( $self->{color__} ) {
--- 955,961 ----
***************
*** 1053,1056 ****
--- 1051,1056 ----
my ( $self ) = @_;
+ $self->{colorized__} .= $self->clear_out_base64();
+
# If we reach here and discover that we think that we are in an unclosed HTML tag then there
# has probably been an error (such as a < in the text messing things up) and so we dump
***************
*** 1060,1063 ****
--- 1060,1065 ----
$self->add_line( $self->{html_tag__} . ' ' . $self->{html_arg__}, 0, '' );
}
+
+ $self->{in_html_tag__} = 0;
}
|
|
From: <xue...@us...> - 2003-07-22 10:48:30
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv29233 Modified Files: Russian-mui.nsh Log Message: Updated to reflect changes to NSIS translation. Index: Russian-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Russian-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 --- Russian-mui.nsh 22 Jul 2003 10:48:24 -0000 1.3 *************** *** 25,29 **** !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \ ! "Ýòà ïðîãðàììà óñòàíîâèò POPFile íà Âàø êîìïüþòåð.\r\n\r\nÐåêîìåíäóåòñÿ çàêðûòü âñå îñòàëüíûå ïðèëîæåíèÿ ïåðåä íà÷àëîì óñòàíîâêè.\r\n\r\n" #-------------------------------------------------------------------------- --- 25,29 ---- !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \ ! "Ýòà ïðîãðàììà óñòàíîâèò POPFile íà Âàø êîìïüþòåð.\r\n\r\nÏåðåä ïðîäîëæåíèåì óñòàíîâêè, ðåêîìåíäóåòñÿ çàêðûòü âñå çàïóùåííûå ïðèëîæåíèÿ.\r\n\r\n" #-------------------------------------------------------------------------- |
|
From: <xue...@us...> - 2003-07-22 01:26:53
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv17378 Modified Files: Czech-pfi.nsh Log Message: Correct the formatting by making more room for translated text. Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Czech-pfi.nsh 22 Jul 2003 00:47:38 -0000 1.1 --- Czech-pfi.nsh 22 Jul 2003 01:23:28 -0000 1.2 *************** *** 135,140 **** !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "\r\nCreate a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "\r\nTo delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Odstranit" --- 135,140 ---- !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Odstranit" *************** *** 143,150 **** ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "\r\nThere is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "\r\nYou must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "\r\nAt least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "\r\nInstaller cannot create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" --- 143,150 ---- ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" |
|
From: <xue...@us...> - 2003-07-22 00:50:10
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv13006
Modified Files:
installer.nsi
Log Message:
Add support for Czech (to keep up to date with the range of UI languages).
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** installer.nsi 17 Jul 2003 11:14:58 -0000 1.91
--- installer.nsi 22 Jul 2003 00:50:06 -0000 1.92
***************
*** 333,336 ****
--- 333,337 ----
!insertmacro PFI_LANG_LOAD "SimpChinese"
!insertmacro PFI_LANG_LOAD "TradChinese"
+ !insertmacro PFI_LANG_LOAD "Czech"
!insertmacro PFI_LANG_LOAD "Danish" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "Dutch"
***************
*** 657,660 ****
--- 658,664 ----
SetDetailsPrint listonly
+ ; 'CreateShortCut' uses '$OUTDIR' as the working directory for the shortcut
+ ; ('SetOutPath' is one way to change the value of $OUTDIR)
+
SetOutPath $SMPROGRAMS\POPFile
SetOutPath $INSTDIR
***************
*** 778,781 ****
--- 782,786 ----
!insertmacro UI_LANG_CONFIG "SIMPCHINESE" "Chinese-Simplified"
!insertmacro UI_LANG_CONFIG "TRADCHINESE" "Chinese-Traditional"
+ !insertmacro UI_LANG_CONFIG "CZECH" "Czech"
!insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
!insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
|
|
From: <xue...@us...> - 2003-07-22 00:47:47
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv12736 Added Files: Czech-mui.nsh Czech-pfi.nsh Log Message: Czech language files for installer/uninstaller. --- NEW FILE: Czech-mui.nsh --- #-------------------------------------------------------------------------- # Czech-mui.nsh # # This file contains additional "Czech" text strings used by the Windows installer # for POPFile (these strings are customised versions of strings provided by NSIS). # # See 'Czech-pfi.nsh' for the strings which are used on the custom pages. # # These strings are grouped according to the page/window where they are used # # Copyright (c) 2001-2003 John Graham-Cumming # #-------------------------------------------------------------------------- !ifndef PFI_VERBOSE !verbose 3 !endif #-------------------------------------------------------------------------- # Standard MUI Page - Welcome # # The sequence \r\n\r\n inserts a blank line (note that the MUI_TEXT_WELCOME_INFO_TEXT string # should end with a \r\n\r\n sequence because another paragraph follows this string). #-------------------------------------------------------------------------- !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \ "Chystáte se nainstalovat POPFile na svùj poèítaè.\r\n\r\nPøed zaèátkem instalace je doporuèeno zavøít vechny ostatní aplikace.\r\n\r\n" #-------------------------------------------------------------------------- # Standard MUI Page - Finish # # The MUI_TEXT_FINISH_RUN text should be a short phrase (not a long paragraph) #-------------------------------------------------------------------------- !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \ "POPFile Uivatelské rozhraní" #-------------------------------------------------------------------------- # End of 'Czech-mui.nsh' #-------------------------------------------------------------------------- --- NEW FILE: Czech-pfi.nsh --- #-------------------------------------------------------------------------- # Czech-pfi.nsh # # This file contains additional "Czech" text strings used by the Windows installer # for POPFile (these strings are unique to POPFile). # # See 'Czech-mui.nsh' for the strings which modify standard NSIS MUI messages. # # These strings are grouped according to the page/window where they are used # # Copyright (c) 2001-2003 John Graham-Cumming # #-------------------------------------------------------------------------- # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes): # # (1) The sequence $\r$\n inserts a newline # (2) The sequence $\r$\n$\r\$n inserts a blank line # # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages): # # (1) The sequence \r\n inserts a newline # (2) The sequence \r\n\r\n inserts a blank line # # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- !ifndef PFI_VERBOSE !verbose 3 !endif #-------------------------------------------------------------------------- # Mark the start of the language data #-------------------------------------------------------------------------- !define PFI_LANG "CZECH" #-------------------------------------------------------------------------- # Startup message box offering to display the Release Notes #-------------------------------------------------------------------------- !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?" !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)" #-------------------------------------------------------------------------- # Standard MUI Page - Choose Components #-------------------------------------------------------------------------- !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl." !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface." !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI." #-------------------------------------------------------------------------- # Custom Page - POPFile Installation Options #-------------------------------------------------------------------------- ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them" ; Text strings displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts (runs in background)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN EXISTING VERSION" ; Message Boxes used when validating user's selections !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Please change your POP3 port selection." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "The 'User Interface' port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "The port must be a number in the range 1 to 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Please change your 'User Interface' port selection." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." ; Banner message displayed whilst uninstalling old version !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- # Standard MUI Page - Installing POPfile #-------------------------------------------------------------------------- ; Installation Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknìte na Dalí pro pokraèování" ; Installation Log Messages !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Shutting down previous version of POPFile using port" ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "file from previous installation found." !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "OK to update this file ?" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Click 'Yes' to update it (old file will be saved as" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Click 'No' to keep the old file (new file will saved as" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup copy of" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "already exists" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "OK to overwrite this file?" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Click 'Yes' to overwrite, click 'No' to skip making a backup copy" #-------------------------------------------------------------------------- # Custom Page - POPFile Classification Bucket Creation #-------------------------------------------------------------------------- ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email" ; Text strings displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "\r\nCreate a new bucket by either selecting a name from the list below or typing a name of your own choice." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "\r\nTo delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Odstranit" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continue" ; Text strings used for status messages under the bucket list !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "\r\nThere is no need to add more buckets" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "\r\nYou must define AT LEAST TWO buckets" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "\r\nAt least one more bucket is required" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "\r\nInstaller cannot create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" ; Message box text strings !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "A bucket called" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "has already been defined." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Please choose a different name for the new bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "The installer can only create up to" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "buckets." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Once POPFile has been installed you can create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "The name" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "is not a valid name for a bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Názvy koù mùou obsahovat jen znaky od a do z (malé písmo) plus - a _" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Please choose a different name for the new bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,$\r$\n$\r$\neither by picking a suggested name from the drop-down list$\r$\n$\r$\nor by typing in a name of your own choice." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "buckets have been defined for use by POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Do you want to configure POPFile to use these buckets?" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Click 'No' if you wish to change your bucket selections." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "The installer was unable to create" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "of the" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "buckets you selected." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Once POPFile has been installed you can use its 'User Interface'$\r$\n$\r$\ncontrol panel to create the missing bucket(s)." #-------------------------------------------------------------------------- # Custom Page - Reconfigure Outlook Express #-------------------------------------------------------------------------- ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigure Outlook Express" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile can reconfigure Outlook Express for you" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigure this account to work with POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email address:" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 server:" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 username:" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "account for the" !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identity" #-------------------------------------------------------------------------- # Custom Page - POPFile can now be started #-------------------------------------------------------------------------- ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- # Standard MUI Page - Uninstall POPFile #-------------------------------------------------------------------------- ; Uninstall Progress Reports displayed above the progress bar !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Shutting down POPFile..." !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Deleting 'Start Menu' entries for POPFile..." !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Deleting POPFile core files..." !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Restoring Outlook Express settings..." !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Deleting POPFile skins files..." !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Deleting minimal Perl files..." ; Uninstall Log Messages !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Shutting down POPFile using port" !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Opened" !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Restored" !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Closed" !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Removing all files from POPFile directory" !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Note: unable to remove all files from POPFile directory" ; Message Box text strings !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continue anyway (not recommended) ?" !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Uninstall aborted by user" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?$\r$\n$\r$\n(If you have anything you created that you want to keep, click No)" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Note" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "could not be removed." #-------------------------------------------------------------------------- # Mark the end of the language data #-------------------------------------------------------------------------- !undef PFI_LANG #-------------------------------------------------------------------------- # End of 'Czech-pfi.nsh' #-------------------------------------------------------------------------- |
|
From: <jgr...@us...> - 2003-07-21 19:54:43
|
Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv22975/Test
Modified Files:
SimpleProxy.pm
Log Message:
Remove extra logging
Index: SimpleProxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Test/SimpleProxy.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleProxy.pm 17 Jul 2003 20:12:33 -0000 1.3
--- SimpleProxy.pm 21 Jul 2003 19:54:40 -0000 1.4
***************
*** 98,103 ****
if ( defined( $self->{remote_client__} ) ) {
- $self->log_( "service_server: remote client is connected" );
-
my $handle = $self->{remote_client__};
--- 98,101 ----
***************
*** 113,117 ****
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
my $line = <$handle>;
- $self->log_( "Phony server has received $line" );
$self->{received__} .= $line;
}
--- 111,114 ----
***************
*** 151,160 ****
my $remote = $self->verify_connected_( 0, $client, 'localhost', $self->{server_port__} );
- if ( defined( $remote ) && $remote->connected ) {
- $self->log_( "Child connected to server" );
- } else {
- $self->log_( "Child failed to connect to server" );
- }
-
# Create two selectors so that we can see if the client or the remote
# have something to send and can echo between the two
--- 148,151 ----
***************
*** 167,171 ****
my $line = <$remote>;
if ( defined( $line ) ) {
- $self->log_( "Echoing $line from remote to client" );
print $client $line;
} else {
--- 158,161 ----
***************
*** 175,184 ****
if ( defined( $client_selector->can_read(0) ) ) {
my $line = <$client>;
- $self->log_( "Echoing $line from client to remote" );
print $remote $line;
}
}
- $self->log_( "Child terminated" );
close $remote;
close $pipe;
--- 165,172 ----
***************
*** 192,197 ****
my $received = $self->{received__};
-
- $self->log_( "Received $received" );
$self->{received__} = '';
--- 180,183 ----
|
|
From: <jgr...@us...> - 2003-07-21 19:54:29
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22946/tests
Modified Files:
TestProxy.tst
Log Message:
Add tests for echo_to_dot_ and echo_to_regexp_, Proxy.pm coverage now at 55%
Index: TestProxy.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestProxy.tst 21 Jul 2003 19:03:52 -0000 1.6
--- TestProxy.tst 21 Jul 2003 19:54:26 -0000 1.7
***************
*** 53,56 ****
--- 53,57 ----
use POPFile::Logger;
use Proxy::Proxy;
+ use IO::Handle;
use IO::Socket;
***************
*** 139,142 ****
--- 140,144 ----
# or client and to the logger
+ test_assert( $client->connected );
$sp->tee_( $client, "teed\n" );
select( undef, undef, undef, 0.25 );
***************
*** 167,174 ****
close TEMP;
! my $handle = $client;
! $line = <$handle>;
test_assert_regexp( $line, 'after' );
# Test echo_to_dot_
--- 169,224 ----
close TEMP;
! $line = <$client>;
test_assert_regexp( $line, 'after' );
+ # Test echo_to_regexp_ with suppression
+
+ $sp->send( 'before11' );
+ $sp->send( 'before12' );
+ $sp->send( 'matchTHis1' );
+ $sp->send( 'after1' );
+ $sp->service_server();
+ open TEMP, ">temp.tmp";
+ $sp->echo_to_regexp_( $client, \*TEMP, qr/TH/, 0, qr/12/ );
+ close TEMP;
+ open TEMP, "<temp.tmp";
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'before11' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'matchTHis1' );
+ $line = <TEMP>;
+ test_assert( !defined( $line ) );
+ close TEMP;
+
+ $line = <$client>;
+ test_assert_regexp( $line, 'after1' );
+
+ # Test echo_to_regexp_ with logging
+
+ $sp->send( 'before21' );
+ $sp->send( 'before22' );
+ $sp->send( 'matchTHis2' );
+ $sp->send( 'after2' );
+ $sp->service_server();
+ open TEMP, ">temp.tmp";
+ $sp->echo_to_regexp_( $client, \*TEMP, qr/TH/, 1, qr/22/ );
+ close TEMP;
+ open TEMP, "<temp.tmp";
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'before21' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'matchTHis2' );
+ $line = <TEMP>;
+ test_assert( !defined( $line ) );
+ close TEMP;
+
+ @lastten = $l->last_ten();
+ test_assert_regexp( $lastten[$#lastten], 'matchTHis2' );
+ test_assert_regexp( $lastten[$#lastten-1], 'Suppressed: before22' );
+ test_assert_regexp( $lastten[$#lastten-2], 'before21' );
+
+ $line = <$client>;
+ test_assert_regexp( $line, 'after2' );
+
# Test echo_to_dot_
***************
*** 182,186 ****
close TEMP;
open TEMP, "<temp.tmp";
! my $line = <TEMP>;
test_assert_regexp( $line, 'before1' );
$line = <TEMP>;
--- 232,236 ----
close TEMP;
open TEMP, "<temp.tmp";
! $line = <TEMP>;
test_assert_regexp( $line, 'before1' );
$line = <TEMP>;
***************
*** 192,196 ****
close TEMP;
! $line = <$handle>;
test_assert_regexp( $line, 'after' );
--- 242,246 ----
close TEMP;
! $line = <$client>;
test_assert_regexp( $line, 'after' );
***************
*** 203,207 ****
# Reap the children
! $sp->reaper();
select( undef, undef, undef, 0.25 );
--- 253,261 ----
# Reap the children
! my @kids = keys %{$sp->{children__}};
! if ( $#kids >= 0 ) {
! $sp->reaper();
! @kids = keys %{$sp->{children__}};
! }
select( undef, undef, undef, 0.25 );
|
|
From: <jgr...@us...> - 2003-07-21 19:53:58
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv22859/Proxy
Modified Files:
Proxy.pm
Log Message:
Clean up code for tee_ and flush_extra_
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Proxy.pm 21 Jul 2003 19:06:14 -0000 1.23
--- Proxy.pm 21 Jul 2003 19:53:56 -0000 1.24
***************
*** 325,332 ****
# Send the message to the debug output and then send it to the appropriate socket
$self->log_( $text );
! print $socket $text if $socket->connected;
}
-
# ---------------------------------------------------------------------------------------------
#
--- 325,331 ----
# Send the message to the debug output and then send it to the appropriate socket
$self->log_( $text );
! print $socket $text;
}
# ---------------------------------------------------------------------------------------------
#
***************
*** 357,361 ****
print $client $_;
} else {
! $self->tee_($client, $_);
}
} else {
--- 356,360 ----
print $client $_;
} else {
! $self->tee_( $client, $_ );
}
} else {
***************
*** 405,424 ****
my ( $self, $mail, $client, $discard ) = @_;
! if ( $mail ) {
! if ( $mail->connected ) {
! my $selector = new IO::Select( $mail );
! my $buf = '';
! my $max_length = 8192;
! while( 1 ) {
! last unless () = $selector->can_read(0.01);
! last unless ( my $n = sysread( $mail, $buf, $max_length, length $buf ) );
! $self->tee_( $client, $buf ) if ( $discard != 1 );
! return $buf;
! }
! }
}
! return '';
}
--- 404,424 ----
my ( $self, $mail, $client, $discard ) = @_;
! $discard = 0 if ( !defined( $discard ) );
! my $selector = new IO::Select( $mail );
! my $buf = '';
! my $max_length = 8192;
! my ( $ready ) = $selector->can_read(0.01);
!
! if ( $ready == $mail ) {
! my $n = sysread( $mail, $buf, $max_length, length $buf );
!
! if ( $n > 0 ) {
! $self->tee_( $client, $buf ) if ( $discard != 1 );
! }
}
!
! return $buf;
}
|
|
From: <jgr...@us...> - 2003-07-21 19:53:40
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv22820
Modified Files:
coverage.pl
Log Message:
Simplify coverage calculator and make it work correctly when fork occurs
Index: coverage.pl
===================================================================
RCS file: /cvsroot/popfile/engine/coverage.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** coverage.pl 21 Jul 2003 19:03:51 -0000 1.3
--- coverage.pl 21 Jul 2003 19:53:36 -0000 1.4
***************
*** 23,27 ****
my @line_files = glob '*.lne';
! foreach my $file (@line_files) {
# Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
--- 23,27 ----
my @line_files = glob '*.lne';
! foreach my $file (sort @line_files) {
# Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
***************
*** 39,62 ****
my $current_line = 0;
- $count{$module}{executed} = [];
-
-
- $count{$module}{total_executable_lines} = 0;
- $count{$module}{total_lines} = 0;
while ( <SOURCE_FILE> ) {
! # Keep count of the total number of lines in this file
!
! $current_line += 1;
! $count{$module}{total_lines} += 1;
my $state = <LINE_DATA>;
if ( $state =~ /1/ ) {
! $count{$module}{total_executable_lines} += 1;
! $count{$module}{executed}[$current_line] = 1;
} elsif ( $state =~ /0/ ) {
! $count{$module}{total_executable_lines} += 1;
! # print "$module.pm:$current_line $_";
}
}
--- 39,54 ----
my $current_line = 0;
while ( <SOURCE_FILE> ) {
! $current_line += 1;
my $state = <LINE_DATA>;
if ( $state =~ /1/ ) {
! $count{$module}{executed}{$current_line} = 1;
} elsif ( $state =~ /0/ ) {
! if ( $count{$module}{executed}{$current_line} != 1 ) {
! $count{$module}{executed}{$current_line} = 0;
! }
}
}
***************
*** 70,81 ****
foreach my $module ( keys( %count ) )
{
! my $total_executed = 0;
! foreach my $line ( 0 .. $#{$count{$module}{executed}} ) {
! if ($count{$module}{executed}[$line]) {
$total_executed += 1;
! }
}
! $files{$module} = int(100 * $total_executed / $count{$module}{total_executable_lines}) unless ( $count{$module}{total_executable_lines} == 0 );
}
--- 62,77 ----
foreach my $module ( keys( %count ) )
{
! my $total_executed = 0;
! my $total_not_executed = 0;
!
! foreach my $line ( keys %{$count{$module}{executed}} ) {
! if ($count{$module}{executed}{$line} == 1) {
$total_executed += 1;
! } else {
! $total_not_executed += 1;
! }
}
! $files{$module} = int(100 * $total_executed / ( $total_executed + $total_not_executed ));
}
|
|
From: <jgr...@us...> - 2003-07-21 19:06:17
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv14453/Proxy
Modified Files:
Proxy.pm
Log Message:
Rename verbose parameter to log to make it clearer
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Proxy.pm 21 Jul 2003 19:03:52 -0000 1.22
--- Proxy.pm 21 Jul 2003 19:06:14 -0000 1.23
***************
*** 336,340 ****
# $client The local mail client (created with IO::) that needs the response
# $regexp The pattern match to terminate echoing, compile using qr/pattern/
! # $verbose (OPTIONAL) log output if 1, defaults to 0 if unset
# $suppress (OPTIONAL) suppress any lines that match, compile using qr/pattern/
#
--- 336,340 ----
# $client The local mail client (created with IO::) that needs the response
# $regexp The pattern match to terminate echoing, compile using qr/pattern/
! # $log (OPTIONAL) log output if 1, defaults to 0 if unset
# $suppress (OPTIONAL) suppress any lines that match, compile using qr/pattern/
#
***************
*** 344,350 ****
sub echo_to_regexp_
{
! my ( $self, $mail, $client, $regexp, $verbose, $suppress ) = @_;
! $verbose = 0 if (!defined($verbose));
while ( <$mail> ) {
--- 344,350 ----
sub echo_to_regexp_
{
! my ( $self, $mail, $client, $regexp, $log, $suppress ) = @_;
! $log = 0 if (!defined($log));
while ( <$mail> ) {
***************
*** 354,362 ****
if (!defined($suppress) || !( $_ =~ $suppress )) {
! if (!$verbose) {
print $client $_;
} else {
- # This creates log output
-
$self->tee_($client, $_);
}
--- 354,360 ----
if (!defined($suppress) || !( $_ =~ $suppress )) {
! if (!$log) {
print $client $_;
} else {
$self->tee_($client, $_);
}
|
|
From: <jgr...@us...> - 2003-07-21 19:03:55
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv14025
Modified Files:
coverage.pl tests.pl
Log Message:
Fix hanging problem with TestProxy
Index: coverage.pl
===================================================================
RCS file: /cvsroot/popfile/engine/coverage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** coverage.pl 15 Jul 2003 01:45:36 -0000 1.2
--- coverage.pl 21 Jul 2003 19:03:51 -0000 1.3
***************
*** 37,41 ****
open SOURCE_FILE, "<../$module.pm";
open LINE_DATA, "<$file";
- #$module = $file;
my $current_line = 0;
--- 37,40 ----
***************
*** 59,63 ****
} elsif ( $state =~ /0/ ) {
$count{$module}{total_executable_lines} += 1;
! } else {
}
}
--- 58,62 ----
} elsif ( $state =~ /0/ ) {
$count{$module}{total_executable_lines} += 1;
! # print "$module.pm:$current_line $_";
}
}
***************
*** 73,77 ****
my $total_executed = 0;
foreach my $line ( 0 .. $#{$count{$module}{executed}} ) {
! $total_executed++ if ($count{$module}{executed}[$line]);
}
--- 72,78 ----
my $total_executed = 0;
foreach my $line ( 0 .. $#{$count{$module}{executed}} ) {
! if ($count{$module}{executed}[$line]) {
! $total_executed += 1;
! }
}
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tests.pl 13 Jul 2003 05:21:21 -0000 1.21
--- tests.pl 21 Jul 2003 19:03:51 -0000 1.22
***************
*** 45,49 ****
}
$test_failures += 1;
! }
flush STDOUT;
--- 45,51 ----
}
$test_failures += 1;
! } else {
! # print "Test pass at $file:$line\n";
! }
flush STDOUT;
|
|
From: <jgr...@us...> - 2003-07-21 19:03:55
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv14025/tests
Modified Files:
TestProxy.tst
Log Message:
Fix hanging problem with TestProxy
Index: TestProxy.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestProxy.tst 17 Jul 2003 20:14:17 -0000 1.5
--- TestProxy.tst 21 Jul 2003 19:03:52 -0000 1.6
***************
*** 154,158 ****
$sp->service_server();
open TEMP, ">temp.tmp";
! $sp->echo_to_regexp_( $sp->{remote_client__}, \*TEMP, qr/TH/ );
close TEMP;
open TEMP, "<temp.tmp";
--- 154,158 ----
$sp->service_server();
open TEMP, ">temp.tmp";
! $sp->echo_to_regexp_( $client, \*TEMP, qr/TH/ );
close TEMP;
open TEMP, "<temp.tmp";
***************
*** 167,171 ****
close TEMP;
! my $handle = $sp->{remote_client__};
$line = <$handle>;
test_assert_regexp( $line, 'after' );
--- 167,171 ----
close TEMP;
! my $handle = $client;
$line = <$handle>;
test_assert_regexp( $line, 'after' );
***************
*** 179,183 ****
$sp->service_server();
open TEMP, ">temp.tmp";
! $sp->echo_to_dot_( $sp->{remote_client__}, \*TEMP );
close TEMP;
open TEMP, "<temp.tmp";
--- 179,183 ----
$sp->service_server();
open TEMP, ">temp.tmp";
! $sp->echo_to_dot_( $client, \*TEMP );
close TEMP;
open TEMP, "<temp.tmp";
***************
*** 204,205 ****
--- 204,207 ----
$sp->reaper();
+
+ select( undef, undef, undef, 0.25 );
|
|
From: <jgr...@us...> - 2003-07-21 19:03:55
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1:/tmp/cvs-serv14025/Proxy Modified Files: Proxy.pm Log Message: Fix hanging problem with TestProxy Index: Proxy.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Proxy.pm 13 Jul 2003 04:01:35 -0000 1.21 --- Proxy.pm 21 Jul 2003 19:03:52 -0000 1.22 *************** *** 369,373 **** } - # --------------------------------------------------------------------------------------------- # --- 369,372 ---- |
|
From: <jgr...@us...> - 2003-07-21 18:49:55
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv11353/Classifier
Modified Files:
MailParse.pm
Log Message:
Someone left a debugging print statement in MailParse.pm... oops.
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** MailParse.pm 18 Jul 2003 05:08:56 -0000 1.146
--- MailParse.pm 21 Jul 2003 18:49:52 -0000 1.147
***************
*** 1298,1302 ****
while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*?)\?=/ig ) {
if ($1 eq "B") {
- print $2;
$decode_it = decode_base64( $2 );
$mystring =~ s/=\?[\w-]+\?B\?(.*?)\?=/$decode_it/i;
--- 1298,1301 ----
|
|
From: <jgr...@us...> - 2003-07-21 18:24:20
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv6472 Added Files: Czech.msg Log Message: Add Czech localization --- NEW FILE: Czech.msg --- (This appears to be a binary file; contents omitted.) |
11 messages has been excluded from this view by a project administrator.
