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: Chris W. <la...@us...> - 2005-04-13 11:10:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17693 Removed Files: install_user_language.dat Log Message: moved to install_user_language.csv --- install_user_language.dat DELETED --- |
|
From: Chris W. <la...@us...> - 2005-04-13 11:09:25
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17349 Modified Files: install_security.csv Added Files: install_user_language.csv Log Message: OIN-138: add CSV data files as example --- NEW FILE: install_user_language.csv --- import_type = object; spops_class = OpenInteract2::UserLanguage; delimiter = | language en Index: install_security.csv =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/data/install_security.csv,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install_security.csv 13 Apr 2005 09:22:09 -0000 1.1 --- install_security.csv 13 Apr 2005 11:09:16 -0000 1.2 *************** *** 1,3 **** ! import_type = object; spops_class = OpenInteract2::Security; transform_default = object_id, scope_id; class | object_id | scope | scope_id | security_level OpenInteract2::Action::User | 0 | w | world | 4 --- 1,3 ---- ! import_type = object; spops_class = OpenInteract2::Security; transform_default = object_id, scope_id; delimiter = | class | object_id | scope | scope_id | security_level OpenInteract2::Action::User | 0 | w | world | 4 |
|
From: Salve J. N. <sj...@us...> - 2005-04-13 09:22:54
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25971 Modified Files: MANIFEST Log Message: - Update install_security to reflect that it's a CSV file - Update MANIFEST Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/MANIFEST,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MANIFEST 2 Apr 2005 23:42:21 -0000 1.10 --- MANIFEST 13 Apr 2005 09:21:57 -0000 1.11 *************** *** 8,12 **** conf/ldap_spops_user.ini data/install_security.csv ! data/install_user_language.csv msg/base_user-messages-en.msg msg/base_user-messages-no.msg --- 8,12 ---- conf/ldap_spops_user.ini data/install_security.csv ! data/install_user_language.dat msg/base_user-messages-en.msg msg/base_user-messages-no.msg |
|
From: Salve J. N. <sj...@us...> - 2005-04-13 09:22:17
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25971/data Added Files: install_security.csv Removed Files: install_security.dat Log Message: - Update install_security to reflect that it's a CSV file - Update MANIFEST --- NEW FILE: install_security.csv --- import_type = object; spops_class = OpenInteract2::Security; transform_default = object_id, scope_id; class | object_id | scope | scope_id | security_level OpenInteract2::Action::User | 0 | w | world | 4 OpenInteract2::Action::User | 0 | g | public_group | 8 OpenInteract2::Action::User | 0 | g | site_admin_group | 8 OpenInteract2::User | superuser | u | superuser | 8 OpenInteract2::User | superuser | w | world | 4 --- install_security.dat DELETED --- |
|
From: Teemu A. <in...@us...> - 2005-04-12 18:38:38
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7411/lib/OpenInteract2 Modified Files: I18N.pm Log Message: manual [_?] replace did not work as it should Index: I18N.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/I18N.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** I18N.pm 23 Mar 2005 19:17:54 -0000 1.10 --- I18N.pm 12 Apr 2005 18:38:13 -0000 1.11 *************** *** 40,44 **** while ( 1 ) { last unless $key =~ /\[_$iteration\]/; ! $key =~ s/\[_$iteration\]/$args[$iteration]/g; $iteration++; } --- 40,44 ---- while ( 1 ) { last unless $key =~ /\[_$iteration\]/; ! $key =~ s/\[_$iteration\]/$args[$iteration-1]/g; $iteration++; } |
|
From: Teemu A. <in...@us...> - 2005-04-06 20:54:41
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6614/Request Modified Files: Apache2.pm Apache.pm CGI.pm LWP.pm Standalone.pm Log Message: Implemented forwarded_for() which enables us to see remote hosts behind trusted proxies. Only tested with Apache.pm but the others should work in theory. A server configuration option could be added which when enabled, parses the first non-trusted IP address out of the forwarded_for() and places it directly as remote_host(). Index: Apache2.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache2.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Apache2.pm 17 Mar 2005 14:58:04 -0000 1.3 --- Apache2.pm 6 Apr 2005 20:54:31 -0000 1.4 *************** *** 68,71 **** --- 68,73 ---- $self->server_name( $r->get_server_name ); $self->remote_host( $r->connection->remote_addr->ip_get ); + $self->forwarded_for( $r->headers_in->get('X-Forwarded-For') ); + $log->is_info && $log->info( "Finished creating Apache 2.x request" ); Index: Apache.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Apache.pm 17 Mar 2005 14:58:04 -0000 1.17 --- Apache.pm 6 Apr 2005 20:54:31 -0000 1.18 *************** *** 90,93 **** --- 90,95 ---- $self->server_name( $srv->server_hostname ); $self->remote_host( $self->apache->connection->remote_ip ); + $self->forwarded_for( $self->apache->headers_in->{'X-Forwarded-For'} ); + $log->is_info && $log->info( "Finished creating Apache 1.x request" ); Index: CGI.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/CGI.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CGI.pm 18 Mar 2005 04:09:51 -0000 1.23 --- CGI.pm 6 Apr 2005 20:54:31 -0000 1.24 *************** *** 57,60 **** --- 57,61 ---- $self->server_name( $cgi->server_name ); $self->remote_host( $cgi->remote_host ); + $self->forwarded_for( $ENV{'X-Forwarded-For'} ); # Then the rest of the parameters/uploads (works with other Index: LWP.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/LWP.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** LWP.pm 18 Mar 2005 04:09:51 -0000 1.22 --- LWP.pm 6 Apr 2005 20:54:31 -0000 1.23 *************** *** 43,46 **** --- 43,47 ---- $self->cookie_header( $cookie ); $self->language_header( $lwp_request->header( 'Accept-Language' ) ); + $self->forwarded_for( $lwp_request->header( 'X-Forwarded-For' ) ); if ( $client ) { Index: Standalone.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Standalone.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Standalone.pm 18 Mar 2005 04:09:51 -0000 1.14 --- Standalone.pm 6 Apr 2005 20:54:31 -0000 1.15 *************** *** 58,61 **** --- 58,62 ---- $self->server_name( $props->{server_name} ); $self->remote_host( $props->{remote_host} ); + $self->forwarded_for( $props->{forwarded_for} ); $log->is_debug && $log->debug( "Set request and server properties ok" ); *************** *** 147,165 **** OpenInteract2::Request->set_implementation_type( 'standalone' ); ! # Create all the request infomration offline... my %req_params = ( ! url => '/path/to/my/doc.html', ! referer => 'http://www.foo.bar/path/to/my/index.html', ! user_agent => 'OI2 Standalone Requester', ! server_name => 'www.foo.bar', ! remote_host => '192.168.1.1', ! param => { eyes => 'two', ! soda => [ 'rc', 'mr. pibb' ] }, ! cookie => [ 'lastSeen=1051797475;firstLogin=1051797075', ! OpenInteract2::Cookie->new( ... ), ], ! upload => { sendfile => OpenInteract2::Upload->new( ... ), ! screenshot => OpenInteract2::Upload->new( ... ) }, ! languages => [ 'en-UK', 'en-US', 'de', 'fr' ], ); --- 148,167 ---- OpenInteract2::Request->set_implementation_type( 'standalone' ); ! # Create all the request information offline... my %req_params = ( ! url => '/path/to/my/doc.html', ! referer => 'http://www.foo.bar/path/to/my/index.html', ! user_agent => 'OI2 Standalone Requester', ! server_name => 'www.foo.bar', ! remote_host => '192.168.1.1', ! forwarded_for => '154.12.0.4, 10.2.1.2', ! param => { eyes => 'two', ! soda => [ 'rc', 'mr. pibb' ] }, ! cookie => [ 'lastSeen=1051797475;firstLogin=1051797075', ! OpenInteract2::Cookie->new( ... ), ], ! upload => { sendfile => OpenInteract2::Upload->new( ... ), ! screenshot => OpenInteract2::Upload->new( ... ) }, ! languages => [ 'en-UK', 'en-US', 'de', 'fr' ], ); *************** *** 248,251 **** --- 250,257 ---- =item * + B<forwarded_for> - Set to the list of proxy IP addresses inbetween of the request. + + =item * + B<user_agent> - Set to the user agent for this request. |
|
From: Teemu A. <in...@us...> - 2005-04-06 20:54:39
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6614 Modified Files: Request.pm Log Message: Implemented forwarded_for() which enables us to see remote hosts behind trusted proxies. Only tested with Apache.pm but the others should work in theory. A server configuration option could be added which when enabled, parses the first non-trusted IP address out of the forwarded_for() and places it directly as remote_host(). Index: Request.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Request.pm 24 Mar 2005 05:14:21 -0000 1.57 --- Request.pm 6 Apr 2005 20:54:30 -0000 1.58 *************** *** 26,30 **** now server_name remote_host user_agent referer cookie_header language_header ! url_absolute url_relative url_initial session auth_user auth_group auth_is_admin auth_is_logged_in ); --- 26,30 ---- now server_name remote_host user_agent referer cookie_header language_header ! url_absolute url_relative url_initial forwarded_for session auth_user auth_group auth_is_admin auth_is_logged_in ); *************** *** 808,811 **** --- 808,818 ---- Client IP address or hostname connecting to us. + B<forwarded_for> + + Comma separated list of IP addresses some proxies inbetween might + have forwarded the request for. If OpenInteract2 is behind truested proxies, + this is a good place to look for the real IP address instead of + the I<remote_host()> which includes the IP address of your proxy. + B<user_agent> |
|
From: Chris W. <la...@us...> - 2005-04-02 23:42:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30168/pkg/base_user Modified Files: Changes MANIFEST package.ini Log Message: OIN-138: allow use of '.csv' files when defining installation data (security settings, initial data, etc.); use base_user as example Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/Changes,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Changes 17 Mar 2005 13:22:12 -0000 1.42 --- Changes 2 Apr 2005 23:42:21 -0000 1.43 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_user. + 2.42 Sat Apr 2 10:11:20 EST 2005 + + OIN-138: Translate data/ files to use delimited format instead + of perl data structure. + 2.41 Thu Mar 17 08:21:12 EST 2005 Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/MANIFEST,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MANIFEST 1 Mar 2005 03:28:40 -0000 1.9 --- MANIFEST 2 Apr 2005 23:42:21 -0000 1.10 *************** *** 7,12 **** conf/spops_user_language.ini conf/ldap_spops_user.ini ! data/install_security.dat ! data/install_user_language.dat msg/base_user-messages-en.msg msg/base_user-messages-no.msg --- 7,12 ---- conf/spops_user_language.ini conf/ldap_spops_user.ini ! data/install_security.csv ! data/install_user_language.csv msg/base_user-messages-en.msg msg/base_user-messages-no.msg Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/package.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** package.ini 17 Mar 2005 13:22:14 -0000 1.4 --- package.ini 2 Apr 2005 23:42:21 -0000 1.5 *************** *** 1,5 **** [package] name = base_user ! version = 2.41 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base_user ! version = 2.42 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2005-04-02 23:42:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30168/pkg/base_user/data Modified Files: install_security.dat Log Message: OIN-138: allow use of '.csv' files when defining installation data (security settings, initial data, etc.); use base_user as example Index: install_security.dat =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/data/install_security.dat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install_security.dat 27 May 2004 01:16:30 -0000 1.4 --- install_security.dat 2 Apr 2005 23:42:21 -0000 1.5 *************** *** 1,11 **** ! $security = [ ! { import_type => 'object', ! spops_class => 'OpenInteract2::Security', ! field_order => [ qw/ class object_id scope scope_id security_level / ], ! transform_default => [ 'object_id', 'scope_id' ] }, ! [ 'OpenInteract2::Action::User', '0', 'w', 'world', 4 ], ! [ 'OpenInteract2::Action::User', '0', 'g', 'public_group', 8 ], ! [ 'OpenInteract2::Action::User', '0', 'g', 'site_admin_group', 8 ], ! [ 'OpenInteract2::User', 'superuser', 'u', 'superuser', 8 ], ! [ 'OpenInteract2::User', 'superuser', 'w', 'world', 4 ], ! ]; --- 1,8 ---- ! import_type = object; spops_class = OpenInteract2::Security; transform_default = object_id, scope_id; ! class | object_id | scope | scope_id | security_level ! OpenInteract2::Action::User | 0 | w | world | 4 ! OpenInteract2::Action::User | 0 | g | public_group | 8 ! OpenInteract2::Action::User | 0 | g | site_admin_group | 8 ! OpenInteract2::User | superuser | u | superuser | 8 ! OpenInteract2::User | superuser | w | world | 4 ! |
|
From: Chris W. <la...@us...> - 2005-04-02 23:42:31
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30168/lib/OpenInteract2 Modified Files: Package.pm SQLInstall.pm Log Message: OIN-138: allow use of '.csv' files when defining installation data (security settings, initial data, etc.); use base_user as example Index: Package.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Package.pm 25 Mar 2005 16:46:35 -0000 1.58 --- Package.pm 2 Apr 2005 23:42:21 -0000 1.59 *************** *** 559,563 **** } ! my @data_files = grep /^data\/.*\.dat$/, @{ $pkg_files }; push @status, $self->_check_data_files( \@data_files ); --- 559,563 ---- } ! my @data_files = grep /^data\//, @{ $pkg_files }; push @status, $self->_check_data_files( \@data_files ); *************** *** 1165,1178 **** foreach my $data_file ( sort @{ $files } ) { my $s = { action => 'Check data file', filename => $data_file }; ! eval { OpenInteract2::Util->read_file_perl( $data_file ) }; ! if ( $@ ) { ! $s->{is_ok} = 'no'; ! $s->{message} = "Not a valid Perl structure: $@" } ! else { ! $s->{is_ok} = 'yes'; ! $s->{message} = "File is a valid Perl data structure"; } - push @status, $s; } return @status; --- 1165,1199 ---- foreach my $data_file ( sort @{ $files } ) { my $s = { action => 'Check data file', filename => $data_file }; ! my ( $ok, $msg ); ! if ( $data_file =~ /\.dat$/ ) { ! eval { OpenInteract2::Util->read_file_perl( $data_file ) }; ! if ( $@ ) { ! $ok = 'no'; ! $msg = "Not a valid Perl structure: $@"; ! } ! else { ! $ok = 'yes'; ! $msg = "File is a valid Perl data structure"; ! } } ! elsif ( $data_file =~ /\.csv$/ ) { ! require OpenInteract2::SQLInstall; ! my $struct = eval { ! OpenInteract2::SQLInstall->translate_csv_data_file( $data_file ) ! }; ! if ( $@ ) { ! $ok = 'no'; ! $msg = "Not a valid CSV data file: $@"; ! } ! else { ! $ok = 'yes'; ! $msg = "File is a valid CSV data file"; ! } ! ! } ! if ( $ok and $msg ) { ! $s->{is_ok} = $ok; $s->{message} = $msg; ! push @status, $s; } } return @status; Index: SQLInstall.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/SQLInstall.pm,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** SQLInstall.pm 17 Mar 2005 14:57:58 -0000 1.30 --- SQLInstall.pm 2 Apr 2005 23:42:21 -0000 1.31 *************** *** 356,372 **** my $relative_file = "$DATA_DIR/$data_file"; my $full_file = $pkg->find_file( $relative_file ); ! my $data_text = $pkg->read_file( $relative_file ); ! my ( $data_struct ); ! { ! no strict 'vars'; ! $data_struct = eval $data_text; ! if ( $@ ) { ! $self->_set_state( $full_file, ! undef, ! "Invalid Perl data structure: $@", ! undef ); ! next DATAFILE; ! } ! } $log->is_debug && $log->debug( "Data structure read from '$full_file': ", --- 356,361 ---- my $relative_file = "$DATA_DIR/$data_file"; my $full_file = $pkg->find_file( $relative_file ); ! my $data_struct = $self->_translate_file_to_struct( $full_file ); ! next DATAFILE unless ( defined $data_struct and ref $data_struct eq 'ARRAY' ); $log->is_debug && $log->debug( "Data structure read from '$full_file': ", *************** *** 456,459 **** --- 445,518 ---- } + sub _translate_file_to_struct { + my ( $self, $filename ) = @_; + my ( $data_struct ); + if ( $filename =~ /\.dat$/ ) { + no strict 'vars'; + my $data = OpenInteract2::Util->read_file( $filename ); + $data_struct = eval $data; + if ( $@ ) { + $self->_set_state( $filename, + undef, + "Invalid Perl data structure: $@", + undef ); + $data_struct = undef; + } + } + elsif ( $filename =~ /\.csv$/ ) { + $data_struct = eval { $self->translate_csv_data_file( $filename ) }; + if ( $@ ) { + $self->_set_state( $filename, undef, "$@", undef ); + $data_struct = undef; + } + } + return $data_struct; + } + + sub translate_csv_data_file { + my ( $self, $filename ) = @_; + my $data_struct = []; + my $data = OpenInteract2::Util->read_file( $filename ); + my ( $meta_list, $labels, @records ) = split /[\r\n]+/, $data; + $meta_list =~ s/^\s+//; $meta_list =~ s/\s+$//; + my %meta = (); + foreach my $pair ( split /\s*;\s*/, $meta_list ) { + my ( $key, $value ) = split /\s*=\s*/, $pair, 2; + if ( $key =~ /^transform_(default|now)$/ ) { + $value = [ split( /\s*,\s*/, $value ) ]; + } + $meta{ $key } = $value; + } + my $delimiter = $meta{delimiter}; + if ( $delimiter ) { + $labels =~ s/^\s+//; $labels =~ s/\s+$//; + $delimiter =~ s/\|/\\|/; + my @record_labels = split /\s*$delimiter\s*/, $labels; + my $num_labels = scalar @record_labels; + $meta{field_order} = \@record_labels; + push @{ $data_struct }, \%meta; + + my $count = 1; + foreach my $rec ( @records ) { + $rec =~ s/^\s+//; $rec =~ s/\s+$//; + my @fields = split /\s*$delimiter\s*/, $rec; + my $num_fields = scalar @fields; + if ( $num_labels == $num_fields ) { + push @{ $data_struct }, \@fields; + } + else { + oi_error "Record $count has a different number of fields ", + "($num_fields) than specified in the labels ", + "($num_labels)"; + } + $count++; + } + } + else { + oi_error "You must set the 'delimiter' to split fields/records"; + } + return $data_struct; + } + sub transform_data { *************** *** 1349,1352 **** --- 1408,1413 ---- =head1 DEVELOPERS: IMPORTING DATA + =head2 Import data formats + We need to be able to pass data from one database to another and be very flexible as to how we do it. The various data file formats have *************** *** 1354,1361 **** up some more. ! The data file discussed below is a Perl data structure. This does against the general OI2 bias against using data structures for humans to edit, but since this is generally a write-once operation it is not ! as important that it be human-readable. To begin, there are two elements to a data file. The first element --- 1415,1448 ---- up some more. ! The data file discussed below is in one of two formats, either a perl ! data structure or a text file with delimited data. (The former goes against the general OI2 bias against using data structures for humans to edit, but since this is generally a write-once operation it is not ! as important that it be human-readable.) ! ! Both files are translated into the same data structure when they're ! read in so later parts of the process don't know the difference. ! ! Here's an example of a perl data structure: ! ! $var = [ { import_type => 'object', ! spops_class => 'OpenInteract2::Group', ! field_order => [ qw/ group_id name / ] }, ! [ 1, 'admin' ], ! [ 2, 'public' ], ! [ 3, 'site admin' ], ! ]; ! ! And here's an example of the same file in delimited format: ! ! import_type = object; spops_class = OpenInteract2::Group; delimiter = | ! group_id | name ! 1 | admin ! 2 | public ! 3 | site admin ! ! The first line has metadata about the data to import, the second has ! the delimited field labels, and every line thereafter is a delimited ! set of record data. To begin, there are two elements to a data file. The first element *************** *** 1385,1389 **** deleting data as well as inserting. ! =head2 Object Processing The first item in the list describes the class you want to use to --- 1472,1476 ---- deleting data as well as inserting. ! =head2 Object Processing: What's in the metadata? The first item in the list describes the class you want to use to *************** *** 1399,1402 **** --- 1486,1497 ---- ]; + And the same thing in delimited format: + + import_type = object; spops_class = OpenInteract2::Group; delimiter = | + group_id | name + 1 | admin + 2 | public + 3 | site admin + Here is a slightly abbreviated form of what steps would look like if they were done in code: *************** *** 1432,1435 **** --- 1527,1542 ---- ]; + In delimited format: + + import_type = object; spops_class = OpenInteract2::Security; transform_default => scope_id; delimiter = | + class | object_id | scope | scope_id | security_level + OpenInteract2::Group | 1 | w | world | 1 + OpenInteract2::Group | 2 | w | world | 4 + OpenInteract2::Group | 2 | g | site_admin_group | 8 + OpenInteract2::Group | 3 | w | world | 4 + OpenInteract2::Group | 3 | g | site_admin_group | 8 + OpenInteract2::Action::Group | 0 | w | world | 4 + OpenInteract2::Action::Group | 0 | g | site_admin_group | 8 + So these steps would look like: *************** *** 1471,1474 **** --- 1578,1587 ---- ]; + And in delimited format: + + import_type = dbdata; datasource_pointer = group; sql_table = sys_group_user; delimiter = | + group_id | user_id + 1 | 1 + So we specify the import type ('dbdata', which corresponds to L<SPOPS::Import::DBI::Data>), the table to operate on *************** *** 1526,1529 **** --- 1639,1646 ---- ]; + There's currently no way to map a nested data structure like + 'field_type' into delimited format, so you must use the serialized + perl data structure.. + Additionally you can create Perl code to do this for you. *************** *** 1546,1549 **** --- 1663,1669 ---- } ]; + It doesn't make any sense to represent this as a delimited file so you + must use the serialized perl data structure. + (See L<SQL Processing: Inserting Data> for how to declare a datasource using 'datasource_pointer'.) *************** *** 1599,1602 **** --- 1719,1725 ---- } ]; + It doesn't make any sense to represent this as a delimited file so you + must use the serialized perl data structure. + (See L<SQL Processing: Inserting Data> for how to declare a datasource using 'datasource_pointer'.) |
|
From: Chris W. <la...@us...> - 2005-04-02 23:42:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/SQLInstall In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30168/pkg/base_user/OpenInteract2/SQLInstall Modified Files: User.pm Log Message: OIN-138: allow use of '.csv' files when defining installation data (security settings, initial data, etc.); use base_user as example Index: User.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/OpenInteract2/SQLInstall/User.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** User.pm 18 Mar 2005 04:09:45 -0000 1.15 --- User.pm 2 Apr 2005 23:42:21 -0000 1.16 *************** *** 64,72 **** sub get_data_file { ! return 'install_user_language.dat'; } sub get_security_file { ! return 'install_security.dat'; } --- 64,72 ---- sub get_data_file { ! return 'install_user_language.csv'; } sub get_security_file { ! return 'install_security.csv'; } |
|
From: Teemu A. <in...@us...> - 2005-03-30 02:56:16
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18359/OpenInteract2/Action Modified Files: Box.pm Log Message: $log -> $log_init Index: Box.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action/Box.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Box.pm 29 Mar 2005 05:07:35 -0000 1.14 --- Box.pm 30 Mar 2005 02:56:07 -0000 1.15 *************** *** 50,54 **** oi_error "Failed to bring in box implementation class $_: $@"; } ! $log->info( "Brought in box implementation class '$_' ok" ); } } --- 50,54 ---- oi_error "Failed to bring in box implementation class $_: $@"; } ! $log_init->info( "Brought in box implementation class '$_' ok" ); } } |
|
From: Teemu A. <in...@us...> - 2005-03-30 00:15:48
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27075 Modified Files: Makefile.PL Log Message: oobs, revert back Makefile.PL which gets the OI version from VERSION file (which is incompatible with dh-make-perl, by the way) Index: Makefile.PL =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/Makefile.PL,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile.PL 30 Mar 2005 00:13:50 -0000 1.31 --- Makefile.PL 30 Mar 2005 00:15:27 -0000 1.32 *************** *** 6,10 **** my %opts = ( 'NAME' => 'OpenInteract', ! 'VERSION' => '20050330_cvs', 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], 'PL_FILES' => {}, --- 6,10 ---- my %opts = ( 'NAME' => 'OpenInteract', ! 'VERSION_FROM' => 'VERSION', 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], 'PL_FILES' => {}, |
|
From: Teemu A. <in...@us...> - 2005-03-30 00:14:00
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/I18N In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26327/lib/OpenInteract2/I18N Modified Files: Initializer.pm Log Message: remove null key because the PO header metadata is already parsed and added to message hash with __ prefixes Index: Initializer.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/I18N/Initializer.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Initializer.pm 24 Mar 2005 13:06:52 -0000 1.17 --- Initializer.pm 30 Mar 2005 00:13:51 -0000 1.18 *************** *** 211,214 **** --- 211,220 ---- my $msg = Locale::Maketext::Lexicon::Gettext->parse( <GETTEXT> ); close( GETTEXT ); + + # The PO header metadata is parsed and added with __ prefixes to + # message hash. The complete header is stored with key '' + # which we remove as unnecessary. + delete $msg->{ '' } if exists $msg->{ '' }; + if ( $log->is_debug ) { $log->debug( "Read following messages from '$gettext_file': " ); |
|
From: Teemu A. <in...@us...> - 2005-03-30 00:13:59
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26327 Modified Files: Makefile.PL Log Message: remove null key because the PO header metadata is already parsed and added to message hash with __ prefixes Index: Makefile.PL =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/Makefile.PL,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Makefile.PL 8 Feb 2005 01:54:50 -0000 1.30 --- Makefile.PL 30 Mar 2005 00:13:50 -0000 1.31 *************** *** 6,10 **** my %opts = ( 'NAME' => 'OpenInteract', ! 'VERSION_FROM' => 'VERSION', 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], 'PL_FILES' => {}, --- 6,10 ---- my %opts = ( 'NAME' => 'OpenInteract', ! 'VERSION' => '20050330_cvs', 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], 'PL_FILES' => {}, |
|
From: Teemu A. <in...@us...> - 2005-03-29 21:55:42
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9551/lib/OpenInteract2/Config Modified Files: Ini.pm Log Message: Antti Vähäkotamäki reported, that in new(), the private _m was not initialized correctly. Index: Ini.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/Ini.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Ini.pm 18 Mar 2005 04:09:50 -0000 1.21 --- Ini.pm 29 Mar 2005 21:55:34 -0000 1.22 *************** *** 31,41 **** my $class = ref $pkg || $pkg; my $self = bless( { ! filename => '', ! directory => '', ! sections => [], ! comments => {}, ! order => [], ! order_map => {}, ! global => [], }, $class ); if ( $self->{_m}{filename} = $params->{filename} ) { --- 31,43 ---- my $class = ref $pkg || $pkg; my $self = bless( { ! _m => { ! filename => '', ! directory => '', ! sections => [], ! comments => {}, ! order => [], ! order_map => {}, ! global => [], ! } }, $class ); if ( $self->{_m}{filename} = $params->{filename} ) { |
|
From: Chris W. <la...@us...> - 2005-03-29 17:17:56
|
Update of /cvsroot/openinteract/OpenInteract2/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586 Modified Files: oi2_manage Log Message: move directory munging after the meta tasks; allow relative directories to be used Index: oi2_manage =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/script/oi2_manage,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** oi2_manage 17 Mar 2005 14:58:06 -0000 1.34 --- oi2_manage 29 Mar 2005 17:17:45 -0000 1.35 *************** *** 6,9 **** --- 6,10 ---- use Cwd qw( cwd ); use Data::Dumper qw( Dumper ); + use File::Spec::Functions qw( rel2abs ); use Getopt::Long qw( GetOptions ); use Log::Log4perl qw( :levels ); *************** *** 107,119 **** } - # Lop off any trailing '/' characters in directories passed in, - # replace any initial '~' with $ENV{HOME} - - for ( $OPT{website_dir}, $OPT{package_dir}, $OPT{source_dir} ) { - next unless defined $_; - s/[\\|\/]+$//; - s/^~/$ENV{HOME}/ - } - # Do any help/non-Manage tasks here --- 108,111 ---- *************** *** 140,143 **** --- 132,143 ---- } + # directory munging... + foreach my $dir_type ( qw( website_dir package_dir source_dir ) ) { + next unless defined $OPT{ $dir_type }; + $OPT{ $dir_type } =~ s/^~/$ENV{HOME}/; + $OPT{ $dir_type } = rel2abs( $OPT{ $dir_type } ); + $OPT{ $dir_type } =~ s/[\\|\/]+$//; + } + # delete our own entries... delete @OPT{ qw( help man verbose task ) }; |
|
From: Chris W. <la...@us...> - 2005-03-29 17:16:28
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10793/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.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Changes.pod 18 Mar 2005 05:26:10 -0000 1.71 --- Changes.pod 29 Mar 2005 17:16:20 -0000 1.72 *************** *** 25,28 **** --- 25,90 ---- pushed off to 2.01. + =head1 1.99_07 (2.0 RC 1), + + =head2 Upgrade Notes + + B<box section ignored in server.ini> + + The 'box' section in B<server.ini> is no longer used -- all + configuration is done in C<conf/base_box/action.ini>. (It doesn't hurt + anything to leave it though.) + + =head2 Major Changes + + =head2 Minor Changes + + L<OpenInteract2::Error> + + =over 4 + + =item * + + OIN-159: If our error filename already exists keep incrementing the + number of ms until one doesn't. (Happens when two errors raised in the + same second...) + + =back + + L<OpenInteract2::Manage::Website::RemovePackage> + + =over 4 + + =item * + + OIN-158: Add 'full_remove' parameter to get rid of the package + directories on demand. + + =back + + =head2 Package Updates + + The following packages have been updated since the last version. See + the 'Changes' file for each to view the modifications: + + OpenInteract 1.99_06 -> 1.99_07 + ----------------------------------- + base: 2.15 -> 2.15 + base_box: 2.21 -> 2.21 + base_error: 3.02 -> 3.02 + base_group: 2.20 -> 2.20 + base_page: 2.32 -> 2.32 + base_security: 2.22 -> 2.22 + base_template: 3.17 -> 3.17 + base_theme: 2.13 -> 2.13 + base_user: 2.41 -> 2.41 + comments: 1.23 -> 1.23 + full_text: 2.61 -> 2.61 + lookup: 2.09 -> 2.09 + news: 2.25 -> 2.25 + object_activity: 2.13 -> 2.13 + system_doc: 2.10 -> 2.10 + whats_new: 2.12 -> 2.12 + + =head1 1.99_06 (2.0 beta 6), 18 March 2005 *************** *** 555,570 **** ----------------------------------- base: 2.11 -> 2.15 ! base_box: 2.17 -> 2.20 base_error: 2.10 -> 3.02 ! base_group: 2.16 -> 2.19 ! base_page: 2.28 -> 2.31 ! base_security: 2.18 -> 2.21 base_template: 3.15 -> 3.17 base_theme: 2.10 -> 2.13 ! base_user: 2.35 -> 2.40 comments: 1.18 -> 1.23 full_text: 2.58 -> 2.61 lookup: 2.07 -> 2.09 ! news: 2.20 -> 2.24 object_activity: 2.11 -> 2.13 system_doc: 2.08 -> 2.10 --- 617,632 ---- ----------------------------------- base: 2.11 -> 2.15 ! base_box: 2.17 -> 2.21 base_error: 2.10 -> 3.02 ! base_group: 2.16 -> 2.20 ! base_page: 2.28 -> 2.32 ! base_security: 2.18 -> 2.22 base_template: 3.15 -> 3.17 base_theme: 2.10 -> 2.13 ! base_user: 2.35 -> 2.41 comments: 1.18 -> 1.23 full_text: 2.58 -> 2.61 lookup: 2.07 -> 2.09 ! news: 2.20 -> 2.25 object_activity: 2.11 -> 2.13 system_doc: 2.08 -> 2.10 |
|
From: Chris W. <la...@us...> - 2005-03-29 17:12:25
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8658/Manual Modified Files: I18N.pod Log Message: add note about slight change to msg keys Index: I18N.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/I18N.pod,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** I18N.pod 12 Mar 2005 18:37:17 -0000 1.13 --- I18N.pod 29 Mar 2005 17:12:17 -0000 1.14 *************** *** 275,279 **** A message key is unique per language and has a single value that is its associated message for that language. It is separated from the ! message by an '='. =item B<continued values> --- 275,279 ---- A message key is unique per language and has a single value that is its associated message for that language. It is separated from the ! message by an '=' and may contain any character B<except> a '='. =item B<continued values> |
|
From: Chris W. <la...@us...> - 2005-03-29 17:02:04
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv614 Modified Files: Action.pm Log Message: update docs to recognize that init_at_startup() gets the action name Index: Action.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action.pm,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Action.pm 17 Mar 2005 14:57:56 -0000 1.73 --- Action.pm 29 Mar 2005 17:01:54 -0000 1.74 *************** *** 1236,1246 **** When OpenInteract starts up it will call C<init_at_startup()> on every ! configured action class. (The class ! L<OpenInteract2::Setup::InitializeActions> actually does this.) This ! is useful for reading static (or rarely changing) information once and ! caching the results. Since the L<OpenInteract2::Context> object is ! guaranteed to have been created when this is called you can grab a ! database handle and slurp all the lookup entries from a table into a ! lexical data structure. Here is an example: --- 1236,1250 ---- When OpenInteract starts up it will call C<init_at_startup()> on every ! configured action class, passing in the name used to configure this ! action as the only argument. (The class ! L<OpenInteract2::Setup::InitializeActions> is the one that actually ! does this.) If you've got multiple actions mapped to the same class ! your initialization method will get called multiple times. ! ! This is useful for reading static (or rarely changing) information ! once and caching the results. Since the L<OpenInteract2::Context> ! object is guaranteed to have been created when this is called you can ! grab a database handle and slurp all the lookup entries from a table ! into a lexical data structure. Here is an example: *************** *** 1257,1261 **** sub init_at_startup { ! my ( $class ) = @_; $log ||= get_logger( LOG_APP ); my $publisher_list = eval { --- 1261,1265 ---- sub init_at_startup { ! my ( $class, $action_name ) = @_; $log ||= get_logger( LOG_APP ); my $publisher_list = eval { |
|
From: Chris W. <la...@us...> - 2005-03-29 16:58:55
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30861/Setup Modified Files: InitializeActions.pm Log Message: pass in the action name when running 'init_at_startup()' Index: InitializeActions.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/InitializeActions.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InitializeActions.pm 18 Mar 2005 04:09:51 -0000 1.2 --- InitializeActions.pm 29 Mar 2005 16:58:46 -0000 1.3 *************** *** 32,36 **** } $self->_require_action_classes( $action_table ); ! $self->_initialize_action_classes; } --- 32,36 ---- } $self->_require_action_classes( $action_table ); ! $self->_initialize_action_classes( $action_table ); } *************** *** 45,65 **** $uniq_classes{ $class }++; } my $req = OpenInteract2::Setup->new( 'require classes', ! classes => [ keys %uniq_classes ], classes_type => 'Action classes', )->run(); ! $self->param( classes => $req->param( 'required_classes' ) ); } sub _initialize_action_classes { ! my ( $self ) = @_; ! my $action_classes = $self->param( 'classes' ); ! return unless ( ref $action_classes eq 'ARRAY' ); ! my @success = (); ! foreach my $action_class ( @{ $action_classes } ) { ! $log->debug( "Initializing action class '$action_class'" ); ! eval { $action_class->init_at_startup() }; if ( $@ ) { $log->error( "Caught error initializing action class ", --- 45,65 ---- $uniq_classes{ $class }++; } + my @classes = keys %uniq_classes; my $req = OpenInteract2::Setup->new( 'require classes', ! classes => \@classes, classes_type => 'Action classes', )->run(); ! $self->param( classes => \@classes ); } sub _initialize_action_classes { ! my ( $self, $action_table ) = @_; my @success = (); ! while ( my ( $name, $action_info ) = each %{ $action_table } ) { ! my $action_class = $action_info->{class}; ! next unless ( $action_class ); ! $log->debug( "Initializing action '$name' class '$action_class'" ); ! eval { $action_class->init_at_startup( $name ) }; if ( $@ ) { $log->error( "Caught error initializing action class ", |
|
From: Chris W. <la...@us...> - 2005-03-29 16:58:32
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30314/Controller Modified Files: ManageBoxes.pm Log Message: OIN-58: add support for using 'box_name' in addition to 'name' Index: ManageBoxes.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Controller/ManageBoxes.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ManageBoxes.pm 17 Mar 2005 14:58:01 -0000 1.12 --- ManageBoxes.pm 29 Mar 2005 16:57:56 -0000 1.13 *************** *** 26,30 **** return undef unless ( ref $box ); ! my $name = ( ref $box eq 'HASH' ) ? $box->{name} : $box->name; $log->is_info && $log->info( "Adding box '$name' to response" ); --- 26,36 ---- return undef unless ( ref $box ); ! my ( $name ); ! if ( ref $box eq 'HASH' ) { ! $name = $box->{box_name} || $box->{name}; ! } ! else { ! $name = $box->param( 'box_name' ) || $box->name; ! } $log->is_info && $log->info( "Adding box '$name' to response" ); |
|
From: Chris W. <la...@us...> - 2005-03-29 16:56:04
|
Update of /cvsroot/openinteract/OpenInteract2/sample/website/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29270/sample/website/template Modified Files: form_begin Log Message: passthru the URL_PARAMS when creating a form action URL Index: form_begin =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/template/form_begin,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** form_begin 5 Oct 2004 02:00:55 -0000 1.3 --- form_begin 29 Mar 2005 16:55:55 -0000 1.4 *************** *** 1,6 **** [%- DEFAULT method = 'POST'; ! DEFAULT form_url = OI.make_url( BASE = BASE, ! ACTION = ACTION, ! TASK = TASK ); -%] <form action="[% form_url %]" method="[% method %]" [%- IF onsubmit %] onsubmit="[% onsubmit %]"[% END -%] --- 1,5 ---- [%- DEFAULT method = 'POST'; ! DEFAULT form_url = OI.make_url( ACTION = ACTION, TASK = TASK, ! BASE = BASE, URL_PARAMS = URL_PARAMS ); -%] <form action="[% form_url %]" method="[% method %]" [%- IF onsubmit %] onsubmit="[% onsubmit %]"[% END -%] |
|
From: Chris W. <la...@us...> - 2005-03-29 16:51:37
|
Update of /cvsroot/openinteract/OpenInteract2/sample/website/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26583/sample/website/conf Modified Files: server.ini Log Message: OIN-58: remove box configuration from server.ini -- it's only in the basebox/conf/action.ini now Index: server.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/conf/server.ini,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** server.ini 26 Feb 2005 05:52:18 -0000 1.52 --- server.ini 29 Mar 2005 16:50:49 -0000 1.53 *************** *** 232,252 **** # - # Define the box handler and the handler to take care of the - # default system boxes. The 'custom_box_handler' entry is for you - # to fill in if you'd like -- you can add other boxes to every - # page, add them depending on the request type, etc. - - [box] - action = box_display - default_template = base_box::main_box_shell - default_separator = - default_method = - system_box_handler = OpenInteract2::Action::SystemBoxes - system_box_method = - custom_box_handler = - custom_box_method = - - - # # Define login information. In the future you'll be able to define # the object(s) used for logging in and possibly more. --- 232,235 ---- |
|
From: Chris W. <la...@us...> - 2005-03-29 16:51:04
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26583/lib/OpenInteract2 Modified Files: Context.pm Log Message: OIN-58: remove box configuration from server.ini -- it's only in the basebox/conf/action.ini now Index: Context.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Context.pm,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** Context.pm 17 Mar 2005 14:57:57 -0000 1.87 --- Context.pm 29 Mar 2005 16:50:49 -0000 1.88 *************** *** 17,21 **** my ( $log_spops, $log_act, $log_init ); ! sub version { return '1.99_06' } # Exportable deployment URL call -- main, images, static --- 17,21 ---- my ( $log_spops, $log_act, $log_init ); ! sub version { return '1.99_07' } # Exportable deployment URL call -- main, images, static *************** *** 626,634 **** } - sub lookup_box_config { - my ( $self ) = @_; - return $self->server_config->{box}; - } - ######################################## --- 626,629 ---- *************** *** 1557,1564 **** Looks up the redirect configuration. - B<lookup_box_config()> - - Looks up the configuration for boxes, found in the 'box' section. - =head2 Object Methods: Localization --- 1552,1555 ---- |
4 messages has been excluded from this view by a project administrator.
