[AppWrap-cvs] AppWrap/Apache/AppWrap Doorknob.pm,1.12,1.13

[<pla...@us...>]

Update of /cvsroot/appwrap/AppWrap/Apache/AppWrap
In directory sc8-pr-cvs1:/tmp/cvs-serv13710

Modified Files:
	Doorknob.pm 
Log Message:
modified tests for required directives

Index: Doorknob.pm
===================================================================
RCS file: /cvsroot/appwrap/AppWrap/Apache/AppWrap/Doorknob.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Doorknob.pm	21 Dec 2002 11:04:26 -0000	1.12
--- Doorknob.pm	30 Dec 2002 09:33:09 -0000	1.13
***************
*** 17,21 ****
  
  use strict;
! use warnings qw(redefine);
  
  our @ISA = qw(Exporter DynaLoader);
--- 17,22 ----
  
  use strict;
! use warnings;
! no warnings qw(redefine);
  
  our @ISA = qw(Exporter DynaLoader);
***************
*** 254,258 ****
  	# these are the required my_tables directives
  	foreach my $dir (@my_tables_dirs) {
! 		unless (exists $my_tables->{$table}{$dir}) {
  			my $msg = 'Doorknob: Directive my_tables->{';
  			$msg .= $table . '}{' . $dir . '} not defined.';
--- 255,264 ----
  	# these are the required my_tables directives
  	foreach my $dir (@my_tables_dirs) {
! 		my $directive = $my_tables->{$table}{$dir};
! 		# first exception. table_type 'script' needs no menu_order
! 		next if $dir eq 'menu_order' &&
! 				$my_tables->{$table}{table_type} eq 'script';
! 		unless ($directive) {
! #		unless (exists $my_tables->{$table}{$dir}) {
  			my $msg = 'Doorknob: Directive my_tables->{';
  			$msg .= $table . '}{' . $dir . '} not defined.';
***************
*** 270,274 ****
  			$msg .= $table . '}{' . $dir . '} not defined.';
  			$msg .= ' Assigning an appropriate value is';
! 			$msg .= ' helpful to users. However it is not required.';
  			$r->log_error($msg);
  		}
--- 276,280 ----
  			$msg .= $table . '}{' . $dir . '} not defined.';
  			$msg .= ' Assigning an appropriate value is';
! 			$msg .= ' helpful to users. It is not required, however.';
  			$r->log_error($msg);
  		}