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...> - 2004-10-24 15:04:32
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26132/t Modified Files: utils.pl Log Message: pkg update Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** utils.pl 5 Oct 2004 03:22:27 -0000 1.72 --- utils.pl 24 Oct 2004 15:04:23 -0000 1.73 *************** *** 45,49 **** return ( base => '2.10', ! base_box => '2.14', base_error => '2.10', base_group => '2.14', --- 45,49 ---- return ( base => '2.10', ! base_box => '2.15', base_error => '2.10', base_group => '2.14', |
|
From: Chris W. <la...@us...> - 2004-10-24 15:04:32
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26132 Modified Files: MANIFEST Log Message: pkg update Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** MANIFEST 5 Oct 2004 03:22:27 -0000 1.93 --- MANIFEST 24 Oct 2004 15:04:23 -0000 1.94 *************** *** 158,162 **** lib/OpenInteract2/Util.pm pkg/base-2.10.zip ! pkg/base_box-2.14.zip pkg/base_error-2.10.zip pkg/base_group-2.14.zip --- 158,162 ---- lib/OpenInteract2/Util.pm pkg/base-2.10.zip ! pkg/base_box-2.15.zip pkg/base_error-2.10.zip pkg/base_group-2.14.zip |
|
From: Chris W. <la...@us...> - 2004-10-24 15:04:11
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26002 Modified Files: Action.pm Log Message: add message_from_key_or_param() as shortcut to pull a messge from a localization key or an action parameter Index: Action.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action.pm,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** Action.pm 27 Sep 2004 05:01:56 -0000 1.55 --- Action.pm 24 Oct 2004 15:03:52 -0000 1.56 *************** *** 875,878 **** --- 875,893 ---- } + # confusing name -- the title would suggest we want the message key + # first, but we want to also pass along optional arguments to the + # message key and they should be next to the key argument... + + sub message_from_key_or_param { + my ( $self, $param_name, $message_key, @key_args ) = @_; + if ( $message_key ) { + my $language_handle = CTX->request->language_handle; + my $msg = $language_handle->maketext( $message_key, @key_args ); + return $msg if ( $msg ); + } + return $self->param( $param_name ); + } + + sub view_messages { my ( $self, $messages ) = @_; *************** *** 2460,2463 **** --- 2475,2498 ---- Returns: nothing + B<message_from_param_or_key( $param_name, $message_key, @key_arguments )> + + Shortcut for returning a message from either the localized message + store or from the given parameter. For instance, you might have an + action configured: + + [myaction] + title = This is a generic title + title_key = mypkg.myaction.title + + If you call: + + my $msg = $myaction->message_from_param_or_key( 'title', 'title_key' ); + + The C<$msg> variable should have whatever is in the localization table + for 'mypkg.myaction.title'. If 'title_key' wasn't defined the method + would return 'This is a generic title'. + + Returns: message from localization tables or from the action parameter + B<view_messages( [ \%messages ] )> |
|
From: Chris W. <la...@us...> - 2004-10-24 15:03:10
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795/OpenInteract2/Action Modified Files: Box.pm Log Message: Allow title, title image and ALT tag of title image to be reference with localization key Index: Box.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action/Box.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Box.pm 25 Sep 2004 18:18:23 -0000 1.10 --- Box.pm 24 Oct 2004 15:03:01 -0000 1.11 *************** *** 253,259 **** } $shell_params->{content} = $base_content; ! $shell_params->{label} = $action->param( 'title' ); ! $shell_params->{label_image_src} = $action->param( 'title_image_src' ); ! $shell_params->{label_image_alt} = $action->param( 'title_image_alt' ); push @content, $action->generate_content( $shell_params, { name => $shell_template } ); --- 253,262 ---- } $shell_params->{content} = $base_content; ! $shell_params->{label} = $action->message_from_key_or_param( ! 'title', 'title_key' ); ! $shell_params->{label_image_src} = $action->message_from_key_or_param( ! 'title_image_src', 'title_image_src_key' ); ! $shell_params->{label_image_alt} = $action->message_from_key_or_param( ! 'title_image_alt', 'title_image_alt_key' ); push @content, $action->generate_content( $shell_params, { name => $shell_template } ); *************** *** 315,319 **** # Define an OI action (in conf/action.ini) to be used for a ! # template-only box: [frequent_links_box] --- 318,323 ---- # Define an OI action (in conf/action.ini) to be used for a ! # template-only box, using a localization key instead of a direct ! # title : [frequent_links_box] *************** *** 321,325 **** template = mypkg::box_frequent_links weight = 8 ! title = Frequent Links security = no --- 325,329 ---- template = mypkg::box_frequent_links weight = 8 ! title_key = frequent_links.title security = no *************** *** 522,525 **** --- 526,536 ---- =item * + B<title_key> ($) (optional) + + Localization key to use for box title, generally used in place of + 'title' and if both are present this will be used. + + =item * + B<title_image_src> ($) (optional) *************** *** 528,531 **** --- 539,549 ---- =item * + B<title_image_src_key> ($) (optional) + + Localization key to use for image title, generally used in place of + 'title_image_src' and if both are present this will be used. + + =item * + B<title_image_alt> ($) (optional) *************** *** 534,537 **** --- 552,563 ---- =item * + B<title_image_alt_key> ($) (optional) + + Localization key to use for the 'alt' tag in the image title, + generally used in place of 'title_image_alt' and if both are present + this will be used. + + =item * + B<weight> ($) |
|
From: Chris W. <la...@us...> - 2004-10-24 15:03:10
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795 Modified Files: Changes package.conf Log Message: Allow title, title image and ALT tag of title image to be reference with localization key Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/Changes,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Changes 5 Oct 2004 02:01:47 -0000 1.15 --- Changes 24 Oct 2004 15:03:00 -0000 1.16 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_box. + 2.15 Sun Oct 24 11:01:44 EDT 2004 + + Allow localization keys to be used for 'title', + 'title_image_src' and 'title_image_alt'. + 2.14 Mon Oct 4 21:46:20 EDT 2004 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/package.conf,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** package.conf 5 Oct 2004 02:01:47 -0000 1.14 --- package.conf 24 Oct 2004 15:03:00 -0000 1.15 *************** *** 1,4 **** name base_box ! version 2.14 author Chris Winters <ch...@cw...> url http://www.openinteract.org/ --- 1,4 ---- name base_box ! version 2.15 author Chris Winters <ch...@cw...> url http://www.openinteract.org/ |
|
From: Salve J. N. <sj...@us...> - 2004-10-18 08:38:30
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7096 Modified Files: Makefile.PL Log Message: minor cleanup Index: Makefile.PL =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/Makefile.PL,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile.PL 18 Oct 2004 07:37:00 -0000 1.26 --- Makefile.PL 18 Oct 2004 08:38:19 -0000 1.27 *************** *** 10,14 **** 'PL_FILES' => {}, 'NO_META' => 1, ! 'ABSTRACT' => 'Pure-perl extensible application server', 'PREREQ_PM' => { 'Apache::Session' => 1.50, --- 10,14 ---- 'PL_FILES' => {}, 'NO_META' => 1, ! 'ABSTRACT' => 'Pure-perl extensible application server', 'PREREQ_PM' => { 'Apache::Session' => 1.50, |
|
From: Salve J. N. <sj...@us...> - 2004-10-18 07:45:13
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26968/lib/OpenInteract2/Cache Modified Files: File.pm Log Message: Change cache directory config directive to reflect documentation and existing example server.ini config Index: File.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Cache/File.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** File.pm 18 Feb 2004 05:25:27 -0000 1.9 --- File.pm 18 Oct 2004 07:45:05 -0000 1.10 *************** *** 24,34 **** # set in the config object ! unless ( -d $cache_conf->{dir} ) { $log->error( "Cannot create a filesystem cache without a valid ", ! "directory. (Given: $cache_conf->{dir})" ); return undef; } ! my $cache_dir = $cache_conf->{dir}; my $max_size = $cache_conf->{max_size}; my $default_expire = $cache_conf->{default_expire}; --- 24,34 ---- # set in the config object ! unless ( -d $cache_conf->{directory} ) { $log->error( "Cannot create a filesystem cache without a valid ", ! "directory. (Given: $cache_conf->{directory})" ); return undef; } ! my $cache_dir = $cache_conf->{directory}; my $max_size = $cache_conf->{max_size}; my $default_expire = $cache_conf->{default_expire}; *************** *** 134,136 **** =head1 AUTHORS ! Chris Winters E<lt>ch...@cw...E<gt> \ No newline at end of file --- 134,136 ---- =head1 AUTHORS ! Chris Winters E<lt>ch...@cw...E<gt> |
|
From: Salve J. N. <sj...@us...> - 2004-10-18 07:37:10
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25767 Modified Files: Makefile.PL Log Message: added ABSTRACT Index: Makefile.PL =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/Makefile.PL,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Makefile.PL 27 Sep 2004 03:51:56 -0000 1.25 --- Makefile.PL 18 Oct 2004 07:37:00 -0000 1.26 *************** *** 5,14 **** my %opts = ( ! 'NAME' => 'OpenInteract', ! 'VERSION_FROM' => 'VERSION', ! 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], ! 'PL_FILES' => {}, ! 'NO_META' => 1, ! 'PREREQ_PM' => { 'Apache::Session' => 1.50, 'Archive::Zip' => 0, --- 5,15 ---- my %opts = ( ! 'NAME' => 'OpenInteract', ! 'VERSION_FROM' => 'VERSION', ! 'EXE_FILES' => [ qw( script/oi2_manage script/oi2_daemon ) ], ! 'PL_FILES' => {}, ! 'NO_META' => 1, ! 'ABSTRACT' => 'Pure-perl extensible application server', ! 'PREREQ_PM' => { 'Apache::Session' => 1.50, 'Archive::Zip' => 0, |
|
From: Chris W. <la...@us...> - 2004-10-17 20:46:44
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8033 Modified Files: Upgrade.pm Log Message: add note in description about reading the changelog for configuration changes and such Index: Upgrade.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/Upgrade.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Upgrade.pm 13 Jun 2004 18:19:54 -0000 1.13 --- Upgrade.pm 17 Oct 2004 20:46:34 -0000 1.14 *************** *** 16,20 **** sub get_brief_description { ! return 'Upgrade your website to a new version of OpenInteract2'; } --- 16,25 ---- sub get_brief_description { ! return <<'DESC'; ! Upgrade your website to a new version of OpenInteract2 -- ! remember to read 'perldoc OpenInteract2::Manual::Changes' ! to see what has been updated and find any configuration changes ! you may need to make. ! DESC } |
|
From: Chris W. <la...@us...> - 2004-10-17 20:07:26
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Datasource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29554/lib/OpenInteract2/Datasource Modified Files: DBI.pm Log Message: make the connection error a little more useful Index: DBI.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Datasource/DBI.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DBI.pm 27 Sep 2004 13:24:55 -0000 1.13 --- DBI.pm 17 Oct 2004 20:07:18 -0000 1.14 *************** *** 56,60 **** unless ( $db ) { oi_datasource_error ! "Error connecting: $DBI::errstr", { datasource_name => $ds_name, datasource_type => 'DBI', --- 56,60 ---- unless ( $db ) { oi_datasource_error ! "Error connecting to DBI database '$ds_name': $DBI::errstr", { datasource_name => $ds_name, datasource_type => 'DBI', |
|
From: Chris W. <la...@us...> - 2004-10-05 03:33:03
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26240/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.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Changes.pod 3 Oct 2004 00:17:57 -0000 1.49 --- Changes.pod 5 Oct 2004 03:32:54 -0000 1.50 *************** *** 197,200 **** --- 197,214 ---- =back + L<OpenInteract2::Action::CommonSearch> + + =over 4 + + =item * + + OIN-63: Pass the right parameters to L<OpenInteract2::ResultsManage>... + + =item * + + Small bit of refactoring to make the search() easier to follow. + + =back + L<OpenInteract2::Action::CommonUpdate> *************** *** 502,505 **** --- 516,530 ---- =back + L<OpenInteract2::URL> + + =over 4 + + =item * + + OIN-79: in addition to escaping query argument values, also escape the + query argument names and the base URL. + + =back + C<sample/website/filter.ini> |
|
From: Chris W. <la...@us...> - 2004-10-05 03:22:37
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24146 Modified Files: MANIFEST Log Message: pkg update Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** MANIFEST 5 Oct 2004 02:03:17 -0000 1.92 --- MANIFEST 5 Oct 2004 03:22:27 -0000 1.93 *************** *** 161,165 **** pkg/base_error-2.10.zip pkg/base_group-2.14.zip ! pkg/base_page-2.26.zip pkg/base_security-2.17.zip pkg/base_template-3.12.zip --- 161,165 ---- pkg/base_error-2.10.zip pkg/base_group-2.14.zip ! pkg/base_page-2.27.zip pkg/base_security-2.17.zip pkg/base_template-3.12.zip |
|
From: Chris W. <la...@us...> - 2004-10-05 03:22:37
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24146/t Modified Files: utils.pl Log Message: pkg update Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** utils.pl 5 Oct 2004 02:03:17 -0000 1.71 --- utils.pl 5 Oct 2004 03:22:27 -0000 1.72 *************** *** 48,52 **** base_error => '2.10', base_group => '2.14', ! base_page => '2.26', base_security => '2.17', base_template => '3.12', --- 48,52 ---- base_error => '2.10', base_group => '2.14', ! base_page => '2.27', base_security => '2.17', base_template => '3.12', |
|
From: Chris W. <la...@us...> - 2004-10-05 03:22:03
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23991 Modified Files: Changes package.conf Log Message: OIN-51: ensure storage classes are loaded at startup Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Changes 5 Oct 2004 01:18:51 -0000 1.25 --- Changes 5 Oct 2004 03:21:52 -0000 1.26 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_page. + 2.27 Mon Oct 4 23:18:59 EDT 2004 + + OIN-51: Our _class_initialize() is no longer being called, so + the storage classes don't get initialized. + 2.26 Mon Oct 4 21:15:03 EDT 2004 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.conf,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** package.conf 5 Oct 2004 01:18:51 -0000 1.26 --- package.conf 5 Oct 2004 03:21:52 -0000 1.27 *************** *** 1,4 **** name base_page ! version 2.26 author Chris Winters <ch...@cw...> module File::Basename --- 1,4 ---- name base_page ! version 2.27 author Chris Winters <ch...@cw...> module File::Basename |
|
From: Chris W. <la...@us...> - 2004-10-05 03:22:03
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23991/OpenInteract2 Modified Files: Page.pm Log Message: OIN-51: ensure storage classes are loaded at startup Index: Page.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Page.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Page.pm 11 May 2004 04:30:59 -0000 1.11 --- Page.pm 5 Oct 2004 03:21:52 -0000 1.12 *************** *** 28,36 **** - sub _class_initialize { - my ( $class ) = @_; - eval "require $_" for ( values %STORAGE_CLASS ); - } - ######################################## # CLASS METHODS --- 28,31 ---- *************** *** 409,412 **** --- 404,422 ---- } + + sub load_init { + $log ||= get_logger( LOG_APP ); + for ( values %STORAGE_CLASS ) { + eval "require $_"; + if ( $@ ) { + $log->error( "Failed to load page storage class ", + "'$_': $@; continuing..." ); + } + } + } + + load_init(); + + 1; |
|
From: Chris W. <la...@us...> - 2004-10-05 03:11:57
|
Update of /cvsroot/openinteract/OpenInteract2/sample/website/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21485/sample/website/template Modified Files: error_object_inactive Log Message: OIN-65: fix typos, applied patch from Salve Index: error_object_inactive =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/template/error_object_inactive,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** error_object_inactive 10 Feb 2004 03:04:31 -0000 1.3 --- error_object_inactive 5 Oct 2004 03:11:47 -0000 1.4 *************** *** 4,12 **** <div align="center"> ! <h1>[% MSG( error_inactive.title, object_name ) %]</h1> <table width="50%" border="0" cellpadding="5" cellspacing="0"> <tr><td align="left"> ! [% MSG( error_inactive.summary ) %] </td></tr> </table> --- 4,12 ---- <div align="center"> ! <h1>[% MSG( 'error_inactive.title', object_name ) %]</h1> <table width="50%" border="0" cellpadding="5" cellspacing="0"> <tr><td align="left"> ! [% MSG( 'error_inactive.summary' ) %] </td></tr> </table> |
|
From: Chris W. <la...@us...> - 2004-10-05 03:08:41
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20853/Action Modified Files: CommonSearch.pm Log Message: OIN-63: ensure that CommonSearch, RsultsManage, ResultsIterator all play nice together (passing the right parameters, etc.); update logging Index: CommonSearch.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action/CommonSearch.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CommonSearch.pm 15 Jun 2004 00:02:21 -0000 1.14 --- CommonSearch.pm 5 Oct 2004 03:08:25 -0000 1.15 *************** *** 51,105 **** my %tmpl_params = (); - my $req = CTX->request; my $is_paged = $self->param( 'c_search_results_paged' ); if ( $is_paged eq 'yes' ) { ! my $search_id = $req->param( 'search_id' ); ! my $results = OpenInteract2::ResultsManage->new(); ! ! # If the search has been run before, just set the ID ! ! if ( $search_id ) { ! $log->is_debug && ! $log->debug( "Retrieving search for ID [$search_id]" ); ! $results->{search_id} = $search_id; ! } ! ! # Otherwise, run the search and get an iterator back, then ! # pass the iterator to ResultsManage so we can reuse the ! # results ! ! else { ! $log->is_debug && ! $log->debug( "Running search for the first time" ); ! my $iterator = eval { ! $self->_search_build_and_run({ is_paged => 'yes' }) ! }; ! $self->_search_catch_errors( "$@" ); ! $results->save( $iterator ); ! $log->is_debug && ! $log->debug( "Search ID [$results->{search_id}]" ); ! } ! ! if ( $results->{search_id} ) { ! my $this_page = $req->param( 'page_num' ) || 1; ! my $hits_per_page = $self->param( 'c_search_results_page_size' ); ! my ( $min, $max ) = ! $results->find_page_boundaries( $this_page, $hits_per_page ); ! $tmpl_params{iterator} = $results->retrieve( ! { min => $min, ! max => $max, ! return => 'iterator' }); ! $tmpl_params{page_num} = $this_page; ! $tmpl_params{total_pages} = $results->find_total_page_count( $hits_per_page ); ! $tmpl_params{total_hits} = $results->{num_records}; ! $tmpl_params{search_id} = $results->{search_id}; ! $log->is_debug && ! $log->debug( "Search info: min: ($min); max: ($max)", ! "records ($results->{num_records})" ); ! } ! else { ! $log->warn( "No search ID from results, creating empty iterator" ); ! $tmpl_params{iterator} = SPOPS::Iterator->from_list( [] ); ! } } --- 51,57 ---- my %tmpl_params = (); my $is_paged = $self->param( 'c_search_results_paged' ); if ( $is_paged eq 'yes' ) { ! %tmpl_params = $self->_search_retrieve_paged_results; } *************** *** 108,111 **** --- 60,65 ---- else { + $log->is_debug && + $log->debug( "Search results not paged, using basic iterator" ); $tmpl_params{iterator} = eval { $self->_search_build_and_run( \%tmpl_params ) *************** *** 121,124 **** --- 75,133 ---- } + sub _search_retrieve_paged_results { + my ( $self ) = @_; + $log->is_debug && $log->debug( "Search results will be paged" ); + my %display = (); + + my $req = CTX->request; + my $search_id = $req->param( 'search_id' ); + my $results = OpenInteract2::ResultsManage->new(); + + # If the search has been run before, just set the ID + + if ( $search_id ) { + $log->is_debug && + $log->debug( "Retrieving search for ID '$search_id'" ); + $results->{search_id} = $search_id; + } + + # Otherwise, run the search and get an iterator back, then pass + # the iterator to ResultsManage so we can reuse the results + + else { + $log->is_debug && + $log->debug( "Running search for the first time" ); + my $iterator = eval { + $self->_search_build_and_run({ is_paged => 'yes' }) + }; + $self->_search_catch_errors( "$@" ); + $results->save( $iterator ); + $log->is_debug && + $log->debug( "Got search ID from stored results '$results->{search_id}'" ); + } + + if ( $results->{search_id} ) { + my $this_page = $req->param( 'page_num' ) || 1; + my $hits_per_page = $self->param( 'c_search_results_page_size' ); + my ( $min, $max ) = + $results->find_page_boundaries( $this_page, $hits_per_page ); + $display{iterator} = $results->retrieve({ + min => $min, + max => $max, + return_type => 'iterator' }); + $display{page_num} = $this_page; + $display{total_pages} = $results->find_total_page_count( $hits_per_page ); + $display{total_hits} = $results->{num_records}; + $display{search_id} = $results->{search_id}; + $log->is_debug && $log->debug( "Search info: [min: $min] [max: $max] ", + "[records: $results->{num_records}]" ); + } + else { + $log->warn( "No search ID from results, creating empty iterator" ); + $display{iterator} = SPOPS::Iterator->from_list( [] ); + } + return %display; + } + my %DEFAULTS = ( *************** *** 187,191 **** if ( $caught =~ /^CAP: (.*)$/ ) { $msg = join( '', "Your search has returned too many ", ! "results. ($1) Please try again." ); $task = $self->param( 'c_search_results_cap_fail_task' ); } --- 196,200 ---- if ( $caught =~ /^CAP: (.*)$/ ) { $msg = join( '', "Your search has returned too many ", ! "results ($1). Please try again." ); $task = $self->param( 'c_search_results_cap_fail_task' ); } *************** *** 209,213 **** my $object_class = $self->param( 'c_object_class' ); ! # TODO: This is kind of yucky -- run the same search twice? my @tables = $self->param( 'c_search_query_tables' ); --- 218,222 ---- my $object_class = $self->param( 'c_object_class' ); ! # TODO: This is kind of (!!!) yucky -- run the same search twice? my @tables = $self->param( 'c_search_query_tables' ); *************** *** 215,223 **** my @values = $self->param( 'c_search_query_values' ); if ( my $num_limit_results = $self->param( 'c_search_results_cap' ) ) { ! my $row = eval { $object_class->db_select({ select => [ 'count(*)' ], ! from => \@tables, ! where => $where, ! value => \@values, ! return => 'single' }) }; if ( $row->[0] > $num_limit_results ) { oi_error "CAP: $row->[0] > $num_limit_results"; --- 224,235 ---- my @values = $self->param( 'c_search_query_values' ); if ( my $num_limit_results = $self->param( 'c_search_results_cap' ) ) { ! my $row = eval { ! $object_class->db_select({ ! select => [ 'count(*)' ], ! from => \@tables, ! where => $where, ! value => \@values, ! return => 'single' }) ! }; if ( $row->[0] > $num_limit_results ) { oi_error "CAP: $row->[0] > $num_limit_results"; *************** *** 229,243 **** my $order = $self->param( 'c_search_results_order' ); my $additional_params = $self->_search_additional_params || {}; ! my $iter = eval { $object_class->fetch_iterator({ ! from => \@tables, ! where => $where, ! value => \@values, ! limit => $limit, ! order => $order, ! %{ $additional_params } }) }; if ( $@ ) { $log->error( "Search failed: $@" ); oi_error $@; } return $iter; } --- 241,259 ---- my $order = $self->param( 'c_search_results_order' ); my $additional_params = $self->_search_additional_params || {}; ! my $iter = eval { ! $object_class->fetch_iterator({ ! from => \@tables, ! where => $where, ! value => \@values, ! limit => $limit, ! order => $order, ! %{ $additional_params } }) ! }; if ( $@ ) { $log->error( "Search failed: $@" ); oi_error $@; } + $log->is_info && + $log->info( "Got iterator from '$object_class' given query params" ); return $iter; } *************** *** 412,420 **** $log->is_debug && $log->debug( join( "\n", ! "Built: ", ! " FROM: " . join( ', ', $self->param( 'c_search_query_tables' ) ), " WHERE: " . join( ' AND ', $self->param( 'c_search_query_where' ) ), ! " VALUES:" . join( ', ', $self->param( 'c_search_query_values' ) ), ) ); return $self; --- 428,436 ---- $log->is_debug && $log->debug( join( "\n", ! "Built SQL chunks: ", ! " FROM: " . join( ', ', $self->param( 'c_search_query_tables' ) ), " WHERE: " . join( ' AND ', $self->param( 'c_search_query_where' ) ), ! " VALUES: " . join( ', ', $self->param( 'c_search_query_values' ) ), ) ); return $self; |
|
From: Chris W. <la...@us...> - 2004-10-05 03:08:41
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20853 Modified Files: ResultsIterator.pm ResultsManage.pm Log Message: OIN-63: ensure that CommonSearch, RsultsManage, ResultsIterator all play nice together (passing the right parameters, etc.); update logging Index: ResultsIterator.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ResultsIterator.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ResultsIterator.pm 5 Jul 2004 12:59:37 -0000 1.5 --- ResultsIterator.pm 5 Oct 2004 03:08:24 -0000 1.6 *************** *** 41,45 **** "[$object_class: $object_id]" ); ! return ITER_IS_DONE unless ( $object_class and $object_id ); my $object = eval { --- 41,49 ---- "[$object_class: $object_id]" ); ! unless ( $object_class and $object_id ) { ! $log->is_info && ! $log->info( "No class or ID found in iterator, all done." ); ! return ITER_IS_DONE; ! } my $object = eval { *************** *** 55,60 **** return $self->fetch_object; } ! $log->is_debug && ! $log->debug( "Caught non-security exception: $@" ); die $@; } --- 59,63 ---- return $self->fetch_object; } ! $log->is_debug && $log->debug( "Caught non-security exception: $@" ); die $@; } *************** *** 67,70 **** --- 70,75 ---- } + $log->is_debug && $log->debug( "Fetched object ok, checking min/max" ); + # Using min/max and haven't reached it yet *************** *** 73,76 **** --- 78,83 ---- $self->{_SEARCH_COUNT}++; $self->{_SEARCH_RAW_COUNT}++; + $log->is_debug && + $log->debug( "Haven't reached min threshold" ); return $self->fetch_object; } *************** *** 78,81 **** --- 85,89 ---- if ( $self->{_SEARCH_MAX} and ( $self->{_SEARCH_COUNT} > $self->{_SEARCH_MAX} ) ) { + $log->is_debug && $log->debug( "Over max threshold, we're all done" ); return ITER_IS_DONE; } *************** *** 84,87 **** --- 92,98 ---- # actually return the object. Finish up. + $log->is_debug && + $log->debug( "Min/max passed ok; assign extra data then finish" ); + my %extra_data = (); if ( $self->{_SEARCH_EXTRA_NAME} ) { *************** *** 90,93 **** --- 101,106 ---- foreach my $name ( @{ $self->{_SEARCH_EXTRA_NAME} } ) { my $extra_value = shift @extra_data; + $log->is_debug && $log->debug( "Adding extra data '$name' => ", + "'$extra_value'" ); $object->{ "tmp_$name" } = $extra_value; $extra_data{ $name } = $extra_value; Index: ResultsManage.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ResultsManage.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ResultsManage.pm 5 Jul 2004 13:00:22 -0000 1.11 --- ResultsManage.pm 5 Oct 2004 03:08:25 -0000 1.12 *************** *** 322,332 **** "ID '", $self->search_id, "'" ); ! my $results = $self->_retrieve_raw_results; $log->is_info && ! $log->info( "Found: ", scalar @{ $results }, " results" ); return ( $return_type eq 'iterator' ) ! ? $self->_retrieve_iterator( $results, $p ) ! : $results; } --- 322,333 ---- "ID '", $self->search_id, "'" ); ! my $raw_results = $self->_retrieve_raw_results; $log->is_info && ! $log->info( "Found: ", scalar @{ $raw_results }, " results; asked ", ! "to return '$return_type'" ); return ( $return_type eq 'iterator' ) ! ? $self->_retrieve_iterator( $raw_results, $p ) ! : $raw_results; } *************** *** 391,403 **** sub _retrieve_iterator { ! my ( $self, $results, $p ) = @_; ! $log ||= get_logger( LOG_APP ); ! ! my $iterator = OpenInteract2::ResultsIterator->new({ ! results => $results, extra_name => $self->extra_name, skip_security => $p->{skip_security} }); - return $iterator; } --- 392,401 ---- sub _retrieve_iterator { ! my ( $self, $raw_results, $p ) = @_; ! return OpenInteract2::ResultsIterator->new({ ! results => $raw_results, extra_name => $self->extra_name, skip_security => $p->{skip_security} }); } *************** *** 489,499 **** } unless ( -w $results_dir ) { ! $log->error( "Search results dir '", $results_dir, "' is not writeable" ); oi_error "Configuration option for writing search results ", "'$results_dir' exists but is not writeable"; } my $iterations = 0; while ( 1 ) { ! my $search_id = SPOPS::Utility->generate_random_code( FILENAME_WIDTH ); my $filename = $self->_build_results_filename( $search_id ); my $lockfile = $self->_build_lock_filename( $search_id ); --- 487,500 ---- } unless ( -w $results_dir ) { ! $log->error( "Search results directory '$results_dir' ", ! "is not writeable" ); oi_error "Configuration option for writing search results ", "'$results_dir' exists but is not writeable"; } my $iterations = 0; + my ( $search_id ); + FIND_ID: while ( 1 ) { ! $search_id = SPOPS::Utility->generate_random_code( FILENAME_WIDTH ); my $filename = $self->_build_results_filename( $search_id ); my $lockfile = $self->_build_lock_filename( $search_id ); *************** *** 506,514 **** $iterations++; next if ( -f $filename || -f $lockfile ); ! $log->is_debug && ! $log->debug( "Found non-existent search info for ", ! "'$search_id' in '$results_dir'" ); ! return $search_id; } } --- 507,515 ---- $iterations++; next if ( -f $filename || -f $lockfile ); ! $log->is_debug && $log->debug( "Found unused search filename ", ! "in '$results_dir': '$search_id'" ); ! last FIND_ID; } + return $search_id; } |
|
From: Chris W. <la...@us...> - 2004-10-05 03:06:13
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20220 Modified Files: Response.pm Log Message: clarify return URL usage Index: Response.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Response.pm 3 Oct 2004 00:15:24 -0000 1.25 --- Response.pm 5 Oct 2004 03:06:02 -0000 1.26 *************** *** 343,349 **** accidentally submit a new 'edit'. (Redirects are good for this, too.) ! When set the response object ensures the given URL is located under ! the server context; therefore, the value returned from this property ! is always located under the server context. B<send_file> - Filename of file to send directly to the user. It is --- 343,349 ---- accidentally submit a new 'edit'. (Redirects are good for this, too.) ! When you set a return URL the response object ensures the given URL is ! located under the server context; therefore, the value returned from ! this property is always located under the server context. B<send_file> - Filename of file to send directly to the user. It is |
|
From: Chris W. <la...@us...> - 2004-10-05 03:05:18
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20125/Auth Modified Files: User.pm Log Message: cosmetic Index: User.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Auth/User.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** User.pm 22 Feb 2004 04:41:48 -0000 1.20 --- User.pm 5 Oct 2004 03:05:09 -0000 1.21 *************** *** 23,28 **** if ( $user ) { $is_logged_in = 'yes'; ! $log->is_info && ! $log->info( "Found user from session cache" ); } else { --- 23,27 ---- if ( $user ) { $is_logged_in = 'yes'; ! $log->is_info && $log->info( "Found user from session cache" ); } else { *************** *** 137,141 **** $log->is_info && $log->info( "Set user to session cache, expires in ", ! "[$user_refresh] minutes" ); } --- 136,140 ---- $log->is_info && $log->info( "Set user to session cache, expires in ", ! "'$user_refresh' minutes" ); } *************** *** 197,203 **** $log->info( "Found login name [$login_name]" ); ! my $user = eval { CTX->lookup_object( 'user' ) ! ->fetch_by_login_name( $login_name, ! { skip_security => 1 } ) }; if ( $@ ) { $log->error( "Error fetching user by login name: $@" ); --- 196,204 ---- $log->info( "Found login name [$login_name]" ); ! my $user = eval { ! CTX->lookup_object( 'user' ) ! ->fetch_by_login_name( $login_name, ! { skip_security => 1 } ) ! }; if ( $@ ) { $log->error( "Error fetching user by login name: $@" ); *************** *** 213,217 **** # Check the password ! my $password = $request->param( $password_field ); unless ( $user->check_password( $password ) ) { --- 214,218 ---- # Check the password ! my $password = $request->param( $password_field ); unless ( $user->check_password( $password ) ) { |
|
From: Chris W. <la...@us...> - 2004-10-05 02:16:01
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9409 Modified Files: Plugin.pm Log Message: cosmetic Index: Plugin.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2/Plugin.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Plugin.pm 27 Sep 2004 10:41:54 -0000 1.12 --- Plugin.pm 5 Oct 2004 02:13:50 -0000 1.13 *************** *** 513,518 **** sub return_url { my ( $self ) = @_; ! return CTX->response->return_url() ! || CTX->request->url_absolute(); } --- 513,517 ---- sub return_url { my ( $self ) = @_; ! return CTX->response->return_url() || CTX->request->url_absolute(); } |
|
From: Chris W. <la...@us...> - 2004-10-05 02:04:41
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7190/t Modified Files: utils.pl Log Message: pkg update Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** utils.pl 5 Oct 2004 01:19:12 -0000 1.70 --- utils.pl 5 Oct 2004 02:03:17 -0000 1.71 *************** *** 45,49 **** return ( base => '2.10', ! base_box => '2.13', base_error => '2.10', base_group => '2.14', --- 45,49 ---- return ( base => '2.10', ! base_box => '2.14', base_error => '2.10', base_group => '2.14', |
|
From: Chris W. <la...@us...> - 2004-10-05 02:04:38
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7190 Modified Files: MANIFEST Log Message: pkg update Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** MANIFEST 5 Oct 2004 01:19:12 -0000 1.91 --- MANIFEST 5 Oct 2004 02:03:17 -0000 1.92 *************** *** 158,162 **** lib/OpenInteract2/Util.pm pkg/base-2.10.zip ! pkg/base_box-2.13.zip pkg/base_error-2.10.zip pkg/base_group-2.14.zip --- 158,162 ---- lib/OpenInteract2/Util.pm pkg/base-2.10.zip ! pkg/base_box-2.14.zip pkg/base_error-2.10.zip pkg/base_group-2.14.zip |
|
From: Chris W. <la...@us...> - 2004-10-05 02:03:23
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6796/template Modified Files: login_box.tmpl Log Message: OIN-90: pass 'form_url' to 'form_begin' template since it's already been contextualized Index: login_box.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/template/login_box.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** login_box.tmpl 22 May 2004 17:48:29 -0000 1.8 --- login_box.tmpl 5 Oct 2004 02:01:47 -0000 1.9 *************** *** 1,10 **** [%- DEFAULT theme = OI.theme_properties; ! DEFAULT return_url = OI.return_url || '/'; login_config = OI.server_config.login; forgot_url = OI.make_url( ACTION = 'forgotpassword' ); -%] <div align="center"> ! [% PROCESS form_begin( BASE = return_url, ! method = 'POST', ! name = 'login' ) -%] [%- IF login_config.always_remember -%] --- 1,10 ---- [%- DEFAULT theme = OI.theme_properties; ! DEFAULT return_url = OI.return_url; login_config = OI.server_config.login; forgot_url = OI.make_url( ACTION = 'forgotpassword' ); -%] <div align="center"> ! [% PROCESS form_begin( form_url = return_url, ! method = 'POST', ! name = 'login' ) -%] [%- IF login_config.always_remember -%] |
|
From: Chris W. <la...@us...> - 2004-10-05 02:03:22
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6796 Modified Files: Changes package.conf Log Message: OIN-90: pass 'form_url' to 'form_begin' template since it's already been contextualized Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/Changes,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Changes 25 Sep 2004 18:18:23 -0000 1.14 --- Changes 5 Oct 2004 02:01:47 -0000 1.15 *************** *** 1,4 **** --- 1,11 ---- Revision history for OpenInteract package base_box. + 2.14 Mon Oct 4 21:46:20 EDT 2004 + + OIN-90: we were relocating the 'return_url' twice in + template/login_box.tmpl; use the just-updated feature in the + 'form_begin' global template to pass in 'form_url' so it doesn't + get relocated again. Thanks to Heiko Klein for the spot. + 2.13 Sat Sep 25 14:17:34 EDT 2004 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/package.conf,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** package.conf 25 Sep 2004 18:18:23 -0000 1.13 --- package.conf 5 Oct 2004 02:01:47 -0000 1.14 *************** *** 1,4 **** name base_box ! version 2.13 author Chris Winters <ch...@cw...> url http://www.openinteract.org/ --- 1,4 ---- name base_box ! version 2.14 author Chris Winters <ch...@cw...> url http://www.openinteract.org/ |
4 messages has been excluded from this view by a project administrator.
