Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r14572 -r14585
--- branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 14572)
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 14572 2011-09-20 15:25:49Z alex $
+* @version	$Id: cat_event_handler.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -398,22 +398,20 @@
 			$search_event = $event_mapping[$type];
 			$this->$search_event($event);
 
-			$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
-			$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
+			$object =& $event->getObject();
+			/* @var $object kDBList */
 
-			if ($this->Conn->Query($sql)) {
-				$search_res_ids = $this->Conn->GetCol('SELECT ResourceId FROM '.$search_table);
-			}
+			$search_sql = '	FROM ' . TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search
+							search_result LEFT JOIN %1$s ON %1$s.ResourceId = search_result.ResourceId';
+			$sql = str_replace('FROM %1$s', $search_sql, $object->SelectClause);
 
-			if (isset($search_res_ids) && $search_res_ids) {
-				$type_clauses['search']['include'] = '%1$s.ResourceId IN ('.implode(',', $search_res_ids).') AND PrimaryCat = 1 AND ('.TABLE_PREFIX.'Category.Status = '.STATUS_ACTIVE.')';
-				$type_clauses['search']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $search_res_ids).') AND PrimaryCat = 1 AND ('.TABLE_PREFIX.'Category.Status = '.STATUS_ACTIVE.')';
-			}
-			else {
-				$type_clauses['search']['include'] = '0';
-				$type_clauses['search']['except'] = '1';
-			}
+			$object->SetSelectSQL($sql);
 
+			$object->addCalculatedField('Relevance', 'search_result.Relevance');
+			$object->AddOrderField('search_result.Relevance', 'desc', true);
+
+			$type_clauses['search']['include'] = 'PrimaryCat = 1 AND ('.TABLE_PREFIX.'Category.Status = '.STATUS_ACTIVE.')';
+			$type_clauses['search']['except'] = 'PrimaryCat = 1 AND ('.TABLE_PREFIX.'Category.Status = '.STATUS_ACTIVE.')';
 			$type_clauses['search']['having_filter'] = false;
 		}
 
@@ -866,21 +864,25 @@
 			$object->SetFieldOption('Status', 'options', $new_options);
 		}
 
-		// linking existing images for item with virtual fields
-		$image_helper =& $this->Application->recallObject('ImageHelper');
-		/* @var $image_helper ImageHelper */
+		if ( !$this->Application->isAdmin ) {
+			// linking existing images for item with virtual fields
+			$image_helper =& $this->Application->recallObject('ImageHelper');
+			/* @var $image_helper ImageHelper */
 
-		$image_helper->LoadItemImages($object);
+			$image_helper->LoadItemImages($object);
 
-		// linking existing files for item with virtual fields
-		$file_helper =& $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
+			// linking existing files for item with virtual fields
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
 
-		$file_helper->LoadItemFiles($object);
+			$file_helper->LoadItemFiles($object);
+		}
 
-		// set item's additional categories to virtual field (used in editing)
-		$item_categories = $this->getItemCategories($object->GetDBField('ResourceId'));
-		$object->SetDBField('MoreCategories', $item_categories ? '|'.implode('|', $item_categories).'|' : '');
+		if ( array_key_exists('MoreCategories', $object->VirtualFields) ) {
+			// set item's additional categories to virtual field (used in editing)
+			$item_categories = $this->getItemCategories($object->GetDBField('ResourceId'));
+			$object->SetDBField('MoreCategories', $item_categories ? '|'.implode('|', $item_categories).'|' : '');
+		}
 	}
 
 	function OnAfterItemUpdate(&$event)
@@ -894,7 +896,7 @@
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
 
-		if (!$this->Application->isAdminUser) {
+		if ( !$this->Application->isAdmin ) {
 			$image_helper =& $this->Application->recallObject('ImageHelper');
 			/* @var $image_helper ImageHelper */
 
@@ -938,7 +940,7 @@
 			$this->setCustomExportColumns($event);
 		}
 
-		if (!$this->Application->isAdminUser) {
+		if ( !$this->Application->isAdmin ) {
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -1150,7 +1152,7 @@
 			}
 		}
 
-		$where_clause = '(' . implode(') OR (', $where_clause) . ')';
+		$where_clause = '((' . implode(') OR (', $where_clause) . '))'; // 2 braces for next clauses, see below!
 
 		$search_scope = $this->Application->GetVar('search_scope');
 		if ($search_scope == 'category') {
@@ -1164,7 +1166,7 @@
 			}
 		}
 
-		$where_clause = $where_clause.' AND '.$items_table.'.Status=1';
+		$where_clause = $where_clause . ' AND (' . $items_table . '.Status = ' . STATUS_ACTIVE . ')';
 
 		if ($event->MasterEvent && $event->MasterEvent->Name == 'OnListBuild') {
 			if ($event->MasterEvent->getEventParam('ResultIds')) {
@@ -1194,6 +1196,14 @@
 
 			$config_elem = $search_config[ $map_key ];
 			$weight = $config_elem['Priority'];
+
+			// search by whole words only ([[:<:]] - word boundary)
+			/*$revelance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.implode(' ', $positive_words).')[[:>:]]", '.$weight.', 0)';
+			foreach ($positive_words as $keyword) {
+				$revelance_parts[] = 'IF('.$field.' REGEXP "[[:<:]]('.$keyword.')[[:>:]]", '.$weight.', 0)';
+			}*/
+
+			// search by partial word matches too
 			$revelance_parts[] = 'IF('.$field.' LIKE "%'.implode(' ', $positive_words).'%", '.$weight_sum.', 0)';
 			foreach ($positive_words as $keyword) {
 				$revelance_parts[] = 'IF('.$field.' LIKE "%'.$keyword.'%", '.$weight.', 0)';
@@ -1240,9 +1250,16 @@
 					FROM '.$object->TableName.'
 					'.implode(' ', $join_clauses).'
 					WHERE '.$where_clause.'
-					GROUP BY '.$items_table.'.'.$this->Application->getUnitOption($event->Prefix, 'IDField');
+					GROUP BY '.$items_table.'.'.$this->Application->getUnitOption($event->Prefix, 'IDField').' ORDER BY Relevance DESC';
 
 		$res = $this->Conn->Query($sql);
+
+		if ( !$search_table_exists ) {
+			$sql = 'ALTER TABLE ' . $search_table . '
+					ADD INDEX (ResourceId),
+					ADD INDEX (Relevance)';
+			$this->Conn->Query($sql);
+		}
 	}
 
 	/**
@@ -2402,6 +2419,8 @@
 		}
 
 		$object =& $event->getObject( Array('skip_autoload' => true) );
+        /* @var $object kCatDBItem */
+
 		$ids = $this->StoreSelectedIDs($event);
 
 		if ($ids) {
@@ -2525,11 +2544,13 @@
 			return ;
 		}
 
-		$file_helper =& $this->Application->recallObject('FileHelper');
-		/* @var $file_helper FileHelper */
+		if ( !$this->Application->isAdmin ) {
+			$file_helper =& $this->Application->recallObject('FileHelper');
+			/* @var $file_helper FileHelper */
 
-		$file_helper->createItemFiles($event->Prefix, true); // create image fields
-		$file_helper->createItemFiles($event->Prefix, false); // create file fields
+			$file_helper->createItemFiles($event->Prefix, true); // create image fields
+			$file_helper->createItemFiles($event->Prefix, false); // create file fields
+		}
 
 		$this->changeSortings($event);