diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm
index 80baf9592..6f9425473 100644
--- a/lib/WebGUI/Config.pm
+++ b/lib/WebGUI/Config.pm
@@ -148,8 +148,8 @@ sub new {
 	if (exists $config{$filename}) {
 		return $config{$filename};
 	} else {
-		my $config = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $webguiPath.'/etc/'.$filename, 'PURGE' => 1);
-		my $self = {_webguiRoot=>$webguiPath, _configFile=>$filename, _config=>$config};
+		my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $webguiPath.'/etc/'.$filename, 'PURGE' => 1);
+		my $self = {_webguiRoot=>$webguiPath, _configFile=>$filename, _config=>$conf};
 		bless $self, $class;
 		$config{$filename} = $self;
 		return $self;
diff --git a/lib/WebGUI/Search.pm b/lib/WebGUI/Search.pm
index 34f344bf8..bbd4fde8b 100644
--- a/lib/WebGUI/Search.pm
+++ b/lib/WebGUI/Search.pm
@@ -15,7 +15,6 @@ package WebGUI::Search;
 =cut
 
 use strict;
-use warnings;
 use WebGUI::Asset;
 use WebGUI::SQL;
 
@@ -133,7 +132,9 @@ sub new {
 
 =head2 rawClause ( sql [, placeholders ] ) 
 
-Tells the search engine to use a custom sql where clause that you've designed for the assetIndex table instead of using the API to build it.
+Tells the search engine to use a custom sql where clause that you've designed for the assetIndex table instead of using the API to build it. It also returns a reference to the object so you can join a result method with it like this:
+
+ my $assetIds = WebGUI::Search->new($session)->rawQuery($sql, $params)->getAssetIds;
 
 =head3 sql
 
@@ -149,68 +150,69 @@ sub rawClause {
 	my $self = shift;
 	$self->{_query} = shift;
 	$self->{_params} = shift;
+	return $self;
 }
 
 #-------------------------------------------------------------------
 
-=head2 search ( match, keywords ) 
+=head2 search ( rules ) 
 
-A simple keyword search.
+A rules engine for WebGUI's search system. It also returns a reference to the search object so that you can join a result method with it like:
 
-=head3 match
+ my $assetIds = WebGUI::Search->new($session)->search(\%rules)->getAssetIds;
 
-Should we match "any" or "all" of the keywords.
+=head3 rules
 
-=head3 keywords
+A hash reference containing rules for a search. The rules will will be hash references containing the values of a rule. Here's an example rule set:
 
-An array of the key words or phrases to match against.
+ {
+   { 
+     terms => [ "something to search for", "something else to search for"],
+     match => "all"
+   }, {
+     terms => [ "000001000005", "000001000074000003" ]
+   }
+ }
+
+=head4 keywords
+
+This rule limits the search results to assets that match keyword criteria. This rule has two properties: "terms" and "match". Terms is an array reference that contains key words and key phrases to be searched for. Match is an operator that determins whether "all" the terms must match or if "any" of the terms can match. Match defaults to "any" if not specified.
+
+=head4 lineage
+
+This rule limits the search to a specific set of descendants in the asset tree. This has just one parameter, "terms", which is an array reference of asset lineages to match against.
 
 =cut
 
 sub search {
 	my $self = shift;
-	my $match = shift;
-	my @keywords = @_;
-	my $operator = ($match eq "any") ? " or " : " and ";
-	my @phrases = ();
-	foreach (1..scalar(@keywords)) {
-		 push(@phrases, "match (keywords) against (?)");
+	my $rules = shift;
+	my @params = ();
+	my $query = "";
+	my @clauses = ();
+	if ($rules->{keywords}) {
+		push(@params,@{$rules->{keywords}{terms}});
+		my $operator = ($rules->{keywords}{match} eq "all") ? " and " : " or ";
+		my @phrases = ();
+		foreach (1..scalar(@{$rules->{keywords}{terms}})) {
+			 push(@phrases, "match (keywords) against (?)");
+		}
+		push(@clauses, join($operator, @phrases));
+	}
+	if ($rules->{lineage}) {
+		my @phrases = ();
+		foreach my $lineage (@{$rules->{lineage}{terms}}) {
+			push(@params, $lineage."%");
+			push(@phrases, "lineage like ?");
+		}
+		push(@clauses, join(" or ", @phrases));
 	}
-	$self->{_query} = join($operator, @phrases);
-	$self->{_params} = \@keywords;
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 searchLimitLineage ( lineage, match, keywords ) 
-
-A simple keyword search limiting the search to a particular lineage.
-
-=head3 lineage
-
-The lineage to limit the search to.
-
-=head3 match
-
-Should we match "any" or "all" of the keywords.
-
-=head3 keywords
-
-An array of the key words or phrases to match against.
-
-=cut
-
-sub searchLimitLineage {
-	my $self = shift;
-	my $lineage = shift;
-	$self->search(@_);
-	$self->{_query} = "lineage like ? and (".$self->{_query}.")";
-	my @params = @{$self->{_params}};
-	unshift(@params, $lineage.'%');
 	$self->{_params} = \@params;
+	$self->{_query} = "(".join(") and (", @clauses).")";
+	return $self;
 }
 
+
 #-------------------------------------------------------------------
 
 =head2 session ( ) 
diff --git a/sbin/search.pl b/sbin/search.pl
index 6a5163a28..063f27830 100644
--- a/sbin/search.pl
+++ b/sbin/search.pl
@@ -12,6 +12,7 @@ use strict;
 use lib '../lib';
 use Getopt::Long;
 use WebGUI::Asset;
+use WebGUI::Config;
 use WebGUI::Session;
 use WebGUI::Search;
 use WebGUI::Search::Index;
@@ -22,8 +23,10 @@ my $search = "";
 my $help = 0;
 my $indexsite = 0;
 my $configFile = "";
+my $indexAll = "";
 
 GetOptions(
+	'indexall'=>\$indexAll,
 	'configFile=s'=>\$configFile,
 	'search=s'=>\$search,
 	'help'=>\$help,
@@ -41,6 +44,8 @@ if ($configFile) {
 	}
 	$session->var->end;
 	$session->close;
+} elsif ($indexAll) {
+	reindexAllSites();
 } else {
 	displayHelp();
 }
@@ -57,6 +62,10 @@ Options:
 
 	--help			Displays this message.
 
+	--indexall		Reindexes all the sites. Note that this can take
+				many hours and will affect the performance of the
+				server during the indexing process.
+
 	--indexsite *		Reindexes the entire site. Note that depending
 				upon the amount of content you have, it may take
 				hours to index a site and server performance will
@@ -71,6 +80,20 @@ STOP
 }
 
 
+#-------------------------------------------------------------------
+sub reindexAllSites {
+	my $configs = WebGUI::Config->readAllConfigs("..");
+	foreach my $site (keys %{$configs}) {
+		print "Indexing ".$site."...\n";
+		my $session = WebGUI::Session->open("..",$site);
+		reindexSite($session);
+		$session->var->end;
+		$session->close;
+		print "Finished indexing ".$site.".\n";
+	}
+}
+
+
 #-------------------------------------------------------------------
 sub reindexSite {
 	my $session = shift;
@@ -85,7 +108,6 @@ sub reindexSite {
 			print "(".Time::HiRes::tv_interval($t).")\n";
 		}
 	}
-
 	print "\nSite indexing took ".Time::HiRes::tv_interval($siteTime)." seconds.\n";
 }
 
@@ -95,7 +117,7 @@ sub searchSite {
 	my $keywords = shift;
 	my $t = [Time::HiRes::gettimeofday()];
 	my $search = WebGUI::Search->new($session, 0);
-	$search->search("any",$keywords);
+	$search->search({keywords=>{terms=>[$keywords]}});
 	my $rs = $search->getResultSet;	
 	while (my $data = $rs->hashRef) {
 		print $data->{assetId}."\t".$data->{title}."\n";