openinteract-commits — CVS updates for OpenInteract/SPOPS

[Openinteract-commits] CVS: OpenInteract/pkg/system_doc/OpenInteract/SQLInstall SystemDoc.pm,1.1.1.1,1.2

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc/OpenInteract/SQLInstall
In directory usw-pr-cvs1:/tmp/cvs-serv19448/OpenInteract/SQLInstall

Modified Files:
	SystemDoc.pm 
Log Message:
read in the data in data/page.dat


Index: SystemDoc.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/OpenInteract/SQLInstall/SystemDoc.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SystemDoc.pm	2001/02/02 06:20:42	1.1.1.1
--- SystemDoc.pm	2001/10/29 03:37:58	1.2
***************
*** 11,18 ****
--- 11,21 ----
  
  my %files = (
+   data     => [ 'page.dat' ],
    security => [ 'install_security.dat' ],
  );
  
  %HANDLERS = (
+   install_data     => { '_default_' => [ 'install_data',
+                                          { data_file_list => $files{data} } ] },
    install_security => { '_default_' => [ 'install_data',
                                           { data_file_list => $files{security} } ] },
***************
*** 20,52 ****
  
  1;
- 
- __END__
- 
- =pod
- 
- =head1 NAME
- 
- OpenInteract::SQLInstall::SystemDoc - SQL installer for the system_doc package
- 
- =head1 SYNOPSIS
- 
- =head1 DESCRIPTION
- 
- =head1 BUGS 
- 
- =head1 TO DO
- 
- =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
--- 23,24 ----

[Openinteract-commits] CVS: OpenInteract/pkg/system_doc/data install_security.dat,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc/data
In directory usw-pr-cvs1:/tmp/cvs-serv19394/data

Modified Files:
	install_security.dat 
Log Message:
modified to create security for ::Page docs rather than ::BasicPage


Index: install_security.dat
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/data/install_security.dat,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install_security.dat	2001/08/12 15:25:40	1.5
--- install_security.dat	2001/10/29 03:37:42	1.6
***************
*** 6,10 ****
                [ 'OpenInteract::Handler::SystemDoc', 0,          'w', 'world', 1 ],
                [ 'OpenInteract::Handler::SystemDoc', 0,          'g', 'site_admin_group', 8 ],
!               [ 'OpenInteract::BasicPage',          '/oi_docs', 'w', 'world', 1 ],
!               [ 'OpenInteract::BasicPage',          '/oi_docs', 'g', 'site_admin_group', 8 ],
  ];
--- 6,10 ----
                [ 'OpenInteract::Handler::SystemDoc', 0,          'w', 'world', 1 ],
                [ 'OpenInteract::Handler::SystemDoc', 0,          'g', 'site_admin_group', 8 ],
!               [ 'OpenInteract::Page',               '/oi_docs', 'w', 'world', 1 ],
!               [ 'OpenInteract::Page',               '/oi_docs', 'g', 'site_admin_group', 8 ],
  ];

[Openinteract-commits] CVS: OpenInteract/pkg/system_doc/data page.dat,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc/data
In directory usw-pr-cvs1:/tmp/cvs-serv19369/data

Added Files:
	page.dat 
Log Message:
added page records for the OI docs


