Menu
▾
▴
openinteract-commits — CVS updates for OpenInteract/SPOPS
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(381) |
Nov
(176) |
Dec
(310) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(334) |
Feb
(96) |
Mar
(149) |
Apr
(214) |
May
(120) |
Jun
(56) |
Jul
(10) |
Aug
(273) |
Sep
(182) |
Oct
(56) |
Nov
(125) |
Dec
(22) |
| 2003 |
Jan
(63) |
Feb
(181) |
Mar
(498) |
Apr
(433) |
May
(39) |
Jun
(512) |
Jul
(276) |
Aug
(156) |
Sep
(101) |
Oct
(66) |
Nov
(24) |
Dec
(161) |
| 2004 |
Jan
(1) |
Feb
(377) |
Mar
(68) |
Apr
(26) |
May
(107) |
Jun
(333) |
Jul
(13) |
Aug
|
Sep
(76) |
Oct
(88) |
Nov
(170) |
Dec
(91) |
| 2005 |
Jan
(52) |
Feb
(239) |
Mar
(402) |
Apr
(15) |
May
(2) |
Jun
(1) |
Jul
(13) |
Aug
|
Sep
(71) |
Oct
(34) |
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(7) |
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Salve J. N. <sj...@us...> - 2005-01-10 15:14:33
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8232/pkg/base_page/OpenInteract2/Action Modified Files: Page.pm Log Message: %DISPLAY_TYPES (which defines which file types should be shown inside the normal template setup) should not contain text/css Index: Page.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action/Page.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Page.pm 8 Nov 2004 14:48:41 -0000 1.23 --- Page.pm 10 Jan 2005 15:14:23 -0000 1.24 *************** *** 30,34 **** # etc.) get sent to the user directly ! my %DISPLAY_TYPES = map { $_ => 1 } ( 'text/html', 'text/css', 'text/plain' ); # Use this to separate your single document into multiple pages --- 30,34 ---- # etc.) get sent to the user directly ! my %DISPLAY_TYPES = map { $_ => 1 } ( 'text/html', 'text/plain' ); # Use this to separate your single document into multiple pages |
|
From: Salve J. N. <sj...@us...> - 2005-01-06 09:40:23
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20165/pkg/base_user/template Modified Files: new_user_form.tmpl Log Message: Get the title from the I18N system instead of having it hardcoded Index: new_user_form.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/template/new_user_form.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** new_user_form.tmpl 22 Feb 2004 04:44:48 -0000 1.5 --- new_user_form.tmpl 6 Jan 2005 09:40:14 -0000 1.6 *************** *** 7,11 **** <div align="center"> ! <h2>Create an Account</h2> [% PROCESS form_begin( ACTION = 'newuser', TASK = 'add', --- 7,11 ---- <div align="center"> ! <h2>[% MSG( 'base_user.new_form.page_title' ) %]</h2> [% PROCESS form_begin( ACTION = 'newuser', TASK = 'add', |
|
From: Salve J. N. <sj...@us...> - 2005-01-06 09:20:31
|
Update of /cvsroot/openinteract/OpenInteract2/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15369/lib Modified Files: OpenInteract2.pod Log Message: Move current DESCRIPTION to SYNOPSIS, and give a proper description of what OI2 delivers in the new one, so that external packaging tools like Debian's dh-make-perl can pick use it to describe the package. Index: OpenInteract2.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2.pod,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OpenInteract2.pod 4 Dec 2004 03:51:14 -0000 1.3 --- OpenInteract2.pod 6 Jan 2005 09:20:23 -0000 1.4 *************** *** 5,8 **** --- 5,15 ---- =head1 DESCRIPTION + OpenInteract is a web application server written in Perl. It + features integrated data persistence, security, user and group + management, plus an easy way to create and distribute fully + database-independent applications. + + =head1 SYNOPSIS + This is a stub so you can find documentation quicker. Please check out L<OpenInteract2::Manual|OpenInteract2::Manual> for the overview and |
|
From: Salve J. N. <sj...@us...> - 2005-01-06 09:03:15
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11971/lib/OpenInteract2 Modified Files: SPOPS.pm Log Message: OIN-113: Use correct datasource (Fixed by Chris) Index: SPOPS.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/SPOPS.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** SPOPS.pm 27 Nov 2004 20:47:21 -0000 1.26 --- SPOPS.pm 6 Jan 2005 09:03:05 -0000 1.27 *************** *** 298,302 **** sub global_datasource_handle { my ( $self, $connect_key ) = @_; ! $connect_key ||= $self->CONFIG->{datasource_config}{spops}; return CTX->datasource( $connect_key ); } --- 298,303 ---- sub global_datasource_handle { my ( $self, $connect_key ) = @_; ! $connect_key ||= $self->CONFIG->{datasource} ! || CTX->lookup_default_datasource_name; return CTX->datasource( $connect_key ); } |
|
From: Salve J. N. <sj...@us...> - 2004-12-16 13:33:56
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30930/t Modified Files: utils.pl Log Message: bump up comments version to 1.19 Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** utils.pl 5 Dec 2004 20:54:35 -0000 1.85 --- utils.pl 16 Dec 2004 13:33:46 -0000 1.86 *************** *** 56,60 **** base_theme => '2.10', base_user => '2.35', ! comments => '1.18', full_text => '2.58', lookup => '2.07', --- 56,60 ---- base_theme => '2.10', base_user => '2.35', ! comments => '1.19', full_text => '2.58', lookup => '2.07', |
|
From: Salve J. N. <sj...@us...> - 2004-12-16 13:21:13
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28235 Modified Files: MANIFEST Log Message: pkg/comments is updated, META.yml is removed Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** MANIFEST 5 Dec 2004 18:48:45 -0000 1.105 --- MANIFEST 16 Dec 2004 13:21:03 -0000 1.106 *************** *** 7,11 **** MANIFEST.SKIP Makefile.PL - META.yml README VERSION --- 7,10 ---- *************** *** 166,170 **** pkg/base_theme-2.10.zip pkg/base_user-2.35.zip ! pkg/comments-1.18.zip pkg/full_text-2.58.zip pkg/lookup-2.07.zip --- 165,169 ---- pkg/base_theme-2.10.zip pkg/base_user-2.35.zip ! pkg/comments-1.19.zip pkg/full_text-2.58.zip pkg/lookup-2.07.zip |
|
From: Chris W. <la...@us...> - 2004-12-07 22:44:33
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30317/OpenInteract2/Action Modified Files: Comments.pm Log Message: OIN-110: fix status message masqerading as error message Index: Comments.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/OpenInteract2/Action/Comments.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Comments.pm 5 Dec 2004 08:51:22 -0000 1.9 --- Comments.pm 7 Dec 2004 22:44:20 -0000 1.10 *************** *** 434,438 **** } else { ! $self->add_error_key( 'comments.status.add_ok' ); # These are used for the listing page we go to next... --- 434,438 ---- } else { ! $self->add_status_key( 'comments.status.add_ok' ); # These are used for the listing page we go to next... |
|
From: Chris W. <la...@us...> - 2004-12-07 22:44:33
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30317 Modified Files: Changes package.conf Log Message: OIN-110: fix status message masqerading as error message Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/Changes,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Changes 5 Dec 2004 08:51:21 -0000 1.16 --- Changes 7 Dec 2004 22:44:20 -0000 1.17 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package comments. + 1.19 Tue Dec 7 17:43:25 EST 2004 + + OIN-110: Fix bug with status message + 1.18 Sat Dec 4 01:28:53 EST 2004 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/package.conf,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** package.conf 5 Dec 2004 08:51:21 -0000 1.16 --- package.conf 7 Dec 2004 22:44:20 -0000 1.17 *************** *** 1,4 **** name comments ! version 1.18 author Chris Winters <ch...@cw...> url http://www.cwinters.com/ --- 1,4 ---- name comments ! version 1.19 author Chris Winters <ch...@cw...> url http://www.cwinters.com/ |
|
From: Chris W. <la...@us...> - 2004-12-05 21:17:54
|
Update of /cvsroot/openinteract/Bundle/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10635 Modified Files: Changes META.yml OpenInteract2.pm Log Message: latest Index: Changes =================================================================== RCS file: /cvsroot/openinteract/Bundle/OpenInteract2/Changes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Changes 4 Mar 2004 04:53:37 -0000 1.1 --- Changes 5 Dec 2004 21:17:42 -0000 1.2 *************** *** 1,4 **** --- 1,14 ---- Revision history for Perl extension Bundle::OpenInteract2 + 1.03 Fri Dec 3 23:16:38 EST 2004 + + Updates for 1.99_05 + + 1.02 Thu Jun 17 17:12:21 EDT 2004 + + Update version of SPOPS required. + + 1.01 ... + 1.00 Wed Mar 3 23:54:59 EST 2004 Index: META.yml =================================================================== RCS file: /cvsroot/openinteract/Bundle/OpenInteract2/META.yml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** META.yml 4 Mar 2004 14:18:59 -0000 1.1 --- META.yml 5 Dec 2004 21:17:42 -0000 1.2 *************** *** 1,5 **** #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Bundle-OpenInteract2 ! version: 1.00 version_from: OpenInteract2.pm installdirs: site --- 1,5 ---- #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Bundle-OpenInteract2 ! version: 1.02 version_from: OpenInteract2.pm installdirs: site Index: OpenInteract2.pm =================================================================== RCS file: /cvsroot/openinteract/Bundle/OpenInteract2/OpenInteract2.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OpenInteract2.pm 4 Mar 2004 14:18:33 -0000 1.2 --- OpenInteract2.pm 5 Dec 2004 21:17:42 -0000 1.3 *************** *** 3,7 **** # $Id$ ! $Bundle::OpenInteract2::VERSION = '1.00'; 1; --- 3,7 ---- # $Id$ ! $Bundle::OpenInteract2::VERSION = '1.03'; 1; *************** *** 43,48 **** DateTime::Format::Strptime (1.00) - DBD::SQLite (0.25) - Devel::StackTrace --- 43,46 ---- *************** *** 55,63 **** File::Copy ! File::DirSync File::MMagic ! Getopt::Long HTML::Entities (1.13) --- 53,61 ---- File::Copy ! File::DirSync (1.11) File::MMagic ! Getopt::Long (2.32) HTML::Entities (1.13) *************** *** 65,68 **** --- 63,68 ---- Lingua::Stem (0.50) + Locale::Maketext (1.06) + Log::Dispatch (2.00) *************** *** 79,83 **** Pod::POM (0.15) ! SPOPS (0.80) Template (2.04) --- 79,83 ---- Pod::POM (0.15) ! SPOPS (0.87) Template (2.04) *************** *** 87,92 **** --- 87,96 ---- Test::More (0.41) + Text::Sentence + URI + DBD::SQLite (0.25) + =head1 DESCRIPTION *************** *** 102,106 **** News, documentation and collaborative environment: ! http://openinteract.sourceforge.net/ =head1 AUTHOR --- 106,110 ---- News, documentation and collaborative environment: ! http://www.openinteract.org/ =head1 AUTHOR |
|
From: Chris W. <la...@us...> - 2004-12-05 21:16:02
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10242/OpenInteract2/Action Modified Files: News.pm Log Message: fix small date bug Index: News.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Action/News.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** News.pm 5 Dec 2004 08:51:23 -0000 1.11 --- News.pm 5 Dec 2004 21:15:53 -0000 1.12 *************** *** 40,44 **** num_items => $num_items ); my $where = "active_on <= ? AND active = ? "; ! my @values = ( CTX->create_date, 'yes' ); my $news_class = CTX->lookup_object( 'news' ); my $items = eval { --- 40,44 ---- num_items => $num_items ); my $where = "active_on <= ? AND active = ? "; ! my @values = ( OpenInteract2::Util->now, 'yes' ); my $news_class = CTX->lookup_object( 'news' ); my $items = eval { |
|
From: Chris W. <la...@us...> - 2004-12-05 21:10:43
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9238 Modified Files: Context.pm Log Message: fix DateTime call Index: Context.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Context.pm,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** Context.pm 5 Dec 2004 08:56:14 -0000 1.77 --- Context.pm 5 Dec 2004 21:10:32 -0000 1.78 *************** *** 443,449 **** } elsif ( $params->{epoch} ) { ! return DateTime->now( ! time_zone => $self->timezone_object, ! from_epoch => $params->{epoch}, ); } --- 443,449 ---- } elsif ( $params->{epoch} ) { ! return DateTime->from_epoch( ! time_zone => $self->timezone_object, ! epoch => $params->{epoch}, ); } |
|
From: Chris W. <la...@us...> - 2004-12-05 21:08:36
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8814 Modified Files: Util.pm Log Message: fix call to create_date() Index: Util.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Util.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Util.pm 5 Dec 2004 20:05:21 -0000 1.15 --- Util.pm 5 Dec 2004 21:08:20 -0000 1.16 *************** *** 38,42 **** $p->{format} ||= '%Y-%m-%d %T'; $p->{time} ||= time; ! return CTX->create_date( epoch => $p->{time} ) ->strftime( $p->{format} ); } --- 38,42 ---- $p->{format} ||= '%Y-%m-%d %T'; $p->{time} ||= time; ! return CTX->create_date({ epoch => $p->{time} }) ->strftime( $p->{format} ); } |
|
From: Chris W. <la...@us...> - 2004-12-05 21:02:19
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7527 Modified Files: TemplateSource.pm Log Message: require OI2::SiteTemplate manually (will eliminate all 'template' lookups later) Index: TemplateSource.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator/TemplateSource.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TemplateSource.pm 18 Feb 2004 05:25:27 -0000 1.11 --- TemplateSource.pm 5 Dec 2004 21:02:08 -0000 1.12 *************** *** 8,11 **** --- 8,12 ---- use OpenInteract2::Context qw( CTX ); use OpenInteract2::Exception qw( oi_error ); + use OpenInteract2::SiteTemplate; $OpenInteract2::ContentGenerator::TemplateSource::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/); *************** *** 92,96 **** sub load_source { my ( $class, $name ) = @_; ! my $content_template = CTX->lookup_class( 'template' )->fetch( $name ); unless ( $content_template ) { oi_error "Template with name [$name] not found."; --- 93,97 ---- sub load_source { my ( $class, $name ) = @_; ! my $content_template = OpenInteract2::SiteTemplate->fetch( $name ); unless ( $content_template ) { oi_error "Template with name [$name] not found."; *************** *** 224,226 **** =head1 AUTHORS ! Chris Winters E<lt>ch...@cw...E<gt> \ No newline at end of file --- 225,227 ---- =head1 AUTHORS ! Chris Winters E<lt>ch...@cw...E<gt> |
|
From: Chris W. <la...@us...> - 2004-12-05 20:54:44
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6172/t Modified Files: utils.pl Log Message: modify test logging messages Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** utils.pl 5 Dec 2004 18:50:11 -0000 1.84 --- utils.pl 5 Dec 2004 20:54:35 -0000 1.85 *************** *** 27,35 **** my $log_level = $WARN; $log = OpenInteract2::Log->init_file( 'oi2_tests.log', $log_level ); ! $log->warn( "Starting test run" ); } END { ! $log->warn( "Finished test run" ); } --- 27,35 ---- my $log_level = $WARN; $log = OpenInteract2::Log->init_file( 'oi2_tests.log', $log_level ); ! $log->warn( "Starting test run [$0] [", scalar localtime, "]" ); } END { ! $log->warn( "Finished test run [$0] [", scalar localtime, "]" ); } |
|
From: Chris W. <la...@us...> - 2004-12-05 20:54:14
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6101 Modified Files: Setup.pm Log Message: don't try to include SiteTemplate at startup (it's part of a package) Index: Setup.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Setup.pm 31 Oct 2004 00:24:59 -0000 1.53 --- Setup.pm 5 Dec 2004 20:54:03 -0000 1.54 *************** *** 617,622 **** # first read the system classes... ! my $system_classes = CTX->lookup_class; ! return $self->require_module({ class => [ values %{ $system_classes } ] }); } --- 617,628 ---- # first read the system classes... ! my $conf_system_classes = CTX->lookup_class; ! ! # TODO: fix this (don't include 'template' class in 'system_class'?) ! # Don't include the SiteTemplate file at startup because it gets ! # copied later to the tmplib and included ! my @system_classes = grep { $_ ne 'OpenInteract2::SiteTemplate' } ! values %{ $conf_system_classes }; ! return $self->require_module({ class => \@system_classes }); } |
|
From: Chris W. <la...@us...> - 2004-12-05 20:47:05
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4702 Modified Files: SQLInstall.pm Log Message: logging fix Index: SQLInstall.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/SQLInstall.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** SQLInstall.pm 10 Jun 2004 03:27:47 -0000 1.23 --- SQLInstall.pm 5 Dec 2004 20:46:56 -0000 1.24 *************** *** 348,352 **** } } ! $log->warn( "Data structure read from '$full_file': ", CTX->dump( $data_struct ) ); my $import_type = $data_struct->[0]->{import_type}; unless ( $import_type ) { --- 348,354 ---- } } ! $log->is_debug && ! $log->debug( "Data structure read from '$full_file': ", ! CTX->dump( $data_struct ) ); my $import_type = $data_struct->[0]->{import_type}; unless ( $import_type ) { |
|
From: Chris W. <la...@us...> - 2004-12-05 20:41:52
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3475/doc/Manual Modified Files: Changes.pod Log Message: add small note about other changes Index: Changes.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Changes.pod 5 Dec 2004 20:33:58 -0000 1.62 --- Changes.pod 5 Dec 2004 20:41:39 -0000 1.63 *************** *** 154,157 **** --- 154,163 ---- =item * + Lots of trying to make the system easier to understand, mostly at a + developer-level. This includes cleaning up interfaces, making common + usages easier, etc. + + =item * + Lots of changes to the packages included in the distribution. |
|
From: Chris W. <la...@us...> - 2004-12-05 20:34:11
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1907/doc/Manual Modified Files: Changes.pod Log Message: podfixes Index: Changes.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Changes.pod 5 Dec 2004 20:26:30 -0000 1.61 --- Changes.pod 5 Dec 2004 20:33:58 -0000 1.62 *************** *** 21,27 **** OI2 is currently at 1.99_05, equivalent to 2.0 beta 5. The next ! release should be a release candidate (1.99_06/2.0 RC1) -- it will ! have new features (see below) but everything else should be bugfixes ! after that or pushed off to 2.01. =head1 1.99_05 (2.0 beta 5), 5 Dec 2004 --- 21,27 ---- OI2 is currently at 1.99_05, equivalent to 2.0 beta 5. The next ! release should be a release candidate (1.99_06/2.0 RC1) -- its new ! features should only be minor; everything else should be bugfixes or ! pushed off to 2.01. =head1 1.99_05 (2.0 beta 5), 5 Dec 2004 *************** *** 497,502 **** these where possible.) - =item * - =back --- 497,500 ---- *************** *** 565,568 **** --- 563,568 ---- control commit (or whatever). + =back + L<OpenInteract2::Manage::Website::Upgrade> |
|
From: Chris W. <la...@us...> - 2004-12-05 20:26:43
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32394/doc/Manual Modified Files: Changes.pod Log Message: last changes before 1.99_05\! Index: Changes.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Changes.pod 5 Dec 2004 20:06:49 -0000 1.60 --- Changes.pod 5 Dec 2004 20:26:30 -0000 1.61 *************** *** 25,29 **** after that or pushed off to 2.01. ! =head1 1.99_05 =head2 Upgrade Notes --- 25,29 ---- after that or pushed off to 2.01. ! =head1 1.99_05 (2.0 beta 5), 5 Dec 2004 =head2 Upgrade Notes *************** *** 410,413 **** --- 410,426 ---- =back + L<OpenInteract2::Config::TransferSample> + + =over 4 + + =item * + + Track copied, skipped (due to read-only status) and same files, which + we now check by comparing the MD5 checksum for the source and + destination. These are all available as properties or, in the right + context, as return values from C<run()> or C<transfer()>. + + =back + L<OpenInteract2::Context> *************** *** 552,555 **** --- 565,577 ---- control commit (or whatever). + L<OpenInteract2::Manage::Website::Upgrade> + + =over 4 + + =item * + + Display the copied/skipped/same status for all files copied from the + 'sample/' directory. + =back *************** *** 704,708 **** =back ! L<OpenInteract2::URL> =over 4 --- 726,730 ---- =back ! L<OpenInteract2::Util> =over 4 *************** *** 813,832 **** OpenInteract 1.99_04 -> 1.99_05 ----------------------------------- ! base: 2.10 -> 2.10 base_box: 2.11 -> 2.17 base_error: 2.10 -> 2.10 ! base_group: 2.11 -> 2.15 base_page: 2.21 -> 2.28 ! base_security: 2.13 -> 2.17 ! base_template: 3.11 -> 3.14 ! base_theme: 2.09 -> 2.09 ! base_user: 2.27 -> 2.34 ! comments: 1.10 -> 1.17 ! full_text: 2.09 -> 2.57 ! lookup: 2.04 -> 2.06 ! news: 2.13 -> 2.19 object_activity: 2.11 -> 2.11 ! system_doc: 2.05 -> 2.07 ! whats_new: 2.04 -> 2.09 --- 835,854 ---- OpenInteract 1.99_04 -> 1.99_05 ----------------------------------- ! base: 2.10 -> 2.11 base_box: 2.11 -> 2.17 base_error: 2.10 -> 2.10 ! base_group: 2.11 -> 2.16 base_page: 2.21 -> 2.28 ! base_security: 2.13 -> 2.18 ! base_template: 3.11 -> 3.15 ! base_theme: 2.09 -> 2.10 ! base_user: 2.27 -> 2.35 ! comments: 1.10 -> 1.18 ! full_text: 2.09 -> 2.58 ! lookup: 2.04 -> 2.07 ! news: 2.13 -> 2.20 object_activity: 2.11 -> 2.11 ! system_doc: 2.05 -> 2.08 ! whats_new: 2.04 -> 2.10 |
|
From: Chris W. <la...@us...> - 2004-12-05 20:06:59
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27609/doc/Manual Modified Files: Changes.pod Log Message: latest changes Index: Changes.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Changes.pod 5 Dec 2004 18:50:10 -0000 1.59 --- Changes.pod 5 Dec 2004 20:06:49 -0000 1.60 *************** *** 704,707 **** --- 704,718 ---- =back + L<OpenInteract2::URL> + + =over 4 + + =item * + + Add C<digest_file()> as shortcut to calculate the hex MD5 digest of a + file's contents. + + =back + C<sample/website/filter.ini> |
|
From: Chris W. <la...@us...> - 2004-12-05 20:06:44
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27557/lib/OpenInteract2 Modified Files: Package.pm Log Message: use OI2::Util for MD5 Index: Package.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Package.pm 5 Dec 2004 18:50:10 -0000 1.40 --- Package.pm 5 Dec 2004 20:06:35 -0000 1.41 *************** *** 8,12 **** use Cwd qw( cwd ); use Data::Dumper qw( Dumper ); - use Digest::MD5 qw(); use ExtUtils::Manifest (); use File::Basename qw( basename dirname ); --- 8,11 ---- *************** *** 521,529 **** oi_error "Cannot generate digest: file '$package_file' invalid"; } ! my $fh = IO::File->new( $package_file ); ! $fh->binmode; ! my $digest = Digest::MD5->new->addfile( $fh )->hexdigest; ! $fh->close; ! return $digest; } --- 520,524 ---- oi_error "Cannot generate digest: file '$package_file' invalid"; } ! return OpenInteract2::Util->digest_file( $package_file ); } |
|
From: Chris W. <la...@us...> - 2004-12-05 20:05:31
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27358/lib/OpenInteract2 Modified Files: Util.pm Log Message: be sure we binmode the file before digesting Index: Util.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Util.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Util.pm 5 Dec 2004 20:01:35 -0000 1.14 --- Util.pm 5 Dec 2004 20:05:21 -0000 1.15 *************** *** 104,107 **** --- 104,108 ---- my $md5 = Digest::MD5->new(); open( IN, '<', $file ) || die "Cannot read '$file' for digest: $!"; + binmode( IN ); $md5->addfile( *IN ); close( IN ); |
|
From: Chris W. <la...@us...> - 2004-12-05 20:01:53
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26434/lib/OpenInteract2 Modified Files: Util.pm Log Message: transferring sample files on website upgrades now works as expected -- files with the same content will not be copied; files in the .no_overwrite will not be copied Index: Util.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Util.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Util.pm 5 Dec 2004 08:56:49 -0000 1.13 --- Util.pm 5 Dec 2004 20:01:35 -0000 1.14 *************** *** 4,7 **** --- 4,8 ---- use strict; + use Digest::MD5; use Log::Log4perl qw( get_logger ); use Mail::Sendmail (); *************** *** 58,66 **** my ( $class, $filename ) = @_; unless ( -f $filename ) { ! oi_error "Cannot open [$filename]: file does not exist"; } eval { open( MOD, '<', $filename ) || die $! }; if ( $@ ) { ! oi_error "Cannot open [$filename]: $@"; } my @lines = (); --- 59,67 ---- my ( $class, $filename ) = @_; unless ( -f $filename ) { ! oi_error "Cannot open '$filename': file does not exist"; } eval { open( MOD, '<', $filename ) || die $! }; if ( $@ ) { ! oi_error "Cannot read '$filename': $@"; } my @lines = (); *************** *** 80,88 **** my ( $class, $filename ) = @_; unless ( -f $filename ) { ! oi_error "Cannot open [$filename]: file does not exist"; } eval { open( PF, '<', $filename ) || die $! }; if ( $@ ) { ! oi_error "Cannot open [$filename]: $@"; } local $/ = undef; --- 81,89 ---- my ( $class, $filename ) = @_; unless ( -f $filename ) { ! oi_error "Cannot open '$filename': file does not exist"; } eval { open( PF, '<', $filename ) || die $! }; if ( $@ ) { ! oi_error "Cannot read '$filename': $@"; } local $/ = undef; *************** *** 99,102 **** --- 100,112 ---- } + sub digest_file { + my ( $class, $file ) = @_; + my $md5 = Digest::MD5->new(); + open( IN, '<', $file ) || die "Cannot read '$file' for digest: $!"; + $md5->addfile( *IN ); + close( IN ); + return $md5->hexdigest; + } + ######################################## # EMAIL ROUTINES *************** *** 294,297 **** --- 304,323 ---- '2003-04-01' for April 1, 2003. + =head1 FILE METHODS + + B<read_file_lines( $filename )> + + Returns content of C<$filename> as an arrayref of lines, with blanks + and comments skipped. + + B<read_perl_file( $filename )> + + Returns content of C<$flename> evaluated as a Perl data structure. + + B<digest_file( $filename )> + + Returns the hex MD5 digest of C<$filename> contents. (See + L<Digest::MD5> for restrictions, notably regarding unicode.) + =head1 MAIL METHODS |
|
From: Chris W. <la...@us...> - 2004-12-05 20:01:51
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26434/lib/OpenInteract2/Config Modified Files: Readonly.pm TransferSample.pm Log Message: transferring sample files on website upgrades now works as expected -- files with the same content will not be copied; files in the .no_overwrite will not be copied Index: Readonly.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/Readonly.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Readonly.pm 5 Dec 2004 18:50:10 -0000 1.10 --- Readonly.pm 5 Dec 2004 20:01:35 -0000 1.11 *************** *** 27,36 **** my ( $class, $directory ) = @_; unless ( -d $directory ) { ! oi_error "Must initialize a $class object with a valid directory"; } my $self = bless({ directory => $directory }, $class ); ! $self->get_readonly_files(); return $self; } --- 27,37 ---- my ( $class, $directory ) = @_; unless ( -d $directory ) { ! oi_error "Must initialize a $class object with a valid ", ! "directory (given: $directory)"; } my $self = bless({ directory => $directory }, $class ); ! $self->{readonly_files} = $self->_fill_readonly_files(); return $self; } *************** *** 46,55 **** sub get_readonly_files { my ( $self ) = @_; ! if ( $self->{readonly_files} ) { ! return [ keys %{ $self->{readonly_files} } ]; ! } $log ||= get_logger( LOG_CONFIG ); ! my $overwrite_check_file = $self->_create_readonly_file(); # This means everything is writeable... --- 47,58 ---- sub get_readonly_files { my ( $self ) = @_; ! return [ keys %{ $self->{readonly_files} } ]; ! } ! ! sub _fill_readonly_files { ! my ( $self ) = @_; $log ||= get_logger( LOG_CONFIG ); ! my $overwrite_check_file = $self->_create_readonly_filename(); # This means everything is writeable... *************** *** 71,76 **** } close( NOWRITE ); ! $self->{readonly_files} = { map { $_ => 1 } @readonly }; ! return \@readonly; } --- 74,78 ---- } close( NOWRITE ); ! return { map { $_ => 1 } @readonly }; } *************** *** 90,94 **** return undef; } ! my $overwrite_check_file = $self->_create_readonly_file(); eval { open( NOWRITE, '>', $overwrite_check_file ) || die $! }; if ( $@ ) { --- 92,96 ---- return undef; } ! my $overwrite_check_file = $self->_create_readonly_filename(); eval { open( NOWRITE, '>', $overwrite_check_file ) || die $! }; if ( $@ ) { *************** *** 106,110 **** } ! sub _create_readonly_file { my ( $self ) = @_; return catfile( rel2abs( $self->directory ), $READONLY_FILE ); --- 108,112 ---- } ! sub _create_readonly_filename { my ( $self ) = @_; return catfile( rel2abs( $self->directory ), $READONLY_FILE ); Index: TransferSample.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/TransferSample.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TransferSample.pm 5 Dec 2004 18:50:10 -0000 1.9 --- TransferSample.pm 5 Dec 2004 20:01:35 -0000 1.10 *************** *** 3,9 **** --- 3,11 ---- use strict; use base qw( Class::Accessor::Fast ); + use File::Basename qw( basename dirname ); use File::Copy qw( cp ); use File::Spec::Functions qw( catfile rel2abs ); use Log::Log4perl qw( get_logger ); + use OpenInteract2::Config::Readonly; use OpenInteract2::Constants qw( :log ); use OpenInteract2::Context qw( CTX ); *************** *** 13,17 **** $OpenInteract2::Config::TransferSample::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/); ! my @FIELDS = qw( source_dir file_spec files_copied ); __PACKAGE__->mk_accessors( @FIELDS ); --- 15,19 ---- $OpenInteract2::Config::TransferSample::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/); ! my @FIELDS = qw( source_dir file_spec files_copied files_skipped files_same ); __PACKAGE__->mk_accessors( @FIELDS ); *************** *** 21,28 **** my ( $class, $source_dir ) = @_; $log ||= get_logger( LOG_CONFIG ); ! my $self = bless( {}, $class ); $source_dir = rel2abs( $source_dir ); unless ( -d $source_dir ) { ! oi_error "Given source directory [$source_dir] is invalid"; } $self->source_dir( $source_dir ); --- 23,34 ---- my ( $class, $source_dir ) = @_; $log ||= get_logger( LOG_CONFIG ); ! my $self = bless( { ! files_copied => [], ! files_skipped => [], ! files_same => [], ! }, $class ); $source_dir = rel2abs( $source_dir ); unless ( -d $source_dir ) { ! oi_error "Source directory '$source_dir' is invalid"; } $self->source_dir( $source_dir ); *************** *** 35,38 **** --- 41,45 ---- sub run { my ( $self, $dest_dir, $template_vars ) = @_; + $log->is_info && $log->info( "Running transfer from '$dest_dir'..." ); $self->read_file_spec( $template_vars ); return $self->transfer( $dest_dir, $template_vars ); *************** *** 44,48 **** unless ( -f $copy_list_file ) { oi_error "File from which I read the file specifiecations ", ! "[$copy_list_file] does not exist"; } --- 51,55 ---- unless ( -f $copy_list_file ) { oi_error "File from which I read the file specifiecations ", ! "'$copy_list_file' does not exist"; } *************** *** 50,56 **** my ( $content ); $self->{_template}->process( $copy_list_file, $template_vars, \$content ) ! || oi_error "Cannot process template with files to ", ! "copy [$copy_list_file]: ", ! $self->{_template}->error; my @lines = split /\r?\n/, $content; my @files = (); --- 57,62 ---- my ( $content ); $self->{_template}->process( $copy_list_file, $template_vars, \$content ) ! || oi_error "Cannot process template with files to ", ! "copy '$copy_list_file': ", $self->{_template}->error; my @lines = split /\r?\n/, $content; my @files = (); *************** *** 71,81 **** my ( $self, $dest_dir, $template_vars ) = @_; unless ( ref( $self->file_spec ) eq 'ARRAY' ) { ! oi_error "You must run 'read_file_spec()' before running 'transfer()'"; } ! ! my $ro_check = OpenInteract2::Config::Readonly->new( $dest_dir ); $template_vars ||= {}; ! my @copied = (); foreach my $info ( @{ $self->file_spec } ) { my $source_spec = $info->[0]; --- 77,89 ---- my ( $self, $dest_dir, $template_vars ) = @_; unless ( ref( $self->file_spec ) eq 'ARRAY' ) { ! oi_error "You must run 'read_file_spec()' before running 'transfer()' (you ", ! "might try calling 'run()' instead of 'transfer()')"; } ! $log->is_info && ! $log->info( "Transferring files from '$dest_dir'..." ); $template_vars ||= {}; ! ! FILESPEC: foreach my $info ( @{ $self->file_spec } ) { my $source_spec = $info->[0]; *************** *** 88,101 **** } my $full_source_file = catfile( $self->source_dir, @{ $source_spec } ); my $full_dest_file = catfile( $dest_dir, @{ $dest_spec } ); ! unless ( $ro_check->is_writeable( $full_dest_file ) ) { ! $log->is_info && ! $log->info( "Skipping '$full_source_file', it's marked as ", ! "readonly in the destination directory" ); ! next; ! } # NOTE: You shouldn't assume because ( ! keys %{ $template_vars } ) --- 96,142 ---- } + my $relative_dest = join( '/', @{ $dest_spec } ); my $full_source_file = catfile( $self->source_dir, @{ $source_spec } ); my $full_dest_file = catfile( $dest_dir, @{ $dest_spec } ); + $log->is_info && + $log->info( "Copying from '$full_source_file' to '$full_dest_file'" ); ! # determine if we should overwrite + if ( -f $full_dest_file ) { + + my $base_dest_file = basename( $full_dest_file ); + my $full_dest_dir = dirname( $full_dest_file ); + + my $ro_check = OpenInteract2::Config::Readonly->new( $full_dest_dir ); + $log->is_debug && + $log->debug( "Files I shouldn't copy: ", + join( ', ', @{ $ro_check->get_readonly_files } ) ); + unless ( $ro_check->is_writeable( $base_dest_file ) ) { + $log->is_info && + $log->info( "Skipping '$base_dest_file', it's marked as ", + "readonly in the destination directory" ); + $self->add_skipped( $relative_dest ); + next FILESPEC; + } + + # first check the filesize before the relatively expensive digest + + my $source_file_size = (stat $full_source_file)[7]; + my $dest_file_size = (stat $full_dest_file)[7]; + if ( $source_file_size == $dest_file_size ) { + my $source_digest = + OpenInteract2::Util->digest_file( $full_source_file ); + my $dest_digest = + OpenInteract2::Util->digest_file( $full_source_file ); + if ( $source_digest eq $dest_digest ) { + $log->is_info && + $log->info( "Digests for files are the same, not copying" ); + $self->add_same( $relative_dest ); + next FILESPEC; + } + } + + } # NOTE: You shouldn't assume because ( ! keys %{ $template_vars } ) *************** *** 105,110 **** if ( $copy_only ) { cp( $full_source_file, $full_dest_file ) ! || oi_error "Cannot copy [$full_source_file] -> ", ! "[$full_dest_file]: $!"; $log->is_info && $log->info( "Copied w/o processing '$full_source_file' ", --- 146,151 ---- if ( $copy_only ) { cp( $full_source_file, $full_dest_file ) ! || oi_error "Cannot copy '$full_source_file' -> ", ! "'$full_dest_file': $!"; $log->is_info && $log->info( "Copied w/o processing '$full_source_file' ", *************** *** 114,129 **** else { $self->{_template}->process( $full_source_file, $template_vars, $full_dest_file ) ! || oi_error "Cannot copy and token-replace file ", ! "[$full_source_file] -> [$full_dest_file]: ", ! $self->{_template}->error; $log->is_info && $log->info( "Copied with processing '$full_source_file' ", "-> '$full_dest_file'" ); } ! push @copied, $full_dest_file; } ! return $self->files_copied( \@copied ); } 1; --- 155,189 ---- else { $self->{_template}->process( $full_source_file, $template_vars, $full_dest_file ) ! || oi_error "Cannot copy and token-replace file ", ! "'$full_source_file' -> '$full_dest_file': ", ! $self->{_template}->error; $log->is_info && $log->info( "Copied with processing '$full_source_file' ", "-> '$full_dest_file'" ); } ! $self->add_copied( $relative_dest ); } ! return wantarray ! ? ( $self->files_copied, $self->files_skipped, $self->files_same ) ! : $self->files_copied; } + sub add_copied { + my ( $self, @files ) = @_; + push @{ $self->{files_copied} }, @files; + } + + sub add_skipped { + my ( $self, @files ) = @_; + push @{ $self->{files_skipped} }, @files; + } + + sub add_same { + my ( $self, @files ) = @_; + push @{ $self->{files_same} }, @files; + } + + + 1; *************** *** 167,170 **** --- 227,236 ---- ->new( $source_dir ) ->run( $dest_dir, \%template_vars ); + + # We can also get the files we did not copy + + my ( $copies, $skips ) = OpenInteract2::Config::TransferSample + ->new( $source_dir ) + ->run( $dest_dir, \%template_vars ); =head1 DESCRIPTION *************** *** 188,192 **** Copies files from a source directory tree to a destination directory tree. They do not need to be copied to the same levels of the tree, or ! even have the same resulting filename. =back --- 254,260 ---- Copies files from a source directory tree to a destination directory tree. They do not need to be copied to the same levels of the tree, or ! even have the same resulting filename. Any files in the destination ! directory's '.no_overwrite' file will not be copied. (See ! L<OpenInteract2::Config::Readonly> for more.) =back *************** *** 284,287 **** --- 352,359 ---- copied. + Returns: in a scalar context returns an arrayref of files copied; in + list context returns an arrayref of files copied and arrayref of files + skipped. + B<read_file_spec( [ \%template_vars ] )> *************** *** 305,308 **** --- 377,387 ---- templates. + No action will be taken for any files are found in the destination + directory's '.no_overwrite' file. (See + L<OpenInteract2::Config::Readonly>.) + + We also don't do anything if two files are the same -- that is, if + their MD5 digests are the same. + =head1 PROPERTIES *************** *** 318,330 **** B<files_copied> ! Results of C<transfer()> operation, also filled after C<run()>. ! ! =head1 TO DO ! B<Copy only new files> ! For files that are marked as copy-only, compare the file size and ! date. If both are equal, don't do the copy. (Makes it easy for people ! to see what's new.) =head1 COPYRIGHT --- 397,405 ---- B<files_copied> ! Results from C<transfer()> operation, also filled after C<run()>. ! B<files_skipped> ! Results from C<transfer()> operation, also filled after C<run()>. =head1 COPYRIGHT |
|
From: Chris W. <la...@us...> - 2004-12-05 20:01:51
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26434/lib/OpenInteract2/Manage/Website Modified Files: Upgrade.pm Log Message: transferring sample files on website upgrades now works as expected -- files with the same content will not be copied; files in the .no_overwrite will not be copied Index: Upgrade.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Upgrade.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Upgrade.pm 17 Oct 2004 20:46:34 -0000 1.14 --- Upgrade.pm 5 Dec 2004 20:01:35 -0000 1.15 *************** *** 52,61 **** my $widget_dir = catdir( $source_dir, 'sample', 'website', 'template' ); my $website_dir = $self->param( 'website_dir' ); ! my $copied = OpenInteract2::Config::TransferSample ! ->new( $widget_dir ) ! ->run( $website_dir ); ! foreach my $file ( @{ $copied } ) { ! $self->_ok( 'copy updated template files', "File $file copied", ! filename => $file ); } $self->notify_observers( progress => 'Widget copy complete' ); --- 52,77 ---- my $widget_dir = catdir( $source_dir, 'sample', 'website', 'template' ); my $website_dir = $self->param( 'website_dir' ); ! my $transfer = OpenInteract2::Config::TransferSample->new( $widget_dir ); ! $transfer->run( $website_dir ); ! foreach my $file ( @{ $transfer->files_copied } ) { ! $self->_ok( ! 'copy updated template files', ! "File $file copied", ! filename => $file ! ); ! } ! foreach my $file ( @{ $transfer->files_skipped } ) { ! $self->_ok( ! 'copy updated template files', ! "File $file skipped, marked as read-only", ! filename => $file ! ); ! } ! foreach my $file ( @{ $transfer->files_same } ) { ! $self->_ok( ! 'copy updated template files', ! "File $file skipped, source and destination same", ! filename => $file ! ); } $self->notify_observers( progress => 'Widget copy complete' ); |
4 messages has been excluded from this view by a project administrator.
