Changeset 8189

Timestamp:

07/16/10 00:59:44 (23 months ago)

Author:

SvenDowideit

Message:

Item2646: commited JulianLevens' windows quoting improvements. Unhappily, there are still many unit test failures using forking on windows - anyone interested in helping, remove the 'skip forking search' in Fn_SEARCH.pm

File:

• trunk/core/lib/Foswiki/Store/SearchAlgorithms/Forking.pm (modified) (6 diffs)

trunk/core/lib/Foswiki/Store/SearchAlgorithms/Forking.pm

@@ -63 +63 @@
     if ( $Foswiki::cfg{DetailedOS} eq 'MSWin32' ) {
 
-        #try to escape the ^ ad "" for native windows grep and apache
+        #try to escape the ^ and "" for native windows grep and apache
         $searchString =~ s/\[\^/[^^/g;
-        $searchString =~ s/"/""/g;
+
+        # Fix escaping and quoting for Windows
+        $searchString =~ s#\\#\\\\#g;
+        $searchString =~ s#"#\\"#g;
+        $searchString = q(") . $searchString . q(");
     }
 
@@ -79 +83 @@
     ##heck, on pre WinXP its only 2048, post XP its 8191 - http://support.microsoft.com/kb/830473
     if ( $Foswiki::cfg{DetailedOS} eq 'MSWin32' ) {
+
         #tune the number based on the length of "$sDir/WebSearchAdvanced.txt"
         #30 is a guess - wotamess
-        $maxTopicsInSet = ((8191-(length($program)+length($searchString)+30)) / (length("$sDir/LongWebSearchAdvanced.txt")+10));
+        $maxTopicsInSet =
+          ( ( 8191 - ( length($program) + length($searchString) + 30 ) ) /
+              ( length("$sDir/LongWebSearchAdvanced.txt") + 10 ) );
+
         #print STDERR "++++++++++++ $maxTopicsInSet \n";
     }
@@ -161 +169 @@
 
         my $webObject = Foswiki::Meta->new( $session, $web );
-        my $thisWebNoSearchAll = Foswiki::isTrue( $webObject->getPreference('NOSEARCHALL') );
+        my $thisWebNoSearchAll =
+          Foswiki::isTrue( $webObject->getPreference('NOSEARCHALL') );
 
         # make sure we can report this web on an 'all' search
@@ -231 +240 @@
             while ( $topicSet->hasNext() ) {
                 my $webtopic = $topicSet->next();
-                my ( $itrWeb, $topic ) = Foswiki::Func::normalizeWebTopicName( $web, $webtopic );
+                my ( $itrWeb, $topic ) =
+                  Foswiki::Func::normalizeWebTopicName( $web, $webtopic );
 
                 if ( $options->{'casesensitive'} ) {
@@ -251 +261 @@
             my $textMatches =
               search( $tokenCopy, $web, $topicSet, $session, $options );
+
             #bring the text matches into the topicMatch hash
             if ($textMatches) {
@@ -277 +288 @@
             @scopeTextList = keys(%topicMatches);
         }
+
         # reduced topic list for next token
         $topicSet =