--- NEW FILE: page.dat ---
$page = [ 
         { 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' ],
];

[Openinteract-commits] CVS: OpenInteract/OpenInteract/SPOPS DBI.pm,1.9,1.10

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv16225

Modified Files:
	DBI.pm 
Log Message:
fix leftover DEBUG/_w statements (doh!)


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/DBI.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DBI.pm	2001/10/28 02:40:09	1.9
--- DBI.pm	2001/10/29 03:14:09	1.10
***************
*** 36,40 ****
  sub behavior_factory {
      my ( $class ) = @_;
-     DEBUG() && _w( 1, "Installing field discovery for ($class)" );
      return { manipulate_configuration => \&discover_fields };
  }
--- 36,39 ----
***************
*** 43,47 ****
      my ( $class ) = @_;
      my $CONFIG = $class->CONFIG;
!     return ( OK, undef ) unless ( $CONFIG->{field_discover} eq 'yes' );
      my $dbh = $class->global_datasource_handle( $CONFIG->{datasource} );
      unless ( $dbh ) {
--- 42,49 ----
      my ( $class ) = @_;
      my $CONFIG = $class->CONFIG;
!     unless ( $CONFIG->{field_discover} and $CONFIG->{field_discover} eq 'yes' ) {
!         return ( OK, undef );
!     }
! 
      my $dbh = $class->global_datasource_handle( $CONFIG->{datasource} );
      unless ( $dbh ) {
***************
*** 57,62 ****
      return ( NOTIFY, "Cannot discover fields: $@" ) if ( $@ );
      $CONFIG->{field} = $sth->{NAME};
-     DEBUG() && _w( 1, "Table: ($CONFIG->{base_table}); ",
- 			          "Fields: (", join( ', ', @{ $CONFIG->{field} } ), ")" );
      return ( OK, undef );
  }
--- 59,62 ----

[Openinteract-commits] CVS: OpenInteract/OpenInteract/Error System.pm,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/Error
In directory usw-pr-cvs1:/tmp/cvs-serv10071/OpenInteract/Error

Modified Files:
	System.pm 
Log Message:
use $R->DEBUG instead of the local DEBUG


Index: System.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Error/System.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** System.pm	2001/10/24 03:01:58	1.4
--- System.pm	2001/10/28 02:41:34	1.5
***************
*** 13,18 ****
  my $ERROR_HOLD = $OpenInteract::Error::Main::ERROR_HOLD;
  
- use constant DEBUG      => 0;
- 
  # Increment at which we should break down
  # codes if not found (change to 100 for more macro)
--- 13,16 ----
***************
*** 89,93 ****
  sub cannot_parse_config {
      my ( $err ) = @_;
!     cluck ">> Error: Cannot open/parse config file. $err->{tmp_filename} / $err->{system_msg}" if ( DEBUG );
      $err->{notes} = "Filename tried to open: $err->{tmp_filename}";
      OpenInteract::Error::Main->save_error( $err );
--- 87,93 ----
  sub cannot_parse_config {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: Cannot open/parse config file.",
!                        "$err->{tmp_filename} / $err->{system_msg}";
      $err->{notes} = "Filename tried to open: $err->{tmp_filename}";
      OpenInteract::Error::Main->save_error( $err );
***************
*** 104,109 ****
  sub cannot_connect_db {
      my ( $err ) = @_;
-     cluck ">> Error: Cannot connect to db. Info:\n", Dumper( $err->{tmp_db_info} ) if ( DEBUG );
      my $R = OpenInteract::Request->instance;
      my $C = $R->CONFIG;
      $err->{error_id} = $err->generate_random_code( 16 );
--- 104,110 ----
  sub cannot_connect_db {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG &&  cluck ">> Error: Cannot connect to db. Info:\n",
+                         Dumper( $err->{tmp_db_info} ) ;
      my $C = $R->CONFIG;
      $err->{error_id} = $err->generate_random_code( 16 );
***************
*** 151,155 ****
  sub cannot_open_template {
      my ( $err ) = @_;
!     cluck ">> Error: cannot open template. $err->{tmp_filename} / $err->{system_msg}" if ( DEBUG );
      $err->{user_msg} = 'Could not open template file';
      $err->{notes} = "Filename tried to open: $err->{tmp_filename}";
--- 152,158 ----
  sub cannot_open_template {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: cannot open template.",
!                        "$err->{tmp_filename} / $err->{system_msg}";
      $err->{user_msg} = 'Could not open template file';
      $err->{notes} = "Filename tried to open: $err->{tmp_filename}";
***************
*** 161,165 ****
  sub cannot_parse_template {
      my ( $err ) = @_;
!     cluck ">> Error: cannot parse template. $err->{tmp_filename} / $err->{system_msg}" if ( DEBUG );
      $err->{user_msg} = 'Could not process template';
      $err->{notes} = "Filename tried to open: $err->{tmp_filename} (if blank, we used text passed in)";
--- 164,170 ----
  sub cannot_parse_template {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: cannot parse template.",
!                        "$err->{tmp_filename} / $err->{system_msg}";
      $err->{user_msg} = 'Could not process template';
      $err->{notes} = "Filename tried to open: $err->{tmp_filename} (if blank, we used text passed in)";
***************
*** 194,198 ****
  sub cannot_open_template_db {
      my ( $err ) = @_;
!     cluck ">> Error: cannot open template. $err->{tmp_name} / $err->{system_msg}" if ( DEBUG );
      $err->{user_msg} = 'Could not open template from database';
      $err->{notes} = "Tag tried to open with: $err->{tmp_name}";
--- 199,205 ----
  sub cannot_open_template_db {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: cannot open template.",
!                        "$err->{tmp_name} / $err->{system_msg}";
      $err->{user_msg} = 'Could not open template from database';
      $err->{notes} = "Tag tried to open with: $err->{tmp_name}";
***************
*** 204,208 ****
  sub cannot_find_login_fields {
      my ( $err ) = @_;
!     cluck ">> Error: cannot find login/password fields!" if ( DEBUG );
      $err->{user_msg}   = 'No login/password fields specified!';
      $err->{system_msg} = "Please create entries in your 'conf/server.perl' file under " .
--- 211,216 ----
  sub cannot_find_login_fields {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: cannot find login/password fields!";
      $err->{user_msg}   = 'No login/password fields specified!';
      $err->{system_msg} = "Please create entries in your 'conf/server.perl' file under " .
***************
*** 217,228 ****
  #300
  
  sub file_not_found {
      my ( $err ) = @_;
!     cluck ">> Error: cannot find or open requested file: $err->{system_msg}"           if ( DEBUG );
      $err->{user_msg} = 'Requested file not found or cannot be opened';
      OpenInteract::Error::Main->save_error( $err );
!     my $R = OpenInteract::Request->instance;
!     $R->{page}{title} = 'Sorry: File not found';
!     my $html = $R->template->handler( {}, { err => $err }, { name => 'error_not_found' } );
      die "$html\n";
  }
--- 225,239 ----
  #300
  
+ # Syntax: $R->throw({ code => 314, system_msg => '/location/notfound' });
+ 
  sub file_not_found {
      my ( $err ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $R->DEBUG && cluck ">> Error: cannot find or open requested location *$err->{system_msg})";
      $err->{user_msg} = 'Requested file not found or cannot be opened';
      OpenInteract::Error::Main->save_error( $err );
!     $R->{page}{title} = 'Sorry: Action not found';
!     my $html = $R->template->handler( {}, { err => $err },
!                                       { name => 'error_not_found' } );
      die "$html\n";
  }
***************
*** 238,243 ****
  sub task_is_forbidden {
      my ( $err ) = @_;
-     cluck ">> Error: Cannot do task due to security: $err->{system_msg}"       if ( DEBUG );
      my $R = OpenInteract::Request->instance;
      my $html = $R->template->handler( {},
                                        { err => $err,
--- 249,254 ----
  sub task_is_forbidden {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG && cluck ">> Error: Cannot perform task due to security ($err->{system_msg})";
      my $html = $R->template->handler( {},
                                        { err => $err,
***************
*** 251,257 ****
  sub task_no_default {
      my ( $err ) = @_;
-     $err->{user_msg} = 'No default method defined';
-     cluck ">> Error: Cannot do task due to no default: $err->{system_msg}"     if ( DEBUG );
      my $R = OpenInteract::Request->instance;
  
      # First send an email
--- 262,268 ----
  sub task_no_default {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $err->{user_msg} = 'No default method defined';
+     $R->DEBUG && cluck ">> Error: Cannot do task due to no default: $err->{system_msg}";
  
      # First send an email
***************
*** 278,283 ****
  sub task_not_allowed_security {
      my ( $err ) = @_;
-     cluck ">> Error: Cannot accomplish task due to security."                  if ( DEBUG );
      my $R = OpenInteract::Request->instance;
      my $html = $R->template->handler( {},
                                        { err => $err,
--- 289,294 ----
  sub task_not_allowed_security {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG && cluck ">> Error: Cannot accomplish task due to security.";
      my $html = $R->template->handler( {},
                                        { err => $err,
***************
*** 291,296 ****
  sub cannot_retrieve_object_of_id {
      my ( $err ) = @_;
-     cluck ">> Error: Cannot retrieve object given a particular ID."            if ( DEBUG );
      my $R = OpenInteract::Request->instance;
  
      # First send an email
--- 302,307 ----
  sub cannot_retrieve_object_of_id {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG && cluck ">> Error: Cannot retrieve object given a particular ID.";
  
      # First send an email
***************
*** 334,339 ****
  sub bad_username {
      my ( $err ) = @_;
-     cluck ">> Error: User $err->{tmp_login_name} not found in system"          if ( DEBUG );
      my $R = OpenInteract::Request->instance;
      $R->{ $ERROR_HOLD }{loginbox}{bad_login} = "User $err->{tmp_login_name} not found!";
      return undef;
--- 345,350 ----
  sub bad_username {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG && cluck ">> Error: User $err->{tmp_login_name} not found in system";
      $R->{ $ERROR_HOLD }{loginbox}{bad_login} = "User $err->{tmp_login_name} not found!";
      return undef;
***************
*** 342,347 ****
  sub bad_password {
      my ( $err ) = @_;
-     cluck ">> Error: User $err->{tmp_login_name} login with wrong password"    if ( DEBUG );
      my $R = OpenInteract::Request->instance;
      $R->{ $ERROR_HOLD }{loginbox}{bad_login}  = "Bad password for $err->{tmp_login_name}; try again.";
      $R->{ $ERROR_HOLD }{loginbox}{login_name} = $err->{tmp_login_name};
--- 353,358 ----
  sub bad_password {
      my ( $err ) = @_;
      my $R = OpenInteract::Request->instance;
+     $R->DEBUG && cluck ">> Error: User $err->{tmp_login_name} login with wrong password";
      $R->{ $ERROR_HOLD }{loginbox}{bad_login}  = "Bad password for $err->{tmp_login_name}; try again.";
      $R->{ $ERROR_HOLD }{loginbox}{login_name} = $err->{tmp_login_name};
***************
*** 375,380 ****
  sub log_and_return {
      my ( $err, $opt ) = @_;
-     cluck ">> Error with code $err->{code} thrown. Info: $err->{system_msg}" unless ( $opt eq 'nowarn' );
      my $R = OpenInteract::Request->instance;
      $R->DEBUG && $R->scrib( 2, "Trying to save errror ", Dumper( $err ) );
      OpenInteract::Error::Main->save_error( $err );
--- 386,391 ----
  sub log_and_return {
      my ( $err, $opt ) = @_;
      my $R = OpenInteract::Request->instance;
+     cluck ">> Error with code $err->{code} thrown. Info: $err->{system_msg}" unless ( $opt eq 'nowarn' );
      $R->DEBUG && $R->scrib( 2, "Trying to save errror ", Dumper( $err ) );
      OpenInteract::Error::Main->save_error( $err );

[Openinteract-commits] CVS: OpenInteract/OpenInteract Utility.pm,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv9956/OpenInteract

Modified Files:
	Utility.pm 
Log Message:
use the new content_type object


Index: Utility.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Utility.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Utility.pm	2001/10/17 04:47:07	1.3
--- Utility.pm	2001/10/28 02:41:00	1.4
***************
*** 13,48 ****
  use constant DEFAULT_ATTACH_MESSAGE => 'Emailing attachments';
  
! 
! my %ATTACH_TYPES = (
!   csv  => [ 'text/csv', '8bit' ],
!   gif  => [ 'image/gif', 'base64' ],
!   tiff => [ 'image/tiff', 'base64' ],
!   tif  => [ 'image/tiff', 'base64' ],
!   jpeg => [ 'image/jpeg', 'base64' ],
!   jpg  => [ 'image/jpeg', 'base64' ],
!   png  => [ 'image/png', 'base64' ],
!   css  => [ 'text/css', 'base64' ],
!   html => [ 'text/html', '8bit' ],
!   htm  => [ 'text/html', '8bit' ],
!   txt  => [ 'text/plain', '8bit' ],
!   xml  => [ 'text/xml', '8bit' ],
!   pdf  => [ 'application/pdf', 'base64' ],
!   doc  => [ 'application/msword', 'base64' ],
!   ps   => [ 'application/postscript', 'base64' ],
!   xls  => [ 'application/vnd.ms-excel', 'base64' ],
!   ppt  => [ 'application/vnd.ms-powerpoint', 'base64' ],
!   wpd  => [ 'application/wordperfect', 'base64' ],
!   js   => [ 'application/x-javascript', '8bit' ],
!   tar  => [ 'application/x-tar', 'base64' ],
!   zip  => [ 'application/zip', 'base64' ],
!   gz   => [ 'application/gzip', 'base64' ],
!   mp3  => [ 'audio/mpeg', 'base64' ],
!   wav  => [ 'audio/x-wav', 'base64' ],
!   avi  => [ 'video/x-msvideo', 'base64' ],			
!   mov  => [ 'video/quicktime', 'base64' ],
!   mpg  => [ 'video/mpeg', 'base64' ],
!   mpeg => [ 'video/mpeg', 'base64' ],
! );
  
  
  sub send_email {
--- 13,21 ----
  use constant DEFAULT_ATTACH_MESSAGE => 'Emailing attachments';
  
! # All other types except those listed here are 'base64' encoding
  
+ my %TEXT_ENCODINGS = map { $_ => '8bit' }
+                      qw( text/csv text/html text/html text/plain text/xml
+                          application/x-javascript application/x-perl );
  
  sub send_email {
***************
*** 80,83 ****
--- 53,58 ----
      return $class->send_email( $p )  unless ( scalar @{ $attachments } > 0 );
  
+     my $R = OpenInteract::Request->instance;
+ 
      my %header_info = $class->_build_header_info( $p );
      my $initial_text = $p->{message} || DEFAULT_ATTACH_MESSAGE;
***************
*** 89,95 ****
          next unless ( $cleaned_name );
          my ( $ext ) = $cleaned_name =~ /\.(\w+)$/;
!         my $type = $ATTACH_TYPES{ lc $ext } || [ 'text/plain', '8bit' ];
!         $msg->attach( Type     => $type->[0],
!                       Encoding => $type->[1],
                        Path     => $cleaned_name );
      }
--- 64,71 ----
          next unless ( $cleaned_name );
          my ( $ext ) = $cleaned_name =~ /\.(\w+)$/;
!         my $mime_type = $R->content_type->mime_type_by_extension( lc $ext );
!         my $encoding = $TEXT_ENCODINGS{ $mime_type } || 'base64';
!         $msg->attach( Type     => $mime_type,
!                       Encoding => $encoding,
                        Path     => $cleaned_name );
      }

[Openinteract-commits] CVS: OpenInteract/OpenInteract/SPOPS DBI.pm,1.8,1.9

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv9816/OpenInteract/SPOPS

Modified Files:
	DBI.pm 
Log Message:
add (optional) field discovery to OI SPOPS DBI objects


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/DBI.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DBI.pm	2001/10/25 15:25:14	1.8
--- DBI.pm	2001/10/28 02:40:09	1.9
***************
*** 5,8 ****
--- 5,9 ----
  use strict;
  use OpenInteract::SPOPS;
+ use SPOPS::ClassFactory qw( OK NOTIFY );
  
  @OpenInteract::SPOPS::DBI::ISA     = qw( OpenInteract::SPOPS );
***************
*** 29,32 ****
--- 30,65 ----
  }
  
+ ########################################
+ # CLASS FACTORY BEHAVIOR
+ ########################################
+ 
+ sub behavior_factory {
+     my ( $class ) = @_;
+     DEBUG() && _w( 1, "Installing field discovery for ($class)" );
+     return { manipulate_configuration => \&discover_fields };
+ }
+ 
+ sub discover_fields {
+     my ( $class ) = @_;
+     my $CONFIG = $class->CONFIG;
+     return ( OK, undef ) unless ( $CONFIG->{field_discover} eq 'yes' );
+     my $dbh = $class->global_datasource_handle( $CONFIG->{datasource} );
+     unless ( $dbh ) {
+       return ( NOTIFY, "Cannot discover fields because no DBI database " .
+                        "handle available to class ($class)" );
+     }
+     my $sql = $class->sql_fetch_types( $CONFIG->{base_table} );
+     my ( $sth );
+     eval {
+         $sth = $dbh->prepare( $sql );
+         $sth->execute;
+     };
+     return ( NOTIFY, "Cannot discover fields: $@" ) if ( $@ );
+     $CONFIG->{field} = $sth->{NAME};
+     DEBUG() && _w( 1, "Table: ($CONFIG->{base_table}); ",
+ 			          "Fields: (", join( ', ', @{ $CONFIG->{field} } ), ")" );
+     return ( OK, undef );
+ }
+ 
  1;
  
***************
*** 42,45 ****
--- 75,81 ----
   'myobj' => {
      'isa'   => [ qw/ ... OpenInteract::SPOPS::DBI ... / ],
+ 
+     # Yes, I want OI to find my fields for me.
+     'field_discover' => 'yes',
   }
  
***************
*** 75,78 ****
--- 111,133 ----
  hashref.
  
+ =head2 SPOPS::ClassFactory Methods
+ 
+ You will never need to call the following methods from your object,
+ but you should be aware of them.
+ 
+ B<behavior_factory( $class )>
+ 
+ Creates the 'discover_fields' behavior (see below) in the
+ 'manipulate_configuration' slot of the
+ L<SPOPS::ClassFactory|SPOPS::ClassFactory> process.
+ 
+ B<discover_fields( $class )>
+ 
+ If 'field_discover' is set to 'yes' in your class configuration, this
+ will find the fields in your database table and set the configuration
+ value 'field' as appropriate. Pragmatically, this means you do not
+ have to list your fields in your class configuration -- every time the
+ server starts up the class interrogates the table for its properties.
+ 
  =head1 BUGS
  
***************
*** 86,89 ****
--- 141,148 ----
  
  L<SPOPS::DBI|SPOPS::DBI>
+ 
+ L<SPOPS::ClassFactory|SPOPS::ClassFactory>
+ 
+ L<SPOPS::Manual::CodeGeneration|SPOPS::Manual::CodeGeneration>
  
  =head1 COPYRIGHT

[Openinteract-commits] CVS: OpenInteract Changes,1.74,1.75

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv9648

Modified Files:
	Changes 
Log Message:
latest changes...


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/Changes,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** Changes	2001/10/25 16:12:53	1.74
--- Changes	2001/10/28 02:39:13	1.75
***************
*** 118,121 ****
--- 118,128 ----
     - rename 'ruleset_add' -> 'ruleset_factory'
  
+  * OpenInteract/SPOPS/DBI.pm:
+ 
+    - Added 'discover_fields' SPOPS::ClassFactory behavior, which
+    allows you to leave the 'field' key in your object configuration
+    blank and have it filled at run-time. To use it you must set the
+    'field_discover' key to 'yes' in your object configuration.
+ 
   * OpenInteract/Template/Plugin.pm:
  
***************
*** 130,133 ****
--- 137,146 ----
  
     - Properly catch when we weren't passed content.
+ 
+  * template/error_(not_found|task_forbidden|task_no_default):
+ 
+    - Moved these error messages from the base_error package to the
+    global template directory so they're easier to customize for your
+    site.
  
  

[Openinteract-commits] CVS: OpenInteract/pkg/lookup/template lookup_listing.tmpl,1.6,1.7 lookup_listing_columns.tmpl,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup/template
In directory usw-pr-cvs1:/tmp/cvs-serv7116/template

Modified Files:
	lookup_listing.tmpl lookup_listing_columns.tmpl 
Log Message:
small template modifications


Index: lookup_listing.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_listing.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lookup_listing.tmpl	2001/10/18 12:39:44	1.6
--- lookup_listing.tmpl	2001/10/27 04:54:11	1.7
***************
*** 9,15 ****
  [% MACRO lookup_entry_table BLOCK -%]
      <table border="0" cellpadding="4" cellspacing="0">
!   [% display_id = o.id || 'New Entry';
       this_id    = o.id || id -%]
!       <tr><td colspan="2">ID: [% display_id %]</td></tr>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
        <tr>
--- 9,15 ----
  [% MACRO lookup_entry_table BLOCK -%]
      <table border="0" cellpadding="4" cellspacing="0">
!   [% display_id = o.id || 'New';
       this_id    = o.id || id -%]
!       <tr><td colspan="2">[% display_id %]</td></tr>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
        <tr>

Index: lookup_listing_columns.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/template/lookup_listing_columns.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lookup_listing_columns.tmpl	2001/10/18 12:39:44	1.5
--- lookup_listing_columns.tmpl	2001/10/27 04:54:11	1.6
***************
*** 20,27 ****
  
  [% MACRO lookup_entry_row BLOCK -%]
!   [% display_id = o.id || 'New Entry';
       this_id    = o.id || id -%]
        <tr valign="middle" align="center" bgcolor="[% PROCESS row_color %]">
!         <td>ID: [% display_id %]</td>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
        [%- field = field_list.$idx; -%]
--- 20,27 ----
  
  [% MACRO lookup_entry_row BLOCK -%]
!   [% display_id = o.id || 'New';
       this_id    = o.id || id -%]
        <tr valign="middle" align="center" bgcolor="[% PROCESS row_color %]">
!         <td>[% display_id %]</td>
    [% FOREACH idx = [ 0 .. field_list.max ] -%]
        [%- field = field_list.$idx; -%]

[Openinteract-commits] CVS: OpenInteract/pkg/lookup Changes,1.6,1.7 package.conf,1.6,1.7

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/lookup
In directory usw-pr-cvs1:/tmp/cvs-serv7116

Modified Files:
	Changes package.conf 
Log Message:
small template modifications


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/Changes,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Changes	2001/10/18 12:39:44	1.6
--- Changes	2001/10/27 04:54:11	1.7
***************
*** 1,4 ****
--- 1,8 ----
  Revision history for OpenInteract package lookup.
  
+ 0.17  Fri Oct 26 18:44:07 EDT 2001
+ 
+       Small template changes
+ 
  0.16  Thu Oct 18 08:43:34 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/lookup/package.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** package.conf	2001/10/18 12:39:44	1.6
--- package.conf	2001/10/27 04:54:11	1.7
***************
*** 1,4 ****
  name           lookup
! version        0.16
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/
--- 1,4 ----
  name           lookup
! version        0.17
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/

[Openinteract-commits] CVS: OpenInteract/pkg/base_page Changes,1.5,1.6 MANIFEST,1.5,1.6 package.conf,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page
In directory usw-pr-cvs1:/tmp/cvs-serv7555

Modified Files:
	Changes MANIFEST package.conf 
Log Message:
meta 


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/Changes,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Changes	2001/10/25 15:21:32	1.5
--- Changes	2001/10/26 21:10:28	1.6
***************
*** 1,4 ****
--- 1,8 ----
  Revision history for OpenInteract package base_page.
  
+ 0.17  Fri Oct 26 17:26:38 EDT 2001
+ 
+       Added content_type object and lookup table definitions
+ 
  0.16  Thu Oct 25 11:35:39 EDT 2001
  

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/MANIFEST,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MANIFEST	2001/10/24 23:03:11	1.5
--- MANIFEST	2001/10/26 21:10:28	1.6
***************
*** 5,16 ****
  conf/action.perl
  conf/spops.perl
  data/install_security.dat
  doc/base_page.pod
  doc/titles
  OpenInteract/Page.pm
  OpenInteract/Page/Database.pm
  OpenInteract/Page/File.pm
  OpenInteract/Handler/Page.pm
! OpenInteract/SQLInstall/BasePage.pm
  struct/page.sql
  struct/page_content.sql
--- 5,19 ----
  conf/action.perl
  conf/spops.perl
+ data/content_types.dat
  data/install_security.dat
  doc/base_page.pod
  doc/titles
+ OpenInteract/ContentType.pm
  OpenInteract/Page.pm
  OpenInteract/Page/Database.pm
  OpenInteract/Page/File.pm
  OpenInteract/Handler/Page.pm
! OpenInteract/SQLInstall/Page.pm
! struct/content_type.sql
  struct/page.sql
  struct/page_content.sql

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/package.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** package.conf	2001/10/25 15:21:32	1.5
--- package.conf	2001/10/26 21:10:28	1.6
***************
*** 1,4 ****
  name             base_page
! version          0.16
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          0.17
  author           Chris Winters <ch...@cw...>
  module           File::Basename

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.6,1.7

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv7306/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
if the page isn't found, throw a 314 error rather than displaying the notice ourselves


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Page.pm	2001/10/25 15:21:32	1.6
--- Page.pm	2001/10/26 21:09:55	1.7
***************
*** 196,200 ****
      unless ( $page or $do_edit ) {
          $R->{page}{content_type} = 'text/html';
!         return $class->_notfound_message( $location );
      }
  
--- 196,200 ----
      unless ( $page or $do_edit ) {
          $R->{page}{content_type} = 'text/html';
!         $R->throw({ code => 314, system_msg => $location });
      }
  
***************
*** 204,207 ****
--- 204,212 ----
  
      if ( $do_edit ) {
+         $page ||= $R->page->new;
+ 
+         # If this is an editable doc, fetch the content, otherwise,
+         # mark it as non-editable to the form
+ 
          if ( $class->_is_displayable( $page->{mime_type} ) ) {
              $page->content;
***************
*** 211,215 ****
          }
          $R->DEBUG && $R->scrib( 1, "This page should be in an editable form" );
-         $page ||= $R->page->new;
          $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
--- 216,219 ----
***************
*** 465,477 ****
  }
  
- 
- sub _notfound_message {
-     my ( $class, $location ) = @_;
-     return <<NOTFOUND;
- <h2>Page Not Found</h2>
- <p>Could not find page with location you requested
- (<tt>$location</tt>). Did you mistype the address?</p>
- NOTFOUND
- }
  
  1;
--- 469,472 ----

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/struct content_type.sql,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/struct
In directory usw-pr-cvs1:/tmp/cvs-serv7096/struct

Added Files:
	content_type.sql 
Log Message:
added data structure, startup data, lookup table action, object
definition and simple class method for keeping track of content types


--- NEW FILE: content_type.sql ---
CREATE TABLE content_type (
  content_type_id   %%INCREMENT%%,
  mime_type         varchar(40) not null,
  extensions        varchar(20) not null,
  description       varchar(100) null,
  primary key       ( content_type_id )
)

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/data content_types.dat,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/data
In directory usw-pr-cvs1:/tmp/cvs-serv7096/data

Added Files:
	content_types.dat 
Log Message:
added data structure, startup data, lookup table action, object
definition and simple class method for keeping track of content types


--- NEW FILE: content_types.dat ---
$content = [ 
              { spops_class => 'OpenInteract::ContentType',
                field_order => [ qw/ mime_type extensions description / ] },
              [ 'application/mac-binhex40', 'hqx', 'Macintosh BinHex archive' ],
              [ 'application/msword', 'doc', 'Microsoft Word Document' ],
              [ 'application/pdf', 'pdf', 'Adobe Acrobat Portable Document Format' ],
              [ 'application/octet-stream', 'bin dms lha lzh exe class', 'Executable File' ],
              [ 'application/postscript', 'ai eps ps', 'Postscript' ],
              [ 'application/vnd.ms-excel', 'xls', 'Microsoft Excel Spreadsheet' ],
              [ 'application/vnd.ms-powerpoint', 'ppt', 'Microsoft Powerpoint Presentation' ],
              [ 'application/vnd.visio', 'vsd', 'Visio diagram' ],
              [ 'application/wordperfect5.1', 'wpd', 'WordPerfect document' ],
              [ 'application/x-gzip', 'gz', 'Gzip archive' ],
              [ 'application/x-javascript', 'js', 'Javascript sourcecode' ],
              [ 'application/x-perl', 'pl pm', 'Perl sourcecode' ],
              [ 'application/x-shockwave-flash', 'swf', 'Flash program' ],
              [ 'application/x-tar', 'tar', 'Tar archive' ],
              [ 'application/x-tcl', 'tcl', 'TCL sourcecode' ],
              [ 'application/zip', 'zip', 'PKZip archive' ],
              [ 'audio/basic', 'au snd', 'Basic sound' ],
              [ 'audio/mpeg', 'mpga mp2 mp3', 'MPEG sound' ],
              [ 'audio/x-aiff', 'aif aiff aifc', 'Basic sound' ],
              [ 'audio/x-pn-realaudio', 'ram rm', 'RealAudio ' ],
              [ 'image/bmp', 'bmp', 'Bitmap image' ],
              [ 'image/gif', 'gif', 'GIF image' ],
              [ 'image/jpeg', 'jpeg jpg jpe', 'JPEG image' ],
              [ 'image/png', 'png', 'Portable Network Graphics image' ],
              [ 'image/tiff', 'tiff tif', 'TIFF image' ],
              [ 'message/rfc822', 'msg', 'Email message' ],
              [ 'model/vrml', 'wrl vrml', 'Virtual reality document' ],
              [ 'text/css', 'css', 'Cascading stylesheet' ],
              [ 'text/html', 'html htm', 'HTML document' ],
              [ 'text/plain', 'asc txt', 'Plain text document' ],
              [ 'text/rtf', 'rtf', 'Rich text document' ],
              [ 'text/sgml', 'sgml sgm', 'SGML document' ],
              [ 'text/vnd.wap.wml', 'wml', 'Wireless document' ],
              [ 'text/vnd.wap.wmlscript', 'wmls', 'Wireless script' ],
              [ 'text/xml', 'xml', 'XML document' ],
              [ 'video/mpeg', 'mpeg mpg mpe', 'MPEG video' ],
              [ 'video/quicktime', 'qt mov', 'Quicktime video' ],
              [ 'video/x-msvideo', 'avi', 'Microsoft video' ],
];

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract ContentType.pm,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv7096/OpenInteract

Added Files:
	ContentType.pm 
Log Message:
added data structure, startup data, lookup table action, object
definition and simple class method for keeping track of content types


--- NEW FILE: ContentType.pm ---
package OpenInteract::ContentType;

# $Id: ContentType.pm,v 1.1 2001/10/26 21:09:05 lachoy Exp $

use strict;

use constant DEFAULT_MIME_TYPE => 'text/plain';


# Class method so that you can lookup a MIME type by an extension. If
# the extension isn't found, we return DEFAULT_MIME_TYPE

sub mime_type_by_extension {
    my ( $class, $extension ) = @_;
    $extension = lc $extension;
    my $type_list = $class->db_select({ from   => $class->table_name,
                                        select => 'mime_type',
                                        where  => 'extensions LIKE ?',
                                        value  => [ "% $extension %" ],
                                        return => 'list-single',
                                        db     => $class->global_datasource_handle });
    return $type_list->[0]->{mime_type} if ( $type_list->[0] );
    return DEFAULT_MIME_TYPE;
}

1;

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/conf action.perl,1.4,1.5 spops.perl,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/conf
In directory usw-pr-cvs1:/tmp/cvs-serv7096/conf

Modified Files:
	action.perl spops.perl 
Log Message:
added data structure, startup data, lookup table action, object
definition and simple class method for keeping track of content types


Index: action.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/conf/action.perl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** action.perl	2001/10/24 23:04:17	1.4
--- action.perl	2001/10/26 21:09:05	1.5
***************
*** 6,9 ****
--- 6,19 ----
   },
  
+  'contenttype' => {
+       is_lookup       => 'yes',
+       object_key      => 'content_type',
+       order           => 'mime_type',
+       field_list      => [ 'mime_type', 'extensions', 'description' ],
+       label_list      => [ 'MIME Type', 'Extensions', 'Description' ],
+       size_list       => [ 12, 10, 20 ],
+       title           => 'Content Types',
+  },
+ 
   'editdocumentbox' => { redir => 'edit_document_box' },
   'edit_document_box' => {

Index: spops.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/conf/spops.perl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spops.perl	2001/10/24 23:04:19	1.4
--- spops.perl	2001/10/26 21:09:05	1.5
***************
*** 37,39 ****
--- 37,50 ----
          object_name  => 'Document',
        },
+ 
+       'content_type' => {
+         class        => 'OpenInteract::ContentType',
+         isa          => [ qw/ OpenInteract::SPOPS::DBI SPOPS::DBI::MySQL SPOPS::DBI / ],
+         field        => [ qw/ mime_type extensions description / ],
+         id_field     => 'content_type_id',
+         base_table   => 'content_type',
+         name         => 'mime_type',
+         object_name  => 'Content Type',
+         display      => { url => '/Lookups/' },
+       },
  };

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/SQLInstall Page.pm,NONE,1.1 BasePage.pm,1.1,NONE

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/SQLInstall
In directory usw-pr-cvs1:/tmp/cvs-serv1779/OpenInteract/SQLInstall

Added Files:
	Page.pm 
Removed Files:
	BasePage.pm 
Log Message:
renamed BasePage.pm to Page.pm


--- NEW FILE: Page.pm ---
package OpenInteract::SQLInstall::Page;

# $Id: Page.pm,v 1.1 2001/10/26 20:49:35 lachoy Exp $

# Do installation of SQL for this package

use strict;
use vars qw( %HANDLERS );

@OpenInteract::SQLInstall::Page::ISA = qw( OpenInteract::SQLInstall );

my %files = (
  tables   => [ 'page.sql', 'page_content.sql' ],
  data     => [ 'content_types.dat' ],
  security => [ 'install_security.dat' ],
);

%HANDLERS = (
  create_structure => { '_default_' => [ 'create_structure',
                                         { table_file_list => $files{tables} } ] },
  install_data     => { '_default_' => [ 'install_data',
                                         { data_file_list => $files{data} } ] },
  install_security => { '_default_' => [ 'install_data',
                                         { data_file_list => $files{security} } ] },
);

1;

--- BasePage.pm DELETED ---

[Openinteract-commits] CVS: SPOPS Changes,1.68,1.69 MANIFEST,1.22,1.23 RELEASE,1.8,1.9 SPOPS.pm,1.53,1.54

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv30157

Modified Files:
	Changes MANIFEST RELEASE SPOPS.pm 
Log Message:
release, sync manifest, etc.


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/Changes,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** Changes	2001/10/23 14:25:00	1.68
--- Changes	2001/10/26 03:22:27	1.69
***************
*** 1,5 ****
  Revision history for Perl extension SPOPS.
  
! 0.52
  
  Overall:
--- 1,5 ----
  Revision history for Perl extension SPOPS.
  
! 0.52  Thu Oct 25 23:19:43 EDT 2001
  
  Overall:
***************
*** 11,14 ****
--- 11,16 ----
     examples and ideas.
  
+    - Enhancements to SPOPS::LDAP::Multidatasource
+ 
     - Bugfixes, including one in SPOPS::ClassFactory::DefaultBehavior
     that broke old apps using rules
***************
*** 29,33 ****
  
       - Example of a SPOPS::ClassFactory behavior that retrieves the
!      information for a particular record to use as defaults.
  
     * eg/My/LDAPConnect.pm:
--- 31,35 ----
  
       - Example of a SPOPS::ClassFactory behavior that retrieves the
!      information from a particular record to use as defaults.
  
     * eg/My/LDAPConnect.pm:
***************
*** 66,72 ****
  
      - Make datasources sticky -- each object should be able to find
!     out where it came from. Also override save() and remove() so that
!     we first grab the right handle and pass it along to the method
!     that does the real work.
  
  
--- 68,81 ----
  
      - Make datasources sticky -- each object should be able to find
!     out where it came from (modified fetch() and fetch_group_all()
!     with this).
! 
!     - Override save() and remove() so that we first grab the right
!     handle (from the datasource put into the object) and pass it along
!     to the method that does the real work.
! 
!     - Create fetch_by_dn() so you can actually store in a group the
!     DNs for objects that reside on multiple servers. (Cool!) Thanks to
!     Andreas Nolte <and...@be...> for testing this out.
  
  

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/MANIFEST,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MANIFEST	2001/10/22 05:42:50	1.22
--- MANIFEST	2001/10/26 03:22:27	1.23
***************
*** 65,68 ****
--- 65,69 ----
  eg/fetch_doodads.pl
  eg/find_defaults_demo.pl
+ eg/ldap_multidatasource.pl
  eg/stock_doodads.pl
  eg/stock_user_group.pl
***************
*** 75,78 ****
--- 76,80 ----
  eg/My/Common.pm
  eg/My/Group.pm
+ eg/My/LDAPConnect.pm
  eg/My/Security.pm
  eg/My/User.pm

Index: RELEASE
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/RELEASE,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RELEASE	2001/10/15 04:28:24	1.8
--- RELEASE	2001/10/26 03:22:27	1.9
***************
*** 2,5 ****
--- 2,10 ----
  =========================
  
+ 0.52 Thu Oct 25 23:19:43 EDT 2001
+ 
+   * Bugfixes, enhancements. Nothing major.
+ 
+ 
  0.51 Sun Oct 14 20:23:59 EDT 2001
  

Index: SPOPS.pm
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/SPOPS.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** SPOPS.pm	2001/10/23 12:19:29	1.53
--- SPOPS.pm	2001/10/26 03:22:27	1.54
***************
*** 15,19 ****
  @SPOPS::ISA       = qw( Exporter Storable );
  @SPOPS::EXPORT_OK = qw( _w _wm DEBUG );
! $SPOPS::VERSION   = '0.51a';
  $SPOPS::Revision  = substr(q$Revision$, 10);
  
--- 15,19 ----
  @SPOPS::ISA       = qw( Exporter Storable );
  @SPOPS::EXPORT_OK = qw( _w _wm DEBUG );
! $SPOPS::VERSION   = '0.52';
  $SPOPS::Revision  = substr(q$Revision$, 10);
  
***************
*** 176,180 ****
      my %initial_data = ();
      my $id_field = $class->id_field;
!     $initial_data{ $id_field } = $p->{ $id_field } || $p->{id};
  
      while ( my ( $k, $v ) = each %{ $self } ) {
--- 176,182 ----
      my %initial_data = ();
      my $id_field = $class->id_field;
!     if ( $id_field ) {
!         $initial_data{ $id_field } = $p->{ $id_field } || $p->{id};
!     }
  
      while ( my ( $k, $v ) = each %{ $self } ) {

[Openinteract-commits] CVS: SPOPS/eg/My LDAPConnect.pm,1.1,1.2

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/SPOPS/eg/My
In directory usw-pr-cvs1:/tmp/cvs-serv30023/eg/My

Modified Files:
	LDAPConnect.pm 
Log Message:
cosmetic


Index: LDAPConnect.pm
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/eg/My/LDAPConnect.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LDAPConnect.pm	2001/10/23 14:25:31	1.1
--- LDAPConnect.pm	2001/10/26 03:21:35	1.2
***************
*** 26,32 ****
  sub global_datasource_handle {
      my ( $class, $connect_key ) = @_;
!     unless ( $connect_key ) {
!         cluck "Cannot retrieve handle without connect key!\n";
!     }
      unless ( $HANDLES{ $connect_key } ) {
          my $ldap_info = $class->connection_info( $connect_key );
--- 26,31 ----
  sub global_datasource_handle {
      my ( $class, $connect_key ) = @_;
!     cluck "Cannot retrieve handle without connect key!\n" unless ( $connect_key );
! 
      unless ( $HANDLES{ $connect_key } ) {
          my $ldap_info = $class->connection_info( $connect_key );

[Openinteract-commits] CVS: SPOPS/t 40_ldap.t,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/SPOPS/t
In directory usw-pr-cvs1:/tmp/cvs-serv29484

Modified Files:
	40_ldap.t 
Log Message:
comments


Index: 40_ldap.t
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/t/40_ldap.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** 40_ldap.t	2001/09/20 14:56:17	1.10
--- 40_ldap.t	2001/10/26 03:18:37	1.11
***************
*** 88,96 ****
      # Tests: 7 - 8
  
!     my $ldap = Net::LDAP->new( $config->{LDAP_host}, 
                                 port    => $config->{LDAP_port} );
      ok( $ldap, 'Connect to directory' );
!     my @bind_args = ( $config->{LDAP_bind_dn} ) 
!                       ? ( $config->{LDAP_bind_dn}, password => $config->{LDAP_bind_password} ) 
                        : ();
      my $ldap_msg = $ldap->bind( @bind_args );
--- 88,96 ----
      # Tests: 7 - 8
  
!     my $ldap = Net::LDAP->new( $config->{LDAP_host},
                                 port    => $config->{LDAP_port} );
      ok( $ldap, 'Connect to directory' );
!     my @bind_args = ( $config->{LDAP_bind_dn} )
!                       ? ( $config->{LDAP_bind_dn}, password => $config->{LDAP_bind_password} )
                        : ();
      my $ldap_msg = $ldap->bind( @bind_args );
***************
*** 224,228 ****
      is( scalar @USER_DATA, $iter_count, 'Iterate through objects' );
  
!     # Now add two groups
  
      my $public_group = eval { $GROUP_LDAP_CLASS->new({ cn          => 'public',
--- 224,231 ----
      is( scalar @USER_DATA, $iter_count, 'Iterate through objects' );
  
!     # Now add two groups - it looks like Convert::ASN1 whines a little
!     # under -w because we're setting uniquemember to an empty list,
!     # but we have to do that so the group will meet its schema
!     # requirements...
  
      my $public_group = eval { $GROUP_LDAP_CLASS->new({ cn          => 'public',

[Openinteract-commits] CVS: SPOPS/doc/Manual ObjectRules.pod,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/SPOPS/doc/Manual
In directory usw-pr-cvs1:/tmp/cvs-serv27936

Modified Files:
	ObjectRules.pod 
Log Message:
small updates, pointers to what's coming, etc.


Index: ObjectRules.pod
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/doc/Manual/ObjectRules.pod,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectRules.pod	2001/10/12 20:21:29	1.5
--- ObjectRules.pod	2001/10/26 03:11:22	1.6
***************
*** 69,73 ****
  them.
  
! NOTE: This item is up for debate (as of 0.40).
  
  =item 3.
--- 69,73 ----
  them.
  
! NOTE: This item is up for debate
  
  =item 3.
***************
*** 127,131 ****
  a positive cache hit.
  
! B<pre_save_action(  is_add =E<gt>; bool })>
  
  Called before a save has been attempted. If this is an add operation
--- 127,131 ----
  a positive cache hit.
  
! B<pre_save_action({ is_add =E<gt> bool })>
  
  Called before a save has been attempted. If this is an add operation
***************
*** 153,160 ****
  
  =head2 Rule Factory
- 
- B<ruleset_add( $class, \%class_ruleset )>
  
! NOTE: THIS METHOD MIGHT BE RENAMED TO 'rule_factory()'
  
  Interface for adding rules to a class. The first argument is the class
--- 153,158 ----
  
  =head2 Rule Factory
  
! B<ruleset_factory( $class, \%class_ruleset )>
  
  Interface for adding rules to a class. The first argument is the class
***************
*** 172,176 ****
  from our index:
  
!   sub ruleset_add {
      my ( $class, $rs_table ) = @_;
      my $obj_class = ref $class || $class;
--- 170,174 ----
  from our index:
  
!   sub ruleset_factory {
      my ( $class, $rs_table ) = @_;
      my $obj_class = ref $class || $class;
***************
*** 185,190 ****
  ensure that the same rule does not get entered multiple times.
  
! NOTE: THIS INTERFACE MAY BE CHANGED TO INSTEAD RETURN THE NAMES
! (PACKAGE + METHOD) OF ALL ROUTINES ADDED TO THE RULESET.
  
  =head2 Rule Processor
--- 183,198 ----
  ensure that the same rule does not get entered multiple times.
  
! B<POSSIBLE CHANGES>
! 
! Instead of the above, we may change to something like:
! 
!   sub ruleset_factory {
!     my ( $class ) = @_;
!     return { post_save_action   => \&reindex_object,
!              post_remove_action => \&remove_object_from_index };
!   }
! 
! This is simpler, easier to follow and more consistent with how we
! discover behaviors to execute during the code generation process.
  
  =head2 Rule Processor

[Openinteract-commits] CVS: OpenInteract Changes,1.73,1.74

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv10239

Modified Files:
	Changes 
Log Message:
latest changes


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/Changes,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Changes	2001/10/20 15:16:18	1.73
--- Changes	2001/10/25 16:12:53	1.74
***************
*** 9,37 ****
   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.
  
   - Added 'object_activity' package to browse object activity logs.
  
  Individual:
  
   * conf/sample-server.perl:
  
!    - Moved 'template_ext' ==> 'template_info'->'template_ext'
  
     - Moved 'default_connection_db' ==>
!    'datasource'->'default_connection_db'
  
     - Moved 'default_connection_ldap' ==>
!    'datasource'->'default_connection_ldap'
  
!    - Moved 'error_object_class' ==> 'error'->'error_object_class'
  
!    - Moved 'default_error_handler' ==> 'error'->'default_error_handler'
  
!    - Moved 'smtp_host' ==> 'mail'->'smtp_host'
  
!    - Moved 'admin_email' ==> 'mail'->'admin_email'
  
!    - Moved 'content_email' ==> 'mail'->'content_email'
  
     - Reverse and flatten the 'system_alias' hashref. For instance:
--- 9,53 ----
   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 logs.
  
+  - 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'. Migration scripts are provided.
+ 
  Individual:
  
   * conf/sample-server.perl:
  
!    - Moved 'template_ext' ==> 
!               'template_info'->'template_ext'
  
     - Moved 'default_connection_db' ==>
!               'datasource'->'default_connection_db'
  
     - Moved 'default_connection_ldap' ==>
!               'datasource'->'default_connection_ldap'
  
!    - Moved 'error_object_class' ==>
!               'error'->'error_object_class'
  
!    - Moved 'default_error_handler' ==>
!               'error'->'default_error_handler'
  
!    - Moved 'smtp_host' ==>
!               'mail'->'smtp_host'
  
!    - Moved 'admin_email' ==>
!               'mail'->'admin_email'
  
!    - Moved 'content_email' ==>
!               'mail'->'content_email'
  
     - Reverse and flatten the 'system_alias' hashref. For instance:
***************
*** 45,60 ****
          auth_group => 'OpenInteract::Auth',
  
!    - Moved 'action'->'_default_action_info' ==> 'action_info'->'default'
  
!    - Moved 'action'->'_notfound' ==> 'action_info'->'not_found'
  
!    - Moved 'action'->"''" ==> 'action_info'->'none'
  
!    - Moved 'stash_class' ==> 'server_info'->'stash_class'
  
!    - Moved 'request_class' ==> 'server_info'->'request_class'
  
!    - Moved 'website_name' ==> 'server_info'->'website_name'
  
   * OpenInteract/UI/Main.pm:
  
--- 61,107 ----
          auth_group => 'OpenInteract::Auth',
  
!    - Moved 'action'->'_default_action_info' ==>
!               'action_info'->'default'
  
!    - Moved 'action'->'_notfound' ==>
!               'action_info'->'not_found'
  
!    - Moved 'action'->"''" ==>
!               'action_info'->'none'
  
!    - Moved 'stash_class' ==>
!               'server_info'->'stash_class'
  
!    - Moved 'request_class' ==>
!               'server_info'->'request_class'
  
!    - Moved 'website_name' ==>
!               'server_info'->'website_name'
! 
!  * doc/fruit-0.09.tar.gz:
! 
!    - 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.
! 
!  * OpenInteract/Auth.pm:
! 
!    - Added 'is_admin()' which checks to see if the user is an
!    administrator. By default this is defined as being the superuser or
!    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.
! 
!  * OpenInteract/CommonHandler.pm:
  
+    - Reorganized documentation and added lots of it, documenting every
+    configuration key and customization method.
+ 
+    - Added the 'notify()' task to send objects in human-readable
+    format over email
+ 
+    - Added the 'create()' task which is just a wrapper around the
+    'show()' task with certain parameters checked beforehand and set.
+ 
   * OpenInteract/UI/Main.pm:
  
***************
*** 65,77 ****
   * OpenInteract/SPOPS.pm:
  
!    - Remove the html_encode and html_decode methods; they're in the
     template plugin, and if you really need them elsewhere you can call
     the HTML::Entities methods by hand.
  
   * OpenInteract/Template/Plugin.pm:
  
!    - Fix dumb POD error that prevented 'perldoc' from working
     (identified itself as OI::Template::Provider in the head - doh!)
  
  
  
--- 112,133 ----
   * OpenInteract/SPOPS.pm:
  
!    - Removed the html_encode and html_decode methods; they're in the
     template plugin, and if you really need them elsewhere you can call
     the HTML::Entities methods by hand.
  
+    - rename 'ruleset_add' -> 'ruleset_factory'
+ 
   * OpenInteract/Template/Plugin.pm:
  
!    - Fixed dumb POD error that prevented 'perldoc' from working
     (identified itself as OI::Template::Provider in the head - doh!)
  
+    - Add 'is_admin' property to the template plugin that returns
+    whether the current user is an administrator. (See
+    OpenInteract/Auth.pm for what this means.)
+ 
+  * OpenInteract/Template/Process.pm:
+ 
+    - Properly catch when we weren't passed content.
  
  

[Openinteract-commits] CVS: OpenInteract/pkg/base_box/template admin_tools_box.tmpl,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_box/template
In directory usw-pr-cvs1:/tmp/cvs-serv31107/pkg/base_box/template

Modified Files:
	admin_tools_box.tmpl 
Log Message:
fix the admin toolbox to work with base_page url (/Page/) rather than
static_page url (/BasicPage/). Confusing...


Index: admin_tools_box.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_box/template/admin_tools_box.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_tools_box.tmpl	2001/10/18 02:18:25	1.5
--- admin_tools_box.tmpl	2001/10/25 15:29:49	1.6
***************
*** 9,14 ****
  [% theme.bullet %] <a href="/Package/">Package</a><br>
  [% theme.bullet %] <a href="/Security/">Security</a><br>
! [% theme.bullet %] Static page (<a href="/BasicPage/listing/">List</a> |
!  <a href="/BasicPage/show/?edit=1">New</a>)<br>
  [% theme.bullet %] Template (<a href="/SiteTemplate/">List</a> |
   <a href="/SiteTemplate/show/?edit=1">New</a>)<br>
--- 9,14 ----
  [% theme.bullet %] <a href="/Package/">Package</a><br>
  [% theme.bullet %] <a href="/Security/">Security</a><br>
! [% theme.bullet %] Static page (<a href="/Page/directory_list/">List</a> |
!  <a href="/Page/create/">New</a>)<br>
  [% theme.bullet %] Template (<a href="/SiteTemplate/">List</a> |
   <a href="/SiteTemplate/show/?edit=1">New</a>)<br>

[Openinteract-commits] CVS: OpenInteract/pkg/base_box Changes,1.23,1.24 package.conf,1.22,1.23

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_box
In directory usw-pr-cvs1:/tmp/cvs-serv31107/pkg/base_box

Modified Files:
	Changes package.conf 
Log Message:
fix the admin toolbox to work with base_page url (/Page/) rather than
static_page url (/BasicPage/). Confusing...


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_box/Changes,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Changes	2001/10/24 19:56:38	1.23
--- Changes	2001/10/25 15:29:49	1.24
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package base_box.
  
+ 0.36  Thu Oct 25 11:42:39 EDT 2001
+ 
+       Modified admin_tools_box to use the base_page links ('/Page/')
+       now.
+ 
  0.35  Wed Oct 24 16:03:29 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_box/package.conf,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** package.conf	2001/10/24 19:56:38	1.22
--- package.conf	2001/10/25 15:29:49	1.23
***************
*** 1,4 ****
  name           base_box
! version        0.35
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/
--- 1,4 ----
  name           base_box
! version        0.36
  author         Chris Winters <ch...@cw...>
  url            http://www.openinteract.org/

[Openinteract-commits] CVS: OpenInteract/pkg/base_user/OpenInteract/User LDAP.pm,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_user/OpenInteract/User
In directory usw-pr-cvs1:/tmp/cvs-serv30905/pkg/base_user/OpenInteract/User

Modified Files:
	LDAP.pm 
Log Message:
fix the LDAP user to check the password in the right datasource


Index: LDAP.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/OpenInteract/User/LDAP.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LDAP.pm	2001/10/23 14:28:45	1.4
--- LDAP.pm	2001/10/25 15:29:11	1.5
***************
*** 30,33 ****
--- 30,35 ----
                                 "against datasource ($datasource)" );
      my $connect_info = $self->connection_info( $datasource );
+ 
+     require OpenInteract::LDAP;
      my $ldap = eval { OpenInteract::LDAP->connect( $connect_info ) };
      if ( $@ ) {