[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 DatasourceManager.pm,1.15,1.16 FullTextRules.pm,1.2,1.3 Manage.pm,1.40,1.41

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048/lib/OpenInteract2

Modified Files:
	DatasourceManager.pm FullTextRules.pm Manage.pm 
Log Message:
Silence warnings


Index: DatasourceManager.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/DatasourceManager.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatasourceManager.pm	27 Sep 2004 13:24:54 -0000	1.15
--- DatasourceManager.pm	9 Nov 2004 13:49:37 -0000	1.16
***************
*** 48,51 ****
--- 48,52 ----
          my $rv = eval { $connection->ping };
          if ( $@ or ! $rv ) {
+             $rv = "undef()" unless defined $rv;
              $log->warn( "Cannot ping connection '$ds_name': [Error: $@] ",
                          "[Return: $rv]; will try to reopen..." );

Index: FullTextRules.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/FullTextRules.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FullTextRules.pm	13 Jun 2004 02:02:14 -0000	1.2
--- FullTextRules.pm	9 Nov 2004 13:49:37 -0000	1.3
***************
*** 105,111 ****
      }
  
!     my ( $indexable );
      foreach my $field ( @{ $field_list } ) {
!         if ( ! ref $self->{ $field } ) {
              $indexable = join( ' ', $indexable, $self->{ $field } );
          }
--- 105,111 ----
      }
  
!     my ( $indexable ) = "";
      foreach my $field ( @{ $field_list } ) {
!         if ( defined $self->{ $field } and ! ref $self->{ $field } ) {
              $indexable = join( ' ', $indexable, $self->{ $field } );
          }
***************
*** 115,122 ****
  
          # This is for 'page' objects that use a filehandle
!         else {
              my $fh = $self->{ $field };
              $indexable = join( ' ', $indexable, <$fh> );
          }
      }
      return \$indexable;
--- 115,125 ----
  
          # This is for 'page' objects that use a filehandle
!         elsif ( ref $self->{ $field } eq 'GLOB' ) {
              my $fh = $self->{ $field };
              $indexable = join( ' ', $indexable, <$fh> );
          }
+         else {
+             $log->info( "Cannot index object '$field' (not a SCALAR or GLOB)");
+         }
      }
      return \$indexable;

Index: Manage.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Manage.pm	12 Jun 2004 19:01:51 -0000	1.40
--- Manage.pm	9 Nov 2004 13:49:37 -0000	1.41
***************
*** 378,385 ****
      my @opt = ();
      while ( my ( $name, $info ) = each %{ $all_params } ) {
!         if ( $info->{is_boolean} eq 'yes' ) {
              push @opt, $name;
          }
!         elsif ( $info->{is_multivalued} eq 'yes' ) {
              push @opt, "$name=s@";
          }
--- 378,387 ----
      my @opt = ();
      while ( my ( $name, $info ) = each %{ $all_params } ) {
!         if ( defined $info->{is_boolean} and
!              $info->{is_boolean} eq 'yes' ) {
              push @opt, $name;
          }
!         elsif ( defined $info->{is_multivalued} and
!                 $info->{is_multivalued} eq 'yes' ) {
              push @opt, "$name=s@";
          }
***************
*** 452,456 ****
              $current_action = $s->{action};
          }
!         if ( $s->{action} ne $current_action ) {
              push @new_status, { action => $current_action,
                                  status => [ @tmp_status ] };
--- 454,458 ----
              $current_action = $s->{action};
          }
!         if ( defined $s->{action} and $s->{action} ne $current_action ) {
              push @new_status, { action => $current_action,
                                  status => [ @tmp_status ] };