[TWiki-Dev] CVS: twiki/lib/TWiki Search.pm,1.35,1.36

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki
In directory usw-pr-cvs1:/tmp/cvs-serv30975/TWiki

Modified Files:
	Search.pm 
Log Message:
fix for search, allow list of webs in web parameter

Index: Search.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/Search.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** Search.pm	12 Apr 2002 10:25:14 -0000	1.35
--- Search.pm	12 Apr 2002 10:40:44 -0000	1.36
***************
*** 92,99 ****
  
      if( $theWebName ) {
!         foreach( split( /[\,\s]+/, $theWebName ) ) {
              # the web processing loop filters for valid web names, so don't do it here.
  
!             if( $_ =~ /^(all|on)$/i  ) {
                  # get list of all webs by scanning $dataDir
                  opendir DIR, $TWiki::dataDir;
--- 92,99 ----
  
      if( $theWebName ) {
!         foreach my $web ( split( /[\,\s]+/, $theWebName ) ) {
              # the web processing loop filters for valid web names, so don't do it here.
  
!             if( $web =~ /^(all|on)$/i  ) {
                  # get list of all webs by scanning $dataDir
                  opendir DIR, $TWiki::dataDir;
***************
*** 113,122 ****
                     # list of directory's names.)
  
!                 foreach my $web ( @tmpList ) {
!                     push( @webList, $web ) unless( grep { /^$web$/ } @webList );
                  }
  
              } else {
!                 push( @webList, $_ ) unless( grep { /^$_$/ } @webList );
              }
          }
--- 113,122 ----
                     # list of directory's names.)
  
!                 foreach my $aweb ( @tmpList ) {
!                     push( @webList, $aweb ) unless( grep { /^$aweb$/ } @webList );
                  }
  
              } else {
!                 push( @webList, $web ) unless( grep { /^$web$/ } @webList );
              }
          }