Minor updates to the Search Index field. Fixes #47

symphonists · Aug 11, 2014 · 009be23 · 009be23
1 parent 69cbb30
commit 009be23
Showing 1 changed file with 25 additions and 30 deletions.
diff --git a/fields/field.search_index.php b/fields/field.search_index.php
@@ -2,7 +2,7 @@
 
 	require_once(EXTENSIONS . '/search_index/lib/class.search_index.php');
 
-	Class fieldSearch_Index extends Field{	
+	Class fieldSearch_Index extends Field {
 
 		private $keywords_highlight = '';
 
@@ -12,7 +12,7 @@
 		function __construct(){
 			parent::__construct();
 			$this->_name = __('Search Index');
-			$this->_required = FALSE;			
+			$this->_required = FALSE;
 			$this->set('hide', 'no');
 		}
 
@@ -23,11 +23,27 @@ function canFilter(){
 			return TRUE;
 		}
 
+		/**
+		* Create table to hold field instance's values
+		*/
+		public function createTable(){
+			return Symphony::Database()->query(
+				"CREATE TABLE IF NOT EXISTS `tbl_entries_data_" . $this->get('id') . "` (
+				  `id` int(11) unsigned NOT NULL auto_increment,
+				  `entry_id` int(11) unsigned NOT NULL,
+				  `value` double default NULL,
+				  PRIMARY KEY  (`id`),
+				  KEY `entry_id` (`entry_id`),
+				  KEY `value` (`value`)
+				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"
+			);
+		}
+
 		/**
 		* Process POST data for entry saving
 		*/
-		public function processRawFieldData($data, &$status, $simulate=FALSE, $entry_id=NULL) {	
-			$status = self::__OK__;			
+		public function processRawFieldData($data, &$status, &$message=null, $simulate=false, $entry_id=NULL){
+			$status = self::__OK__;
 			return array('value' => '');
 		}
 
@@ -44,10 +60,7 @@ function commit(){
 			$fields = array();
 			$fields['field_id'] = $id;
 
-			// delete existing field configuration
-			Symphony::Database()->query("DELETE FROM `tbl_fields_".$this->handle()."` WHERE `field_id` = '$id' LIMIT 1");
-			// save new field configuration
-			return Symphony::Database()->insert($fields, 'tbl_fields_' . $this->handle());
+			return FieldManager::saveSettings($id, $fields);
 		}
 
 		/**
@@ -59,8 +72,8 @@ function commit(){
 		* @param string $fieldnamePrefix
 		* @param string $fieldnamePostfix
 		*/
-		function displayPublishPanel(&$wrapper, $data=NULL, $flagWithError=NULL, $fieldnamePrefix=NULL, $fieldnamePostfix=NULL){
-			$value = $data['value'];					
+		public function displayPublishPanel(XMLElement &$wrapper, $data = null, $error = null, $prefix = null, $postfix = null, $entry_id = null) {
+			$value = $data['value'];
 			$label = Widget::Label($this->get('label'));
 			if($this->get('required') != 'yes') $label->appendChild(new XMLElement('i', __('Optional')));			
 		}
@@ -107,22 +120,6 @@ public function appendFormattedElement(XMLElement &$wrapper, $data, $encode = fa
 			);
 		}
 
-		/**
-		* Create table to hold field instance's values
-		*/		
-		public function createTable(){
-			return Symphony::Database()->query(			
-				"CREATE TABLE IF NOT EXISTS `tbl_entries_data_" . $this->get('id') . "` (
-				  `id` int(11) unsigned NOT NULL auto_increment,
-				  `entry_id` int(11) unsigned NOT NULL,
-				  `value` double default NULL,
-				  PRIMARY KEY  (`id`),
-				  KEY `entry_id` (`entry_id`),
-				  KEY `value` (`value`)
-				) TYPE=MyISAM;"			
-			);
-		}
-
 		/**
 		* Build SQL for Data Source filter
 		*
@@ -131,7 +128,7 @@ public function createTable(){
 		* @param string $where
 		* @param boolean $andOperation
 		*/
-		function buildDSRetrivalSQL($data, &$joins, &$where, $andOperation=FALSE){
+		function buildDSRetrievalSQL($data, &$joins, &$where, $andOperation=FALSE){
 			$field_id = $this->get('id');
 
 			$joins .= " LEFT JOIN `tbl_search_index` AS search_index ON (e.id = search_index.entry_id) ";
@@ -150,7 +147,7 @@ function buildDSRetrivalSQL($data, &$joins, &$where, $andOperation=FALSE){
 
 			switch($mode) {
 
-				case 'FULLTEXT':				
+				case 'FULLTEXT':
 					$where .= " AND MATCH(search_index.data) AGAINST ('{$keywords}' IN BOOLEAN MODE) ";
 				break;
 
@@ -213,5 +210,3 @@ function buildDSRetrivalSQL($data, &$joins, &$where, $andOperation=FALSE){
 		}
 
 	}
-
-?>