From aca9cad432ecaa54cda7fd4ae51cb00728eec2f8 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 17 Oct 2008 19:57:18 +0000
Subject: [PATCH] default search, and search context

git-svn-id: file:///home/shish/svn/shimmie2/trunk@1075 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/event.class.php | 4 +++-
 core/image.class.php | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/event.class.php b/core/event.class.php
index a65d0d8a..3f38bb37 100644
--- a/core/event.class.php
+++ b/core/event.class.php
@@ -268,11 +268,13 @@ class ThumbnailGenerationEvent extends Event {
  */
 class SearchTermParseEvent extends Event {
 	var $term = null;
+	var $context = null;
 	var $querylet = null;
 
-	public function SearchTermParseEvent($term) {
+	public function SearchTermParseEvent($term, $context) {
 		assert(!is_null($term));
 		$this->term = $term;
+		$this->context = $context;
 	}
 
 	public function is_querylet_set() {
diff --git a/core/image.class.php b/core/image.class.php
index 11b56c4a..8322da05 100644
--- a/core/image.class.php
+++ b/core/image.class.php
@@ -233,6 +233,12 @@ class Image {
 		$img_querylets = array();
 		$positive_tag_count = 0;
 
+		$stpe = new SearchTermParseEvent(null, $tags);
+		send_event($stpe);
+		if($stpe->is_querylet_set()) {
+			$img_querylets[] = new ImgQuerylet($stpe->get_querylet(), $positive);
+		}
+
 		// parse the words that are searched for into
 		// various types of querylet
 		foreach($terms as $term) {
@@ -244,7 +250,7 @@ class Image {
 			
 			$term = $database->resolve_alias($term);
 
-			$stpe = new SearchTermParseEvent($term);
+			$stpe = new SearchTermParseEvent($term, $tags);
 			send_event($stpe);
 			if($stpe->is_querylet_set()) {
 				$img_querylets[] = new ImgQuerylet($stpe->get_querylet(), $positive);