[TWiki-Dev] [SVN] r3447 - in twiki/branches/DEVELOP/lib/TWiki: . Plugins

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2005-01-10 03:55:17 -0800 (Mon, 10 Jan 2005)
New Revision: 3447

Modified:
   twiki/branches/DEVELOP/lib/TWiki/Plugins/TestFixturePlugin.pm
   twiki/branches/DEVELOP/lib/TWiki/Search.pm
Log:
TWikiOO: left some debugging enabled during last checkin

Modified: twiki/branches/DEVELOP/lib/TWiki/Plugins/TestFixturePlugin.pm
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki/Plugins/TestFixturePlugin.pm	2005-01-10 11:44:50 UTC (rev 3446)
+++ twiki/branches/DEVELOP/lib/TWiki/Plugins/TestFixturePlugin.pm	2005-01-10 11:55:17 UTC (rev 3447)
@@ -126,8 +126,6 @@
 
 sub _tidy {
     my $a = shift;
-    $a =~ s/^\s+//;
-    $a =~ s/\s+$//s;
     $a =~ s/&/&/g;
     $a =~ s/</&lt;/g;
     $a =~ s/>/&gt;/g;
@@ -144,12 +142,19 @@
 
     foreach my $diff ( @$diffs ) {
         my $a = $diff->[1];
+        $a =~ s/^\s+//;
+        $a =~ s/\s+$//s;
         my $b = $diff->[2];
+        $b =~ s/^\s+//;
+        $b =~ s/\s+$//s;
         my $ok = 0;
 
         if ( $diff->[0] eq 'u' || $a eq $b || $rex && _rexeq( $a, $b )) {
             $ok = 1;
         }
+        if ($a =~ /Sushi/) {
+            print STDERR "X${a}X${b}X\n";
+        }
         $a = _tidy( $a );
         $b = _tidy( $b );
         if ( $ok ) {

Modified: twiki/branches/DEVELOP/lib/TWiki/Search.pm
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki/Search.pm	2005-01-10 11:44:50 UTC (rev 3446)
+++ twiki/branches/DEVELOP/lib/TWiki/Search.pm	2005-01-10 11:55:17 UTC (rev 3447)
@@ -629,13 +629,11 @@
         my @topicList = $this->_searchTopicsInWeb( $web, $theTopic, $theScope, $theType, $caseSensitive, @tokens );
 
         # exclude topics, Codev.ExcludeWebTopicsFromSearch
-print STDERR "Filter ",join(",",@topicList)," with $theExclude\n" if $theExclude;
         if( $caseSensitive ) {
             @topicList = grep( !/$theExclude/, @topicList ) if( $theExclude );
         } else {
             @topicList = grep( !/$theExclude/i, @topicList ) if( $theExclude );
         }
-print STDERR "Filtered ",join(",",@topicList)," with $theExclude\n" if $theExclude;
         next if( $noEmpty && ! @topicList ); # Nothing to show for this web
 
         my $topicInfo = {};