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...> - 2001-11-28 15:21:32
|
Update of /cvsroot/openinteract/OpenInteract/script
In directory usw-pr-cvs1:/tmp/cvs-serv2433
Modified Files:
oi_manage
Log Message:
ensure everything that needs it creates the temporary lib directory
Index: oi_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/script/oi_manage,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** oi_manage 2001/11/28 06:00:20 1.54
--- oi_manage 2001/11/28 15:21:28 1.55
***************
*** 2014,2017 ****
--- 2014,2020 ----
website_dir => $p->{website_dir},
action => 'install SQL' });
+ my $base_config = OpenInteract::Startup->read_base_config({
+ website_dir => $p->{website_dir} });
+ OpenInteract::Startup->create_temp_lib( $base_config );
# Grab the repository and existing packages
***************
*** 2367,2371 ****
my ( $p ) = @_;
my $R = initialize_request({ website_dir => $p->{website_dir},
! action => 'dump templates' });
my $TMPL_CLASS = $R->site_template;
my @status = ();
--- 2370,2374 ----
my ( $p ) = @_;
my $R = initialize_request({ website_dir => $p->{website_dir},
! action => 'dump templates' });
my $TMPL_CLASS = $R->site_template;
my @status = ();
***************
*** 2493,2500 ****
sub update_objects {
my ( $p ) = @_;
! my $R = OpenInteract::Startup->setup_static_environment( $p->{website_dir} );
! unless ( $R ) {
! die "Cannot create OpenInteract environment! (Database error?)\n";
! }
my $object_tag = $p->{object_tag};
my $class = $R->$object_tag();
--- 2496,2501 ----
sub update_objects {
my ( $p ) = @_;
! my $R = initialize_request({ website_dir => $p->{website_dir},
! action => 'update objects' });
my $object_tag = $p->{object_tag};
my $class = $R->$object_tag();
|
|
From: Chris W. <la...@us...> - 2001-11-28 13:16:07
|
Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc In directory usw-pr-cvs1:/tmp/cvs-serv2466 Modified Files: Changes package.conf Log Message: update the page data file to reflect new structure Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/Changes,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Changes 2001/10/29 03:38:16 1.13 --- Changes 2001/11/28 13:16:04 1.14 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package system_doc. + 1.28 Wed Nov 28 08:35:24 EST 2001 + + Update data for installed OI::Page objects (data/page.dat) to + reflect new structure. + 1.27 Sun Oct 28 22:33:02 EST 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/package.conf,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** package.conf 2001/10/29 03:38:16 1.13 --- package.conf 2001/11/28 13:16:04 1.14 *************** *** 1,4 **** name system_doc ! version 1.27 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name system_doc ! version 1.28 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2001-11-28 13:16:07
|
Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc/data
In directory usw-pr-cvs1:/tmp/cvs-serv2466/data
Modified Files:
page.dat
Log Message:
update the page data file to reflect new structure
Index: page.dat
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/data/page.dat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** page.dat 2001/10/29 03:37:20 1.1
--- page.dat 2001/11/28 13:16:04 1.2
***************
*** 2,27 ****
{ spops_class => 'OpenInteract::Page',
field_order => [ qw/ location title author
! mime_type template_parse is_active is_file notes / ] },
[ '/oi_docs/index.html', 'Guides to OpenInteract', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/overview.html', 'Introduction to OpenInteract', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/spops_overview.html', 'Introduction to SPOPS', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/manager.html',
'Illustrated Manager\'s Guide to OpenInteract: Technical Overview',
! 'in...@op...', 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/admin.html', 'OpenInteract Administrator\'s Guide',
! 'in...@op...', 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/developer.html', 'OpenInteract Developer\'s Guide', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/glossary.html', 'OpenInteract Glossary', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/LDAP.html', 'OpenInteract and LDAP', 'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/template_widgets.html', 'OpenInteract Template Widgets',
! 'in...@op...', 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
[ '/oi_docs/data_import.html', 'Importing Data into OpenInteract',
'in...@op...',
! 'text/html', 'no', 'yes', 'yes', 'Created with OI install' ],
];
--- 2,27 ----
{ spops_class => 'OpenInteract::Page',
field_order => [ qw/ location title author
! mime_type template_parse is_active storage notes / ] },
[ '/oi_docs/index.html', 'Guides to OpenInteract', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/overview.html', 'Introduction to OpenInteract', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/spops_overview.html', 'Introduction to SPOPS', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/manager.html',
'Illustrated Manager\'s Guide to OpenInteract: Technical Overview',
! 'in...@op...', 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/admin.html', 'OpenInteract Administrator\'s Guide',
! 'in...@op...', 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/developer.html', 'OpenInteract Developer\'s Guide', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/glossary.html', 'OpenInteract Glossary', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/LDAP.html', 'OpenInteract and LDAP', 'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/template_widgets.html', 'OpenInteract Template Widgets',
! 'in...@op...', 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
[ '/oi_docs/data_import.html', 'Importing Data into OpenInteract',
'in...@op...',
! 'text/html', 'no', 'yes', 'file', 'Created with OI install' ],
];
|
|
From: Chris W. <la...@us...> - 2001-11-28 13:14:26
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/data
In directory usw-pr-cvs1:/tmp/cvs-serv2019/data
Modified Files:
page.dat
Log Message:
update the page data file to reflect new structure
Index: page.dat
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/data/page.dat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** page.dat 2001/10/29 05:11:31 1.1
--- page.dat 2001/11/28 13:14:22 1.2
***************
*** 2,9 ****
{ spops_class => 'OpenInteract::Page',
field_order => [ qw/ location title author
! boxes mime_type is_active is_file
notes / ] },
[ '/index.html', 'Welcome to OpenInteract!', 'OpenInteract Authors <in...@op...>',
! 'powered_by_box', 'text/html', 'yes', 'yes',
'This record and file were created when you installed OI' ]
];
--- 2,9 ----
{ spops_class => 'OpenInteract::Page',
field_order => [ qw/ location title author
! boxes mime_type is_active storage
notes / ] },
[ '/index.html', 'Welcome to OpenInteract!', 'OpenInteract Authors <in...@op...>',
! 'powered_by_box', 'text/html', 'yes', 'file',
'This record and file were created when you installed OI' ]
];
|
|
From: Chris W. <la...@us...> - 2001-11-28 13:14:25
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_page In directory usw-pr-cvs1:/tmp/cvs-serv2019 Modified Files: Changes package.conf Log Message: update the page data file to reflect new structure Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/Changes,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Changes 2001/11/27 13:20:15 1.14 --- Changes 2001/11/28 13:14:22 1.15 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_page. + 0.39 Wed Nov 28 08:33:05 EST 2001 + + Update data/page.dat to reflect the structure changes + 0.38 Tue Nov 27 08:37:59 EST 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/package.conf,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** package.conf 2001/11/27 13:20:16 1.14 --- package.conf 2001/11/28 13:14:22 1.15 *************** *** 1,4 **** name base_page ! version 0.38 author Chris Winters <ch...@cw...> module File::Basename --- 1,4 ---- name base_page ! version 0.39 author Chris Winters <ch...@cw...> module File::Basename |
|
From: Chris W. <la...@us...> - 2001-11-28 13:04:05
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_user/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv32052/OpenInteract
Modified Files:
User.pm
Log Message:
dumb fix
Index: User.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/OpenInteract/User.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** User.pm 2001/11/20 03:30:54 1.6
--- User.pm 2001/11/28 13:04:02 1.7
***************
*** 90,93 ****
--- 90,94 ----
sub is_in_group {
my ( $self, $group_spec ) = @_;
+ my $R = OpenInteract::Request->instance;
my $check_group_id = ( ref $group_spec )
? $group_spec->id : $group_spec;
|
|
From: Chris W. <la...@us...> - 2001-11-28 13:04:05
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_user In directory usw-pr-cvs1:/tmp/cvs-serv32052 Modified Files: Changes package.conf Log Message: dumb fix Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/Changes,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Changes 2001/11/28 05:44:09 1.29 --- Changes 2001/11/28 13:04:02 1.30 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_user. + 1.45 Wed Nov 28 08:23:32 EST 2001 + + Embarrassing fix in OpenInteract/User.pm. + 1.44 Wed Nov 28 01:03:30 EST 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/package.conf,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** package.conf 2001/11/28 05:44:09 1.29 --- package.conf 2001/11/28 13:04:02 1.30 *************** *** 1,4 **** name base_user ! version 1.44 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name base_user ! version 1.45 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2001-11-28 06:02:00
|
Update of /cvsroot/openinteract/OpenInteract In directory usw-pr-cvs1:/tmp/cvs-serv1783 Modified Files: MANIFEST Log Message: update package versions, etc. Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/MANIFEST,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** MANIFEST 2001/11/20 04:12:34 1.74 --- MANIFEST 2001/11/28 06:01:57 1.75 *************** *** 92,110 **** pkg/base_box-0.41.tar.gz pkg/base_component-1.30.tar.gz ! pkg/base_error-1.34.tar.gz pkg/base_group-1.27.tar.gz ! pkg/base_page-0.28.tar.gz pkg/base_security-1.53.tar.gz pkg/base_template-1.27.tar.gz pkg/base_theme-1.29.tar.gz ! pkg/base_user-1.43.tar.gz ! pkg/classified-1.32.tar.gz ! pkg/full_text-1.30.tar.gz pkg/lookup-0.18.tar.gz - pkg/news-1.33.tar.gz pkg/object_activity-0.10.tar.gz pkg/results_manage-0.06.tar.gz - pkg/static_page-1.52.tar.gz pkg/system_doc-1.27.tar.gz script/oi_manage script/template_translate.pl --- 92,110 ---- pkg/base_box-0.41.tar.gz pkg/base_component-1.30.tar.gz ! pkg/base_error-1.37.tar.gz pkg/base_group-1.27.tar.gz ! pkg/base_page-0.38.tar.gz pkg/base_security-1.53.tar.gz pkg/base_template-1.27.tar.gz pkg/base_theme-1.29.tar.gz ! pkg/base_user-1.44.tar.gz pkg/lookup-0.18.tar.gz pkg/object_activity-0.10.tar.gz pkg/results_manage-0.06.tar.gz pkg/system_doc-1.27.tar.gz + pkg/classified-1.32.tar.gz + pkg/full_text-1.30.tar.gz + pkg/news-1.33.tar.gz + pkg/static_page-1.52.tar.gz script/oi_manage script/template_translate.pl |
|
From: Chris W. <la...@us...> - 2001-11-28 06:01:46
|
Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv1713
Modified Files:
Changes
Log Message:
latest changes
Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/Changes,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** Changes 2001/11/20 04:11:21 1.82
--- Changes 2001/11/28 06:01:44 1.83
***************
*** 5,15 ****
Overall:
! - Lots of configuration file changes. You can now use a .ini-style
configuration file instead of the perl data structure file. (Hint:
one is a lot easier to read.) The perl-structure config file was also
modified quite a bit, and many files throughout OI modified to
accommodate the changes. The changes included backward compatibility
! where possible, so it should be possible to use an old-style
! configuration file with the newer releases.
- Added 'object_activity' package to browse object activity
--- 5,16 ----
Overall:
! - Lots of configuration file changes. (PLEASE read the 'UPGRADE' file
! to ensure you get all the changes.) You can now use a .ini-style
configuration file instead of the perl data structure file. (Hint:
one is a lot easier to read.) The perl-structure config file was also
modified quite a bit, and many files throughout OI modified to
accommodate the changes. The changes included backward compatibility
! where possible, so it should be transparent to use an old-style
! (perl) configuration file with the newer releases.
- Added 'object_activity' package to browse object activity
***************
*** 17,27 ****
tendencies you might have...
! - Package 'base_page' now replaces 'static_page'. The new package
allows you to edit files in the filesystem and keep the metadata
! (title, authors, boxes, etc.) in the database. You can also use it to
! manage non-HTML files (PDFs, Excel spreadsheets, tarballs, etc.) You
! can still keep your editable content in the database, but it's now in
! a separate table, and there are no separate fields for 'content' and
! 'script'. A migration script is provided.
- Modified the Apache startup procedures so we have a single, non
--- 18,30 ----
tendencies you might have...
! - The new package 'base_page' replaces 'static_page'. The new package
allows you to edit files in the filesystem and keep the metadata
! (title, authors, boxes, etc.) in the database while keeping the
! content elsewhere. Not only can you can also use it to
! manage non-HTML files (PDFs, Excel spreadsheets, tarballs, etc.), but
! you can also use its aliasing and URL-mapping features to link to or
! bring in content from other locations on your site or anywhere on the
! web. (The URL-mapping is still crude, but it works.) A migration
! script is provided.
- Modified the Apache startup procedures so we have a single, non
***************
*** 30,33 ****
--- 33,39 ----
details.
+ - Get rid of the monster @INC, re-creating a temporary library
+ directory on every server restart.
+
Individual:
***************
*** 96,100 ****
- Updated the simple example package to version 0.09. This version
! works with OI 1.30 and includes the new template widgets. Thanks to
Steven Devijver <st...@de...> for prompting its revision.
--- 102,106 ----
- Updated the simple example package to version 0.09. This version
! works with OI 1.30+ and includes the new template widgets. Thanks to
Steven Devijver <st...@de...> for prompting its revision.
***************
*** 104,107 ****
--- 110,115 ----
method for backward compatibility
+ - Set the content-length in send_static_file()
+
* OpenInteract/ApacheStartup.pm:
***************
*** 109,113 ****
the ChildInit handler rather than the server handler, since we were
in some cases asking for a database handle in the server and never
! letting it go. (This can be bad) See 'UPGRADE' for simple but
necessary changes to your Apache config.
--- 117,121 ----
the ChildInit handler rather than the server handler, since we were
in some cases asking for a database handle in the server and never
! letting it go. (This can be bad.) See 'UPGRADE' for simple but
necessary changes to your Apache config.
***************
*** 116,120 ****
PerlSetVar in the configuration file. (Encountered some nastiness
on Solaris under 5.005_03/1.3.22/1.26 and the PerlSetVar items not
! being there.)
* OpenInteract/Auth.pm:
--- 124,131 ----
PerlSetVar in the configuration file. (Encountered some nastiness
on Solaris under 5.005_03/1.3.22/1.26 and the PerlSetVar items not
! being there. Whatever.)
!
! - Tell OI::Startup to copy all the relevant package files on
! *server* startup, since it modifies @INC
* OpenInteract/Auth.pm:
***************
*** 124,128 ****
being a member of the 'site admin' group. You can subclass this
class, override the method and specify the class in the server
! configuration to provide your own criteria.
- Broke the 'user()' method down into pieces so it can be
--- 135,140 ----
being a member of the 'site admin' group. You can subclass this
class, override the method and specify the class in the server
! configuration to provide your own criteria for who is an
! administrator.
- Broke the 'user()' method down into pieces so it can be
***************
*** 150,153 ****
--- 162,176 ----
add/clarify some docs.
+ * OpenInteract/Package.pm:
+
+ - Files copied from a base_installation package to the website
+ check the contents of a file in the directory (.no_overwrite)
+ before doing so. This way your /index.html file won't get
+ overwritten with each new base_page upgrade.
+
+ - Add copy_modules() method, which copies all the modules from both
+ a website pkg directory and its base pkg directory to a temporary
+ library location.
+
* OpenInteract/SPOPS.pm:
***************
*** 165,168 ****
--- 188,203 ----
'field_discover' key to 'yes' in your object configuration.
+ * OpenInteract/Startup.pm:
+
+ - Add create_temp_lib() method to create a temporary library
+ directory, asking each of the packages to copy their relevant
+ module files there.
+
+ - Remove code that relied on putting all the package directories in
+ @INC, and add an extra call to setup_static_environment() to copy
+ the modules for all packages in a website to a temporary library,
+ which is also put in @INC. (For Apache the call to copy is in
+ OI::ApacheStartup)
+
* OpenInteract/Template/Plugin.pm:
***************
*** 191,194 ****
--- 226,234 ----
version is now pulled from OpenInteract.pm
+ - When creating a new website, mark in .no_overwrite the
+ html/index.html file so it won't be overwritten by package
+ upgrades. Also mark the template/base_main and template/base_simple
+ files.
+
* template/base_(main|simple):
***************
*** 204,229 ****
site.
Packages changed:
! OpenInteract 1.30 -> 1.35
----------------------------
! base: 1.62 -> 1.63
! base_box: 0.33 -> 0.37
! base_component: 1.30 -> 1.30
! base_error: 1.32 -> 1.34
! base_group: 1.26 -> 1.26
! base_page: n/a -> 0.26
! base_security: 1.51 -> 1.51
! base_template: 1.27 -> 1.27
! base_theme: 1.27 -> 1.28
! base_user: 1.37 -> 1.40
! lookup: 0.15 -> 0.17
! results_manage: 0.05 -> 0.05
! system_doc: 1.25 -> 1.27
! classified: 1.28 -> 1.32
! full_text: 1.27 -> 1.30
! news: 1.33 -> 1.33
! static_page: 1.51 -> 1.52
--- 244,274 ----
site.
+ * template/*:
+ - Other widget template files had changes too minor to note here.
+
+
Packages changed:
! OpenInteract 1.30 -> 1.35
----------------------------
! base: 1.62 -> 1.63
! base_box: 0.33 -> 0.41
! base_component: 1.30 -> 1.30
! base_error: 1.32 -> 1.37
! base_group: 1.26 -> 1.27
! base_page: n/a -> 0.38
! base_security: 1.51 -> 1.53
! base_template: 1.27 -> 1.27
! base_theme: 1.27 -> 1.29
! base_user: 1.37 -> 1.44
! lookup: 0.15 -> 0.18
! object_activity: n/a -> 0.10
! results_manage: 0.05 -> 0.06
! system_doc: 1.25 -> 1.27
! classified: 1.28 -> 1.32
! full_text: 1.27 -> 1.30
! news: 1.33 -> 1.33
! static_page: 1.51 -> 1.52
|
|
From: Chris W. <la...@us...> - 2001-11-28 06:01:21
|
Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv1609
Modified Files:
Makefile.PL
Log Message:
added File::MMagic
Index: Makefile.PL
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/Makefile.PL,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.PL 2001/10/29 15:02:07 1.10
--- Makefile.PL 2001/11/28 06:01:19 1.11
***************
*** 27,30 ****
--- 27,31 ----
'Pod::POM' => undef,
'MIME::Lite' => 2.00,
+ 'File::MMagic' => undef,
},
);
|
|
From: Chris W. <la...@us...> - 2001-11-28 06:01:05
|
Update of /cvsroot/openinteract/OpenInteract In directory usw-pr-cvs1:/tmp/cvs-serv1550 Modified Files: RELEASE Log Message: release notes Index: RELEASE =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/RELEASE,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RELEASE 2001/10/15 05:26:05 1.12 --- RELEASE 2001/11/28 06:01:02 1.13 *************** *** 2,5 **** --- 2,21 ---- ========================= + 1.35 + + - Tons of configuration changes -- please see UPGRADE if you're + upgrading. You can now use a INI-style configuration for the server + information. + + - Added 'object_activity' package to display what activity + (create/update/delete) has transpired on all objects that choose to + participate + + - Replace 'static_page' package with 'base_page' package, with lots + of improvements + + - Modified the Apache startup procedure to be cleaner + + 1.30 Mon Oct 15 01:35:03 EDT 2001 |
|
From: Chris W. <la...@us...> - 2001-11-28 06:00:24
|
Update of /cvsroot/openinteract/OpenInteract/script
In directory usw-pr-cvs1:/tmp/cvs-serv1368/script
Modified Files:
oi_manage
Log Message:
cosmetic (mostly)
Index: oi_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/script/oi_manage,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** oi_manage 2001/11/14 12:56:50 1.53
--- oi_manage 2001/11/28 06:00:20 1.54
***************
*** 10,14 ****
use File::Path;
use Getopt::Long qw( GetOptions );
! use OpenInteract::Package;
use OpenInteract::PackageRepository;
use OpenInteract::Startup;
--- 10,14 ----
use File::Path;
use Getopt::Long qw( GetOptions );
! use OpenInteract::Package qw( READONLY_FILE );
use OpenInteract::PackageRepository;
use OpenInteract::Startup;
***************
*** 23,27 ****
use constant DEBUG => 0;
- use constant WIDGET_OVERWRITE_FILE => '.no_overwrite';
# Legitimate commands; anything not listed here will be kicked out and
--- 23,26 ----
***************
*** 1137,1155 ****
sub refresh_widget {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({ dir => $p->{website_dir} }) };
! if ( $@ ) { base_config_file_error({ website_dir => $p->{website_dir},
! error => $@, sub => 'refresh_widget' }) }
! my $base_widget = "$bc->{base_dir}/template";
! my $site_widget = "$p->{website_dir}/template";
! File::Path::mkpath( $site_widget, 0775, undef ) unless ( -d $site_widget );
! opendir( BASE, $base_widget ) || die "Cannot open base widget directory! ($!)";
! opendir( SITE, $site_widget ) || die "Cannot open website widget directory! ($!)";
! my %base_info = map { $_ => (stat( "$base_widget/$_" ))[7] }
! grep { -f "$base_widget/$_" }
grep ! /old$/,
readdir( BASE );
! my %site_info = map { $_ => (stat( "$site_widget/$_" ))[7] }
! grep { -f "$site_widget/$_" }
grep ! /old$/,
readdir( SITE );
--- 1136,1161 ----
sub refresh_widget {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({
! dir => $p->{website_dir} }) };
! if ( $@ ) {
! base_config_file_error({ website_dir => $p->{website_dir},
! error => $@, sub => 'refresh_widget' });
! }
! my $base_widget_dir = "$bc->{base_dir}/template";
! my $site_widget_dir = "$p->{website_dir}/template";
! unless ( -d $site_widget_dir ) {
! File::Path::mkpath( $site_widget_dir, 0775, undef );
! }
! opendir( BASE, $base_widget_dir )
! || die "Cannot open base widget directory! ($!)";
! opendir( SITE, $site_widget_dir )
! || die "Cannot open website widget directory! ($!)";
! my %base_info = map { $_ => (stat( "$base_widget_dir/$_" ))[7] }
! grep { -f "$base_widget_dir/$_" }
grep ! /old$/,
readdir( BASE );
! my %site_info = map { $_ => (stat( "$site_widget_dir/$_" ))[7] }
! grep { -f "$site_widget_dir/$_" }
grep ! /old$/,
readdir( SITE );
***************
*** 1157,1173 ****
close( BASE );
! my %no_write = ();
! my $overwrite_check_file = join( '/', $site_widget, WIDGET_OVERWRITE_FILE );
! if ( open( NOWRITE, $overwrite_check_file ) ) {
! while ( <NOWRITE> ) {
! chomp;
! next if ( /^\s*$/ );
! next if ( /^\s*\#/ );
! s/^\s+//;
! s/\s+$//;
! $no_write{ $_ }++;
! }
! close( NOWRITE );
! }
my @status = ();
--- 1163,1167 ----
close( BASE );
! my %no_write = map { $_ => 1 } $PKG_CLASS->read_readonly_file( $site_widget_dir );
my @status = ();
***************
*** 1175,1184 ****
next if ( $no_write{ $base_filename } );
if ( $base_info{ $base_filename } != $site_info{ $base_filename } ) {
! eval { cp( "$base_widget/$base_filename", "$site_widget/$base_filename" ) || die $! };
if ( $@ ) {
! push @status, { filename => $base_filename, ok => 0, error => $@ };
}
else {
! push @status, { filename => $base_filename, ok => 1, copied => 1 };
}
}
--- 1169,1181 ----
next if ( $no_write{ $base_filename } );
if ( $base_info{ $base_filename } != $site_info{ $base_filename } ) {
! eval { cp( "$base_widget_dir/$base_filename",
! "$site_widget_dir/$base_filename" ) || die $! };
if ( $@ ) {
! push @status, { filename => $base_filename,
! ok => 0, error => $@ };
}
else {
! push @status, { filename => $base_filename,
! ok => 1, copied => 1 };
}
}
***************
*** 1197,1201 ****
sub list_actions {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({ dir => $p->{website_dir} }) };
if ( $@ ) { base_config_file_error({ website_dir => $p->{website_dir},
error => $@,
--- 1194,1199 ----
sub list_actions {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({
! dir => $p->{website_dir} }) };
if ( $@ ) { base_config_file_error({ website_dir => $p->{website_dir},
error => $@,
***************
*** 1232,1236 ****
sub list_objects {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({ dir => $p->{website_dir} }) };
if ( $@ ) { base_config_file_error({ website_dir => $p->{website_dir},
error => $@,
--- 1230,1235 ----
sub list_objects {
my ( $p ) = @_;
! my $bc = eval { OpenInteract::Startup->read_base_config({
! dir => $p->{website_dir} }) };
if ( $@ ) { base_config_file_error({ website_dir => $p->{website_dir},
error => $@,
***************
*** 1279,1283 ****
foreach my $sub_dir ( @BASE_SUBDIR ) {
mkdir( "$p->{base_dir}/$sub_dir", 0775 )
! || die "Cannot create subdir ($p->{base_dir}/$sub_dir). Error: $!";
}
--- 1278,1282 ----
foreach my $sub_dir ( @BASE_SUBDIR ) {
mkdir( "$p->{base_dir}/$sub_dir", 0775 )
! || die "Cannot create dir ($p->{base_dir}/$sub_dir). Error: $!";
}
***************
*** 1286,1290 ****
foreach my $file_frag ( @INITIAL_FILES ) {
cp( $file_frag, "$p->{base_dir}/$file_frag" )
! || _w( 0, "Could not copy ($file_frag) to new directory! Error: $!" );
}
--- 1285,1289 ----
foreach my $file_frag ( @INITIAL_FILES ) {
cp( $file_frag, "$p->{base_dir}/$file_frag" )
! || _w( 0, "Could not copy ($file_frag) to new dir! Error: $!" );
}
***************
*** 1296,1303 ****
eval { opendir( CPDIR, $dir_name ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot open dir $dir_name for reading! ($@) Continuing..." );
next COPYDIR;
}
! my @file_list = grep ! /old$/, grep { -f "$dir_name/$_" } readdir( CPDIR );
closedir( CPDIR );
foreach my $file_name ( @file_list ) {
--- 1295,1303 ----
eval { opendir( CPDIR, $dir_name ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot open ($dir_name) for reading! ($@) Continuing..." );
next COPYDIR;
}
! my @file_list = grep ! /old$/,
! grep { -f "$dir_name/$_" } readdir( CPDIR );
closedir( CPDIR );
foreach my $file_name ( @file_list ) {
***************
*** 1401,1408 ****
"$base_dir/$file_frag.old" );
cp( $file_frag, "$base_dir/$file_frag" )
! || _w( 0, "Could not copy ($file_frag) to new directory! Error: $!" );
}
! # Now copy over everything in the 'conf/', 'doc/' and 'template/' directories
COPYDIR:
--- 1401,1409 ----
"$base_dir/$file_frag.old" );
cp( $file_frag, "$base_dir/$file_frag" )
! || _w( 0, "Could not copy ($file_frag) to new dir! Error: $!" );
}
! # Now copy over everything in the 'conf/', 'doc/' and 'template/'
! # directories
COPYDIR:
***************
*** 1410,1414 ****
eval { opendir( CPDIR, $dir_name ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot open dir $dir_name for reading! ($@) Continuing..." );
next COPYDIR;
}
--- 1411,1415 ----
eval { opendir( CPDIR, $dir_name ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot open ($dir_name) for reading! ($@) Continuing..." );
next COPYDIR;
}
***************
*** 1418,1422 ****
next;
}
! my @file_list = grep ! /old$/, grep { -f "$dir_name/$_" } readdir( CPDIR );
closedir( CPDIR );
foreach my $file_name ( @file_list ) {
--- 1419,1424 ----
next;
}
! my @file_list = grep ! /old$/,
! grep { -f "$dir_name/$_" } readdir( CPDIR );
closedir( CPDIR );
foreach my $file_name ( @file_list ) {
***************
*** 1469,1473 ****
my ( $dir ) = @_;
unless ( -d $dir ) {
! die "No valid directory specified to find base packages! (Given: $dir)\n";
}
--- 1471,1475 ----
my ( $dir ) = @_;
unless ( -d $dir ) {
! die "No valid dir specified to find base packages! (Given: $dir)\n";
}
***************
*** 1626,1638 ****
mkdir( $p->{website_dir}, 0775 )
! || die "[oi_manage]: Cannot complete comamnd: cannot create website directory ($p->{website_dir}): $!";
foreach my $sub_dir ( @WEBSITE_SUBDIR, $p->{website_name} ) {
mkdir ( "$p->{website_dir}/$sub_dir", 0775 )
! || die "[oi_manage]: Cannot complete command: failed creating subdir ($p->{website_dir}/$sub_dir): $!";
}
# Do the conf and other files
! cp( "$p->{base_dir}/conf/sample-apache.dat", "$p->{website_dir}/conf/apache.dat" )
|| die "[oi_manage]: Failure! Cannot copy apache module listing: $!";
--- 1628,1643 ----
mkdir( $p->{website_dir}, 0775 )
! || die "[oi_manage]: Cannot complete comamnd: cannot create ",
! "website directory ($p->{website_dir}): $!";
foreach my $sub_dir ( @WEBSITE_SUBDIR, $p->{website_name} ) {
mkdir ( "$p->{website_dir}/$sub_dir", 0775 )
! || die "[oi_manage]: Cannot complete command: failed ",
! "creating subdir ($p->{website_dir}/$sub_dir): $!";
}
# Do the conf and other files
! cp( "$p->{base_dir}/conf/sample-apache.dat",
! "$p->{website_dir}/conf/apache.dat" )
|| die "[oi_manage]: Failure! Cannot copy apache module listing: $!";
***************
*** 1644,1648 ****
eval { mkdir( $html_doc_root, 0775 ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot create directory 'html/oi_docs' in website directory, \n",
"so I cannot copy OpenInteract documentation to viewable ",
"location. Continuing..." );
--- 1649,1653 ----
eval { mkdir( $html_doc_root, 0775 ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot create dir 'html/oi_docs' in website directory, \n",
"so I cannot copy OpenInteract documentation to viewable ",
"location. Continuing..." );
***************
*** 1652,1664 ****
eval { opendir( DOC, $oi_doc_root ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot read system documentation from ($oi_doc_root). Please ask\n",
"your system administrator to install it there..\n",
"Continuing without system documentation available." );
}
else {
! my @file_list = grep ! /old$/, grep { -f "$oi_doc_root/$_" } readdir( DOC );
foreach my $file_name ( @file_list ) {
cp( "$oi_doc_root/$file_name", "$html_doc_root/$file_name" )
! || _w( 0, "Could not copy ($file_name) from system documentation directory ($!)." );
}
}
--- 1657,1672 ----
eval { opendir( DOC, $oi_doc_root ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot read system docs from ($oi_doc_root). Please ask\n",
"your system administrator to install it there..\n",
"Continuing without system documentation available." );
}
else {
! my @file_list = grep ! /old$/,
! grep { -f "$oi_doc_root/$_" }
! readdir( DOC );
foreach my $file_name ( @file_list ) {
cp( "$oi_doc_root/$file_name", "$html_doc_root/$file_name" )
! || _w( 0, "Could not copy ($file_name) from system ",
! "documentation directory ($!)." );
}
}
***************
*** 1673,1694 ****
eval { opendir( DOC, $base_template_root ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot read template widgets from ($base_template_root). Please ask\n",
! "your system administrator to install it there..\n",
"Continuing without template widgets available." );
}
else {
! my @file_list = grep ! /old$/, grep { -f "$base_template_root/$_" } readdir( DOC );
foreach my $file_name ( @file_list ) {
cp( "$base_template_root/$file_name", "$site_template_root/$file_name" )
|| _w( 0, "Could not copy ($file_name) from base template widget ($!)." );
}
! my $no_overwrite_file = join( '/', $site_template_root, WIDGET_OVERWRITE_FILE );
! open( NOWRITE, "> $no_overwrite_file" )
! || _w( 0, "Could not create ($no_overwrite_file): $!" );
! print NOWRITE qq(\# These are templates that will not be overwritten when you\n),
! qq(\# run 'oi_manage refresh_widget' (one per line)\n\n),
! qq(base_main\n),
! qq(base_simple\n);
! close( NOWRITE );
}
--- 1681,1705 ----
eval { opendir( DOC, $base_template_root ) || die $! };
if ( $@ ) {
! _w( 0, "Cannot read template widgets from ($base_template_root).",
! "Please ask your administrator to install it there.\n",
"Continuing without template widgets available." );
}
else {
! my @file_list = grep ! /old$/,
! grep { -f "$base_template_root/$_" }
! readdir( DOC );
foreach my $file_name ( @file_list ) {
cp( "$base_template_root/$file_name", "$site_template_root/$file_name" )
|| _w( 0, "Could not copy ($file_name) from base template widget ($!)." );
}
! my $template_msg = <<TMPLMSG;
! # These are templates that will not be overwritten
! # when you run 'oi_manage refresh_widget' (one
! # template filename per line)
!
! base_main
! base_simple
! TMPLMSG
! create_readonly_file( $site_template_root, $template_msg );
}
***************
*** 1698,1710 ****
my %file_match = (
! "conf/sample-Stash.pm" => "$p->{website_name}/Stash.pm",
! "conf/sample-httpd_modperl.conf" => "conf/httpd_modperl.conf",
! "conf/sample-httpd_modperl_solo.conf" => "conf/httpd_modperl_solo.conf",
! "conf/sample-httpd_static.conf" => "conf/httpd_static.conf",
! "conf/sample-base.conf" => "conf/base.conf",
! "conf/sample-server.perl" => "conf/server.perl",
! "conf/sample-server.ini" => "conf/server.ini",
! "conf/sample-startup.pl" => "conf/startup.pl",
! "INSTALL.website" => "INSTALL.website"
);
my $replace_keys = [ '%%INTERACT_DIR%%', '%%WEBSITE_DIR%%',
--- 1709,1721 ----
my %file_match = (
! "conf/sample-Stash.pm" => "$p->{website_name}/Stash.pm",
! "conf/sample-httpd_modperl.conf" => "conf/httpd_modperl.conf",
! "conf/sample-httpd_modperl_solo.conf" => "conf/httpd_modperl_solo.conf",
! "conf/sample-httpd_static.conf" => "conf/httpd_static.conf",
! "conf/sample-base.conf" => "conf/base.conf",
! "conf/sample-server.perl" => "conf/server.perl",
! "conf/sample-server.ini" => "conf/server.ini",
! "conf/sample-startup.pl" => "conf/startup.pl",
! "INSTALL.website" => "INSTALL.website"
);
my $replace_keys = [ '%%INTERACT_DIR%%', '%%WEBSITE_DIR%%',
***************
*** 1723,1730 ****
}
! return apply_package({ package => \@WEBSITE_BASE_PKG,
! base_dir => $p->{base_dir},
! website_name => $p->{website_name},
! website_dir => $p->{website_dir} });
}
--- 1734,1754 ----
}
! # First apply all the packages...
!
! my $status_list = apply_package({ package => \@WEBSITE_BASE_PKG,
! base_dir => $p->{base_dir},
! website_name => $p->{website_name},
! website_dir => $p->{website_dir} });
!
! # Then create a nowrite flag for the index.html page
!
! my $html_msg = <<HTMLMSG;
! # If a file is listed here it will not be updated when
! # the package to which it belongs is updated.
!
! index.html
! HTMLMSG
! create_readonly_file( "$p->{website_dir}/html", $html_msg );
! return $status_list;
}
***************
*** 2673,2676 ****
--- 2697,2714 ----
$status->{msg} = join "\n", @msg;
return $status;
+ }
+
+
+ #
+ # create_readonly_file
+ #
+
+ sub create_readonly_file {
+ my ( $dir, $msg ) = @_;
+ my $no_overwrite_file = join( '/', $dir, READONLY_FILE );
+ open( NOWRITE, "> $no_overwrite_file" )
+ || _w( 0, "Could not create ($no_overwrite_file): $!" );
+ print NOWRITE $msg;
+ close( NOWRITE );
}
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:55:10
|
Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv433
Modified Files:
Startup.pm
Log Message:
add create_temp_lib() to create the temporary library directory
Index: Startup.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Startup.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Startup.pm 2001/10/18 03:58:37 1.24
--- Startup.pm 2001/11/28 05:55:07 1.25
***************
*** 4,8 ****
--- 4,10 ----
use strict;
+ use Cwd qw( cwd );
use Data::Dumper qw( Dumper );
+ use File::Path qw();
use Getopt::Long qw( GetOptions );
use OpenInteract::Config;
***************
*** 17,22 ****
use constant DEBUG => 0;
! my $REPOS_CLASS = 'OpenInteract::PackageRepository';
! my $PKG_CLASS = 'OpenInteract::Package';
sub main_initialize {
--- 19,25 ----
use constant DEBUG => 0;
! my $TEMP_LIB_DIR = 'tmplib';
! my $REPOS_CLASS = 'OpenInteract::PackageRepository';
! my $PKG_CLASS = 'OpenInteract::Package';
sub main_initialize {
***************
*** 39,44 ****
# Read in our fundamental modules -- these should be in our @INC
! # already, since the 'request_class' is in 'OpenInteract/OpenInteract'
! # and the 'stash_class' is in 'MyApp/MyApp'
$class->require_module({ class => [ $bc->{request_class}, $bc->{stash_class} ] });
--- 42,48 ----
# Read in our fundamental modules -- these should be in our @INC
! # already, since the 'request_class' is in
! # 'OpenInteract/OpenInteract' and the 'stash_class' is in
! # 'MyApp/MyApp'
$class->require_module({ class => [ $bc->{request_class}, $bc->{stash_class} ] });
***************
*** 170,174 ****
--- 174,181 ----
}
+ $class->create_temp_lib( $bc );
+
unshift @INC, $website_dir;
+
my ( $init, $C ) = $class->main_initialize({ base_config => $bc,
alias_init => 1,
***************
*** 230,233 ****
--- 237,266 ----
+ # Method to copy all .pm files from all packages in a website to a
+ # separate directory -- if it currently exists we clear it out first.
+
+ sub create_temp_lib {
+ my ( $class, $base_config ) = @_;
+ my $site_dir = $base_config->{website_dir};
+
+ my $lib_dir = "$site_dir/$TEMP_LIB_DIR";
+ unshift @INC, $lib_dir;
+
+ File::Path::rmtree( $lib_dir ) if ( -d $lib_dir );
+ mkdir( $lib_dir );
+
+ my $site_repos = $REPOS_CLASS->fetch( undef,
+ { directory => $base_config->{website_dir} } );
+ my $packages = $site_repos->fetch_all_packages();
+ my ( @all_files );
+ foreach my $package ( @{ $packages } ) {
+ DEBUG && _w( 2, "Trying to copy files for package $package->{name}" );
+ my $files_copied = $PKG_CLASS->copy_modules( $package, $lib_dir );
+ push @all_files, @{ $files_copied };
+ }
+ DEBUG && _w( 3, "Copied ", scalar @all_files, " module files to ($lib_dir)" );
+ return \@all_files;
+ }
+
sub read_package_list {
***************
*** 333,359 ****
DEBUG && _w( 1, "Trying to process package ($pkg_name)" );
! # Note that app dir should be set earlier in the @INC list then the
! # base dir, since the app can override base
!
! my @package_dir_list = $PKG_CLASS->add_to_inc( $pkg_info );
! DEBUG && _w( 1, "Included @package_dir_list for $pkg_name" );
!
! # If we cannot find even one package directory, bail
!
! unless ( scalar @package_dir_list ) {
! _w( 0, "No package directories found for $pkg_name: was it installed correctly?" );
! return undef;
! }
!
! # Now we want the app dir to be *last*, so reverse the order
!
! @package_dir_list = reverse @package_dir_list;
# Plow through the directories and find the module listings (to
# include), action config (to parse and set) and the SPOPS config (to
! # parse and set)
my ( %spops, %action );
! foreach my $package_dir ( @package_dir_list ) {
my $conf_pkg_dir = "$package_dir/conf";
--- 366,379 ----
DEBUG && _w( 1, "Trying to process package ($pkg_name)" );
! my $site_pkg_dir = join( '/', $pkg_info->{website_dir}, $pkg_info->{package_dir} );
! my $base_pkg_dir = join( '/', $pkg_info->{base_dir}, $pkg_info->{package_dir} );
! DEBUG && _w( 1, "Pkg dirs: ($base_pkg_dir, $site_pkg_dir) for $pkg_name" );
# Plow through the directories and find the module listings (to
# include), action config (to parse and set) and the SPOPS config (to
! # parse and set). Base package first so its info can be overridden.
my ( %spops, %action );
! foreach my $package_dir ( $base_pkg_dir, $site_pkg_dir ) {
my $conf_pkg_dir = "$package_dir/conf";
***************
*** 585,589 ****
=head1 NAME
! OpenInteract::Startup -- Bootstrapper that reads in modules, manipulates @INC, etc.
=head1 SYNOPSIS
--- 605,609 ----
=head1 NAME
! OpenInteract::Startup -- Bootstrapper that reads in modules and initializes the environment
=head1 SYNOPSIS
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:54:24
|
Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv32693
Modified Files:
Package.pm
Log Message:
added copy_modules() (and its helper, _copy_module_files()) which
copies all modules in a package (both the website and base) to a
specified directory.
Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Package.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Package.pm 2001/11/26 13:13:21 1.26
--- Package.pm 2001/11/28 05:54:21 1.27
***************
*** 798,802 ****
--- 798,847 ----
}
+ # Copy all modules from a particular package (site directory AND base
+ # directory) to another directory
+ sub copy_modules {
+ my ( $class, $info, $to_dir ) = @_;
+
+ my $site_pkg_dir = join( '/', $info->{website_dir}, $info->{package_dir} );
+ my $site_modules = $class->_copy_module_files( $site_pkg_dir, $to_dir );
+
+ my $base_pkg_dir = join( '/', $info->{base_dir}, $info->{package_dir} );
+ my $base_modules = $class->_copy_module_files( $base_pkg_dir, $to_dir );
+
+ return [ sort @{ $base_modules }, @{ $site_modules } ];
+ }
+
+
+ sub _copy_module_files {
+ my ( $class, $pkg_dir, $to_dir ) = @_;
+ unless ( -d $pkg_dir ) {
+ die "Package directory ($pkg_dir) does not exist -- cannot copy files.\n";
+ }
+ unless ( -d $to_dir ) {
+ die "Destination for package modules ($to_dir) does not exist -- cannot copy files.\n";
+ }
+ my $current_dir = cwd;
+ chdir( $pkg_dir );
+ $to_dir =~ s|/$||;
+ my $pkg_files = ExtUtils::Manifest::maniread;
+ my @module_files = grep /\.pm$/, keys %{ $pkg_files };
+ my ( %dir_ok );
+ foreach my $filename ( @module_files ) {
+ my $full_dest_file = join( '/', $to_dir, $filename );
+ #warn "Trying to copy file ($filename) to ($full_dest_file)\n";
+ next if ( -f $full_dest_file );
+ my $full_dest_dir = File::Basename::dirname( $full_dest_file );
+ unless ( $dir_ok{ $full_dest_dir } ) {
+ File::Path::mkpath( $full_dest_dir );
+ $dir_ok{ $full_dest_dir }++;
+ }
+ cp( $filename, $full_dest_file );
+ }
+ chdir( $current_dir );
+ return \@module_files;
+ }
+
+
sub read_data_file {
my ( $class, $filename ) = @_;
***************
*** 940,943 ****
--- 985,990 ----
# Put the base and website package directories into @INC
+ #
+ # NOTE: THIS WILL PROBABLY BE REMOVED
sub add_to_inc {
***************
*** 950,954 ****
unshift @my_inc, $app_package_dir if ( -d $app_package_dir );
}
! unshift @INC, @my_inc;
return @my_inc;
}
--- 997,1001 ----
unshift @my_inc, $app_package_dir if ( -d $app_package_dir );
}
! #unshift @INC, @my_inc;
return @my_inc;
}
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:51:36
|
Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv32157
Modified Files:
ApacheStartup.pm
Log Message:
add the call to copy over all a website's relevant modules on server
startup -- this also modifies @INC, but that's cool because we're
still under PerlRequire (technically)
Index: ApacheStartup.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/ApacheStartup.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ApacheStartup.pm 2001/11/15 05:12:33 1.20
--- ApacheStartup.pm 2001/11/28 05:51:32 1.21
***************
*** 85,88 ****
--- 85,92 ----
}
+ # Now copy all of each package's modules into a separate
+ # directory.
+
+ OpenInteract::Startup->create_temp_lib( $BASE_CONFIG );
my $OS = $^O;
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:44:12
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_user/template
In directory usw-pr-cvs1:/tmp/cvs-serv30559/template
Modified Files:
user_list.tmpl
Log Message:
minor (!) template change
Index: user_list.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/user_list.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** user_list.tmpl 2001/10/31 13:58:01 1.5
--- user_list.tmpl 2001/11/28 05:44:09 1.6
***************
*** 28,35 ****
[% INCLUDE table_bordered_begin -%]
! [% INCLUDE header_row( label = [ 'Username', 'Full Name', 'Title',
! 'E-Mail', 'Actions' ] ) -%]
! [%- count = 0 -%]
[% WHILE ( user = iterator.get_next ) -%]
[% user_row() -%]
--- 28,35 ----
[% INCLUDE table_bordered_begin -%]
! [% INCLUDE header_row( labels = [ 'Username', 'Full Name', 'Title',
! 'E-Mail', 'Actions' ] ) -%]
! [%- count = 1 -%]
[% WHILE ( user = iterator.get_next ) -%]
[% user_row() -%]
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:44:12
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_user In directory usw-pr-cvs1:/tmp/cvs-serv30559 Modified Files: Changes package.conf Log Message: minor (!) template change Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/Changes,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Changes 2001/11/20 03:30:54 1.28 --- Changes 2001/11/28 05:44:09 1.29 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_user. + 1.44 Wed Nov 28 01:03:30 EST 2001 + + Minor template fix. + 1.43 Mon Nov 19 22:49:14 EST 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/package.conf,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** package.conf 2001/11/20 03:30:54 1.28 --- package.conf 2001/11/28 05:44:09 1.29 *************** *** 1,4 **** name base_user ! version 1.43 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name base_user ! version 1.44 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2001-11-28 05:37:41
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error In directory usw-pr-cvs1:/tmp/cvs-serv29512 Modified Files: Changes package.conf Log Message: meta Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/Changes,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Changes 2001/11/28 05:22:37 1.22 --- Changes 2001/11/28 05:37:38 1.23 *************** *** 1,4 **** --- 1,10 ---- Revision history for OpenInteract package base_error. + 1.37 Wed Nov 28 00:55:30 EST 2001 + + 1.36 Wed Nov 28 00:47:02 EST 2001 + + Template and one or two other small fixes. + 1.35 Wed Nov 28 00:41:23 EST 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/package.conf,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** package.conf 2001/11/28 05:22:37 1.22 --- package.conf 2001/11/28 05:37:38 1.23 *************** *** 1,4 **** name base_error ! version 1.35 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name base_error ! version 1.37 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2001-11-28 05:37:32
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv29448/OpenInteract/Handler
Modified Files:
Error.pm
Log Message:
pass the right info back to the filter; ensure we read dates right
Index: Error.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/OpenInteract/Handler/Error.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Error.pm 2001/11/28 05:21:56 1.12
--- Error.pm 2001/11/28 05:37:29 1.13
***************
*** 48,56 ****
my $apr = $R->apache;
! if ( my $from_date = $class->_read_field_date( 'filter_date_from' ) ) {
push @{ $where }, 'error_time >= ?';
push @{ $value }, $from_date;
}
! if ( my $to_date = $class->_read_field_date( 'filter_date_to' ) ) {
push @{ $where }, 'error_time <= ?';
push @{ $value }, $to_date;
--- 48,56 ----
my $apr = $R->apache;
! if ( my $from_date = $class->_read_field_date( $apr, 'filter_date_from' ) ) {
push @{ $where }, 'error_time >= ?';
push @{ $value }, $from_date;
}
! if ( my $to_date = $class->_read_field_date( $apr, 'filter_date_to' ) ) {
push @{ $where }, 'error_time <= ?';
push @{ $value }, $to_date;
***************
*** 64,72 ****
my $apr = OpenInteract::Request->instance->apache;
my %filter = (
! sort => $apr->param( 'sort' ),
! code => $apr->param( 'code' ),
! type => $apr->param( 'type' ),
! date_from => $class->_read_field_date_object( 'filter_date_from' ),
! date_to => $class->_read_field_date_object( 'filter_date_to' ),
);
$params->{filterby} = \%filter;
--- 64,72 ----
my $apr = OpenInteract::Request->instance->apache;
my %filter = (
! sort => $apr->param( 'filter_sort' ),
! code => $apr->param( 'filter_code' ),
! type => $apr->param( 'filter_type' ),
! date_from => $class->_read_field_date_object( $apr, 'filter_date_from' ),
! date_to => $class->_read_field_date_object( $apr, 'filter_date_to' ),
);
$params->{filterby} = \%filter;
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:37:03
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error/template
In directory usw-pr-cvs1:/tmp/cvs-serv29370/template
Modified Files:
error_filter.tmpl
Log Message:
small changes
Index: error_filter.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/template/error_filter.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** error_filter.tmpl 2001/10/24 16:35:17 1.3
--- error_filter.tmpl 2001/11/28 05:37:00 1.4
***************
*** 1,4 ****
<form name="error_filter" method="GET"
! action="/Error/listing/">
[% INCLUDE table_bordered_begin -%]
--- 1,6 ----
+ [% table_width = '50%'; %]
+
<form name="error_filter" method="GET"
! action="/Error/search/">
[% INCLUDE table_bordered_begin -%]
***************
*** 24,31 ****
<td><font size="-1">
<tt>From: </tt>
! [% INCLUDE date_select( object = filterby.date_from, blank = 1,
field_prefix = 'filter_date_from' ) %]<br>
<tt>To: </tt>
! [% INCLUDE date_select( object = filterby.date_to, blank = 1,
field_prefix = 'filter_date_to' ) %]
</font></td>
--- 26,33 ----
<td><font size="-1">
<tt>From: </tt>
! [% INCLUDE date_select( object = filterby.date_from, is_blank = 1,
field_prefix = 'filter_date_from' ) %]<br>
<tt>To: </tt>
! [% INCLUDE date_select( object = filterby.date_to, is_blank = 1,
field_prefix = 'filter_date_to' ) %]
</font></td>
|
|
From: Chris W. <la...@us...> - 2001-11-28 05:22:39
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error In directory usw-pr-cvs1:/tmp/cvs-serv26954 Modified Files: Changes package.conf Log Message: meta Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/Changes,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Changes 2001/10/24 16:36:32 1.21 --- Changes 2001/11/28 05:22:37 1.22 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_error. + 1.35 Wed Nov 28 00:41:23 EST 2001 + + Fixed the default action for the error handler to be 'search_form'. + 1.34 Tue Oct 23 23:20:40 EDT 2001 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/package.conf,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** package.conf 2001/10/24 16:36:32 1.21 --- package.conf 2001/11/28 05:22:37 1.22 *************** *** 1,4 **** name base_error ! version 1.34 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name base_error ! version 1.35 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2001-11-28 05:22:00
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error/OpenInteract/Handler In directory usw-pr-cvs1:/tmp/cvs-serv26808/OpenInteract/Handler Modified Files: Error.pm Log Message: fixed default action Index: Error.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/OpenInteract/Handler/Error.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Error.pm 2001/10/24 16:35:49 1.11 --- Error.pm 2001/11/28 05:21:56 1.12 *************** *** 13,17 **** $OpenInteract::Handler::Error::author = 'ch...@cw...'; ! $OpenInteract::Handler::Error::default_method = 'listing'; @OpenInteract::Handler::Error::forbidden_methods = (); %OpenInteract::Handler::Error::security = ( --- 13,17 ---- $OpenInteract::Handler::Error::author = 'ch...@cw...'; ! $OpenInteract::Handler::Error::default_method = 'search_form'; @OpenInteract::Handler::Error::forbidden_methods = (); %OpenInteract::Handler::Error::security = ( |
|
From: Chris W. <la...@us...> - 2001-11-27 13:25:25
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/doc In directory usw-pr-cvs1:/tmp/cvs-serv3582 Modified Files: base_page.pod Log Message: added migration notes Index: base_page.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/doc/base_page.pod,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** base_page.pod 2001/11/27 12:08:47 1.5 --- base_page.pod 2001/11/27 13:25:22 1.6 *************** *** 155,158 **** --- 155,172 ---- directory and let OpenInteract deal with the rest. Cool. + =head1 MIGRATION + + A migration script is provided for you to move your pages from the + 'static_page' package to the 'base_page' package. It is + 'script/static_page2base_page.pl' and should find all of your existing + records and port them over to the new structure. + + Another script, 'script/scan_for_new.pl', may also be useful in + migration. You can run it periodically to scan for documents that do + not not currently have a metdata record in the database. It will add + the metadata record for you. This can be useful to run if you have a + directory with files that get updated nightly, or even if you're too + lazy to update it yourself. + =head1 BUGS |
|
From: Chris W. <la...@us...> - 2001-11-27 13:21:21
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/template
In directory usw-pr-cvs1:/tmp/cvs-serv2767/template
Modified Files:
page_form.tmpl
Log Message:
cosmetic modifications
Index: page_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/template/page_form.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** page_form.tmpl 2001/11/27 12:09:22 1.8
--- page_form.tmpl 2001/11/27 13:21:18 1.9
***************
*** 106,122 ****
[%- source_value = [ 'file', 'database', 'http', 'alias' ];
source_label = [ 'Filesystem', 'Database', 'URL', 'Local Alias' ]; -%]
! [% INCLUDE label_form_select_row( label = 'Source',
! name = 'storage', plain = 1,
first_label = 'Sources...',
! value_list = source_value,
! label_list = source_label,
! picked = page.storage ) -%]
[%- count = count + 1 -%]
! [%- cl_label = '<br>Use if you selected "URL" or "Local Alias"' -%]
! [% INCLUDE label_form_text_row( label = 'Content Location',
post_label = cl_label,
! name = 'content_location',
! value = page.content_location ) -%]
[%- count = count + 1 -%]
--- 106,123 ----
[%- source_value = [ 'file', 'database', 'http', 'alias' ];
source_label = [ 'Filesystem', 'Database', 'URL', 'Local Alias' ]; -%]
! [% INCLUDE label_form_select_row( label = 'Source',
! name = 'storage', plain = 1,
first_label = 'Sources...',
! value_list = source_value,
! label_list = source_label,
! picked = page.storage ) -%]
[%- count = count + 1 -%]
! [%- cl_label = '<br><font size="-1">Use if you selected "URL" or "Local Alias"</font>' -%]
! [% INCLUDE label_form_text_row( label = 'Content Location',
post_label = cl_label,
! size = 40,
! name = 'content_location',
! value = page.content_location ) -%]
[%- count = count + 1 -%]
|
|
From: Chris W. <la...@us...> - 2001-11-27 13:21:06
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/script
In directory usw-pr-cvs1:/tmp/cvs-serv2703/script
Modified Files:
static_page2base_page.pl
Log Message:
add docs, try to find mime_type of content
Index: static_page2base_page.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/script/static_page2base_page.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** static_page2base_page.pl 2001/11/27 12:09:03 1.2
--- static_page2base_page.pl 2001/11/27 13:21:03 1.3
***************
*** 10,25 ****
use OpenInteract::Startup;
- # Do you want to add '.html' to any pages that don't have it? This can
- # be useful if you need to use the files for something else, or ensure
- # that they can be used
-
- my $ADD_HTML = 'yes';
-
- # Do you want your pages saved in the filesystem? This is encouraged.
-
- my $AS_FILE = 'yes';
-
{
! my $R = OpenInteract::Startup->setup_static_environment_options();
# First retrieve all the static page objects
--- 10,21 ----
use OpenInteract::Startup;
{
! my ( $OPT_add_html, $OPT_as_file, $OPT_as_database );
! my %opts = ( 'add_html' => \$OPT_add_html,
! 'as_file' => \$OPT_as_file,
! 'as_database' => \$OPT_as_database );
! my $R = OpenInteract::Startup->setup_static_environment_options( '', \%opts );
!
! $OPT_as_file++ unless ( $OPT_as_file or $OPT_as_database );
# First retrieve all the static page objects
***************
*** 35,39 ****
my $location => $static_page->{location};
! if ( $ADD_HTML eq 'yes' and $location !~ /\.html$/ ) {
$location .= '.html';
}
--- 31,35 ----
my $location => $static_page->{location};
! if ( $OPT_add_html and $location !~ /\.\w+$/ ) {
$location .= '.html';
}
***************
*** 51,65 ****
is_active => $static_page->{is_active},
notes => $static_page->{notes},
- mime_type => 'text/html',
location => $location });
# Set file status
! if ( $AS_FILE eq 'yes' ) {
! $page->{storage} = 'file';
! }
! else {
! $page->{storage} = 'database';
! }
# Set the content
--- 47,56 ----
is_active => $static_page->{is_active},
notes => $static_page->{notes},
location => $location });
# Set file status
! $page->{storage} = 'database' if ( $OPT_as_database );
! $page->{storage} = 'file' if ( $OPT_as_file );
# Set the content
***************
*** 75,78 ****
--- 66,73 ----
}
+ $page->{mime_type} = OpenInteract::Page->mime_type_content( $page->{content} ) ||
+ 'text/html';
+ $page->{size} = length $page->{content};
+
# Save the page object (automatically saves the content) and
# display a status
***************
*** 89,90 ****
--- 84,145 ----
}
}
+
+ __END__
+
+ =pod
+
+ =head1 NAME
+
+ static_page2base_page.pl - Migrate pages from the 'static_page' to the 'base_page' package
+
+ =head1 SYNOPSIS
+
+ $ export OIWEBSITE=/home/httpd/mysite
+ $ perl static_page2base_page.pl --add_html --as_file
+
+ =head1 DESCRIPTION
+
+ As of OpenInteract 1.35, all functionality for serving 'static' pages
+ and files is now in the 'base_page' package. (Previously it was in the
+ 'static_page' package.)
+
+ The new package has been entirely rewritten and uses a different table
+ structure, so you will need to migrate the pages from the structure of
+ the earlier package to this one. This script should do the job.
+
+ =head1 OPTIONS
+
+ B<--add_html>
+
+ If pass we will add C<.html> to any file that does not have an
+ extension.
+
+ B<--as_file>
+
+ B<--as_database>
+
+ These two options are mutually exclusive. They determine where the
+ page content will be stored. If not specified, we use B<--as_file>.
+
+ =head1 BUGS
+
+ None known.
+
+ =head1 TO DO
+
+ Nothing known.
+
+ =head1 SEE ALSO
+
+ =head1 COPYRIGHT
+
+ Copyright (c) 2001 intes.net, inc.. All rights reserved.
+
+ This library is free software; you can redistribute it and/or modify
+ it under the same terms as Perl itself.
+
+ =head1 AUTHORS
+
+ Chris Winters <ch...@cw...>
+
+ =cut
|
4 messages has been excluded from this view by a project administrator.
