gordonbanderson / silverstripe-elastica

src/SilverStripe/Elastica/Searchable.php

Spacing +22 added lines, -22 removed lines

@@ -312,12 +312,12 @@ 
 
 		if (isset($_GET['progress'])) {
 			$progress = $_GET['progress'];
-			self::$progressInterval = (int) $progress;
+			self::$progressInterval = (int)$progress;
 		}
 
 		if (self::$progressInterval > 0) {
 			if (self::$index_ctr % self::$progressInterval === 0) {
-				ElasticaUtil::message("\t".$this->owner->ClassName." - Prepared ".self::$index_ctr." for indexing...");
+				ElasticaUtil::message("\t" . $this->owner->ClassName . " - Prepared " . self::$index_ctr . " for indexing...");
 			}
 		}
 
@@ -366,7 +366,7 @@ 
 
 			} else {
 				if (in_array($field, $this->html_fields)) {
-					$fields[$field] = $this->owner->$field;;
+					$fields[$field] = $this->owner->$field; ;
 					if (gettype($this->owner->$field) !== 'NULL') {
 						$html = ShortcodeParser::get_active()->parse($this->owner->$field);
 						$txt = \Convert::html2raw($html);
@@ -508,14 +508,14 @@ 
 	 * Removes the record from the search index.
 	 */
 	protected function doDeleteDocument() {
-		try{
+		try {
 			if (!$this->owner->IndexingOff) {
 				// this goes to elastica service
 				$this->service->remove($this->owner);
 			}
 		}
-		catch(\Elastica\Exception\NotFoundException $e) {
-			trigger_error("Deleted document ".$this->owner->ClassName." (".$this->owner->ID.
+		catch (\Elastica\Exception\NotFoundException $e) {
+			trigger_error("Deleted document " . $this->owner->ClassName . " (" . $this->owner->ID .
 				") not found in search index.", E_USER_NOTICE);
 		}
 
@@ -532,7 +532,7 @@ 
 		$fields = \Config::inst()->get(get_class($this->owner), 'searchable_fields');
 
 		// fallback to default method
-		if(!$fields) user_error('The field $searchable_fields must be set for the class '.$this->owner->ClassName);
+		if (!$fields) user_error('The field $searchable_fields must be set for the class ' . $this->owner->ClassName);
 
 		// get the values of these fields
 		$elasticaMapping = $this->fieldsToElasticaConfig($this->owner, $fields);
@@ -553,24 +553,24 @@ 
 
 						$relClass = $has_lists[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if (!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
 						$rewrite = $this->fieldsToElasticaConfig($relClass, $fields);
 
 						// mark as a method, the resultant fields are correct
-						$elasticaMapping[$methodName.'()'] = $rewrite;
+						$elasticaMapping[$methodName . '()'] = $rewrite;
 
 
 					} else if (isset($has_ones[$methodName])) {
 						$relClass = $has_ones[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if (!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
 						$rewrite = $this->fieldsToElasticaConfig($relClass, $fields);
 						$classname = $has_ones[$methodName];
 
 						// mark as a method, the resultant fields are correct
-						$elasticaMapping[$methodName.'()'] = $rewrite;
+						$elasticaMapping[$methodName . '()'] = $rewrite;
 					} else {
-						user_error('The method '.$methodName.' not found in class '.$this->owner->ClassName.
+						user_error('The method ' . $methodName . ' not found in class ' . $this->owner->ClassName .
 								', please check configuration');
 					}
 				}
@@ -587,14 +587,14 @@ 
 	private function fieldsToElasticaConfig($objectInContext, $fields) {
 		// Copied from DataObject::searchableFields() as there is no separate accessible method
 		$rewrite = array();
-		foreach($fields as $name => $specOrName) {
+		foreach ($fields as $name => $specOrName) {
 			$identifer = (is_int($name)) ? $specOrName : $name;
 			$rewrite[$identifer] = array();
-			if(!isset($rewrite[$identifer]['title'])) {
+			if (!isset($rewrite[$identifer]['title'])) {
 				$rewrite[$identifer]['title'] = (isset($labels[$identifer]))
 					? $labels[$identifer] : \FormField::name_to_label($identifer);
 			}
-			if(!isset($rewrite[$identifer]['filter'])) {
+			if (!isset($rewrite[$identifer]['filter'])) {
 				$rewrite[$identifer]['filter'] = 'PartialMatchFilter';
 			}
 		}
@@ -606,7 +606,7 @@ 
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 
-		$searchableFields = $this->getElasticaFields(true,true);
+		$searchableFields = $this->getElasticaFields(true, true);
 
 
 		$doSC = \SearchableClass::get()->filter(array('Name' => $this->owner->ClassName))->first();
@@ -639,7 +639,7 @@ 
 
 				if (isset($searchableField['type'])) {
 					$doSF->Type = $searchableField['type'];
-				}  else {
+				} else {
 					$doSF->Name = $searchableField['properties']['__method'];
 					$doSF->Type = 'relationship';
 				}
@@ -650,7 +650,7 @@ 
 				}
 
 				$doSF->write();
-				\DB::alteration_message("Created new searchable editable field ".$name,"changed");
+				\DB::alteration_message("Created new searchable editable field " . $name, "changed");
 			}
 
 			// FIXME deal with deletions
@@ -695,7 +695,7 @@ 
 	 */
 	public function RenderResult($linkToContainer = '') {
 		$vars = new \ArrayData(array('SearchResult' => $this->owner, 'ContainerLink' => $linkToContainer));
-		$possibleTemplates = array($this->owner->ClassName.'ElasticSearchResult', 'ElasticSearchResult');
+		$possibleTemplates = array($this->owner->ClassName . 'ElasticSearchResult', 'ElasticSearchResult');
 		return $this->owner->customise($vars)->renderWith($possibleTemplates);
 	}
 
@@ -761,14 +761,14 @@ 
 		       $underscored = str_replace('.', '_', $field);
 
 		        $gridField = new \GridField(
-		            'TermsFor'.$underscored, // Field name
-		            $field.'TITLE'.$field, // Field title
+		            'TermsFor' . $underscored, // Field name
+		            $field . 'TITLE' . $field, // Field title
 		            $terms,
 		            $config
 		        );
 
 		      // $tab = new \Tab($field, new \TextField('Test'.$field, 'Testing'));
-		       $fields->addFieldToTab('Root.ElasticaTerms.'.$underscored, $gridField);
+		       $fields->addFieldToTab('Root.ElasticaTerms.' . $underscored, $gridField);
 			}
 
 		}