Changeset 6665

Timestamp:

03/07/10 01:57:57 (3 years ago)

Author:

SvenDowideit

Message:

Item8643: remove the 'optimisation' that we keep the Parser object around forever - which prettymuch ensures we don't notice a change to this setting in any cached (mod_perl, fastcgi, standalone) obj.

Location:

trunk/core/lib/Foswiki

Files:

• Infix/Parser.pm (modified) (3 diffs)
• Search.pm (modified) (4 diffs)
• Search/Parser.pm (modified) (2 diffs)

trunk/core/lib/Foswiki/Infix/Parser.pm

@@ -87 +87 @@
 
     return $this;
+}
+
+=begin TML
+
+---++ ObjectMethod finish()
+Break circular references.
+
+=cut
+
+sub finish {
+    my $self = shift;
+
 }
 
@@ -218 +230 @@
                 print STDERR "Tok: qs '$1'\n" if MONITOR_PARSER;
                 my $val = $2;
+
                 # Handle escaped characters in the string
                 $val =~ s/(?<!\\)\\(.)/$1/g;
@@ -310 +323 @@
 Module of Foswiki - The Free and Open Source Wiki, http://foswiki.org/, http://Foswiki.org/
 
-# Copyright (C) 2008-2009 Foswiki Contributors. All Rights Reserved.
+# Copyright (C) 2008-2010 Foswiki Contributors. All Rights Reserved.
 # Foswiki Contributors are listed in the AUTHORS file in the root
 # of this distribution. NOTE: Please extend that file, not this notice.

trunk/core/lib/Foswiki/Search.pm

@@ -21 +21 @@
 use Foswiki::WebFilter                ();
 
-#TODO: move these into a more appropriate place - they are function objects so can persist for a _long_ time
-my $queryParser;
-my $searchParser;
-
 BEGIN {
 
@@ -64 +60 @@
     my $this = shift;
     undef $this->{session};
+
+# these may well be function objects, but if (a setting changes, it needs to be picked up again.
+    if ( defined($this->{queryParser}) ) {
+        $this->{queryParser}->finish();
+        undef $this->{queryParser};
+    }
+    if ( defined($this->{searchParser}) ) {
+        $this->{searchParser}->finish();
+        undef $this->{searchParser};
+    }
 }
 
@@ -355 +361 @@
     my $theParser;
     if ( $params{type} eq 'query' ) {
-        unless ( defined($queryParser) ) {
+        unless ( defined($this->{queryParser}) ) {
             require Foswiki::Query::Parser;
-            $queryParser = new Foswiki::Query::Parser();
-        }
-        $theParser = $queryParser;
+            $this->{queryParser} = new Foswiki::Query::Parser();
+        }
+        $theParser = $this->{queryParser};
     }
     else {
-        unless ( defined($searchParser) ) {
+        unless ( defined($this->{searchParser}) ) {
             require Foswiki::Search::Parser;
-            $searchParser = new Foswiki::Search::Parser($session);
-        }
-        $theParser = $searchParser;
+            $this->{searchParser} = new Foswiki::Search::Parser($session);
+        }
+        $theParser = $this->{searchParser};
     }
     try {
@@ -710 +716 @@
 
             #TODO: i wonder if this shoudl be a HoistRE..
+            #TODO: well, um, and how does this work for query search?
             my @tokens  = @{ $query->{tokens} };
             my $pattern = $tokens[$#tokens];       # last token in an AND search

trunk/core/lib/Foswiki/Search/Parser.pm

@@ -48 +48 @@
     # Build pattern of stop words
     my $prefs = $this->{session}->{prefs};
+    ASSERT($prefs) if DEBUG;
     $this->{stopwords} = $prefs->getPreference('SEARCHSTOPWORDS') || '';
     $this->{stopwords} =~ s/[\s\,]+/\|/go;
@@ -53 +54 @@
 
     $this->{initialised} = 1;
+}
+
+=begin TML
+
+---++ ObjectMethod finish()
+Break circular references.
+
+=cut
+
+sub finish {
+    my $self = shift;
+
+    undef $self->{stopwords};
+    undef $self->{initialised};
 }