default search, and search context
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1075 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
parent
c3732aaa84
commit
aca9cad432
@ -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() {
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user