gordonbanderson / silverstripe-elastica

searchpage/ElasticSearchPage.php

Indentation +20 added lines, -20 removed lines

@@ -62,7 +62,7 @@ 
 	);
 
 	private static $many_many_extraFields = array(
-    	'ElasticaSearchableFields' => array(
+		'ElasticaSearchableFields' => array(
 		'Searchable' => 'Boolean', // allows the option of turning off a single field for searching
 		'SimilarSearchable' => 'Boolean', // allows field to be used in more like this queries.
 		'Active' => 'Boolean', // preserve previous edits of weighting when classes changed
@@ -104,10 +104,10 @@ 
 		$sortedWords = $this->SimilarityStopWords;
 
 		$stopwordsField = StringTagField::create(
-		    'SimilarityStopWords',
-		    'Stop Words for Similar Search',
-		    $sortedWords,
-		    $sortedWords
+			'SimilarityStopWords',
+			'Stop Words for Similar Search',
+			$sortedWords,
+			$sortedWords
 		);
 
 		$stopwordsField->setShouldLazyLoad(true); // tags should be lazy loaded
@@ -190,15 +190,15 @@ 
 		$fields->addFieldToTab('Root.Search.Aggregations', new TextField('SearchHelper',
 			'ClassName of object to manipulate search details and results.  Leave blank for standard search'));
 
-        $ottos = AutoCompleteOption::get()->Filter('Locale', $this->Locale)->map('ID', 'Name')->
-        									toArray();
-        $df = DropdownField::create('AutoCompleteFunctionID', 'Autocomplete Function')->
-        							setSource($ottos);
-        $df->setEmptyString('-- Please select what do do after find as you type has occurred --');
+		$ottos = AutoCompleteOption::get()->Filter('Locale', $this->Locale)->map('ID', 'Name')->
+											toArray();
+		$df = DropdownField::create('AutoCompleteFunctionID', 'Autocomplete Function')->
+									setSource($ottos);
+		$df->setEmptyString('-- Please select what do do after find as you type has occurred --');
 
-        $ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete',1)->Map('ID', 'Name')->toArray();
-        $autoCompleteFieldDF = DropDownField::create('AutoCompleteFieldID', 'Field to use for autocomplete')->setSource($ottos);
-        $autoCompleteFieldDF->setEmptyString('-- Please select which field to use for autocomplete --');
+		$ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete',1)->Map('ID', 'Name')->toArray();
+		$autoCompleteFieldDF = DropDownField::create('AutoCompleteFieldID', 'Field to use for autocomplete')->setSource($ottos);
+		$autoCompleteFieldDF->setEmptyString('-- Please select which field to use for autocomplete --');
 
 		$fields->addFieldToTab("Root.Search.AutoComplete",
 		  		FieldGroup::create(
@@ -223,7 +223,7 @@ 
 		$pickerConfig->removeComponentsByType(new PickerFieldAddExistingSearchButton());
 		$pickerConfig->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
 
-        $searchPicker->enableEdit();
+		$searchPicker->enableEdit();
 		$edittest = $pickerConfig->getComponentByType('GridFieldDetailForm');
 		$edittest->setFields(FieldList::create(
 			TextField::create('Name', 'Field Name'),
@@ -257,23 +257,23 @@ 
 
 		// What do display on the grid of searchable fields
 		$dataColumns = $pickerConfig->getComponentByType('GridFieldDataColumns');
-        $dataColumns->setDisplayFields(array(
+		$dataColumns->setDisplayFields(array(
 			'Name' => 'Name',
-        	'ClazzName' => 'Class',
+			'ClazzName' => 'Class',
 			'Type' => 'Type',
 			'Searchable' => 'Use for Search?',
 			'SimilarSearchable' => 'Use for Similar Search?',
 			'ShowHighlights' => 'Show Search Highlights',
 			'Weight' => 'Weighting'
-        ));
+		));
 
 		return $fields;
 	}
 
 
 	public function getCMSValidator() {
-        return new ElasticSearchPage_Validator();
-    }
+		return new ElasticSearchPage_Validator();
+	}
 
 
 	/**
@@ -358,7 +358,7 @@ 
 		$esfs = $this->ElasticaSearchableFields();
 
 		// Remove existing searchable fields for this page from the list of all available
-    	$delta = array_keys($esfs->map()->toArray());
+		$delta = array_keys($esfs->map()->toArray());
 		$newSearchableFields = $sfs->exclude('ID', $delta);
 
 		if ($newSearchableFields->count() > 0) {

searchpage/ElasticSearchPage_Controller.php

Indentation +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 		Requirements::javascript("elastica/javascript/jquery.autocomplete.js");
 		Requirements::javascript("elastica/javascript/elastica.js");
-        Requirements::css("elastica/css/elastica.css");
+		Requirements::css("elastica/css/elastica.css");
 	}
 
 
@@ -84,9 +84,9 @@ 
 
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
-	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
-	        }
+			if (isset($_GET['ServerDown'])) {
+				throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
+			}
 			if (class_exists($class)) {
 				$instance = \DataObject::get_by_id($class,$instanceID);
 
@@ -226,9 +226,9 @@ 
 		$paginated = null;
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
-	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
-	        }
+			if (isset($_GET['ServerDown'])) {
+				throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
+			}
 
 			// now actually perform the search using the original query
 			$paginated = $es->search($queryText, $fieldsToSearch, $testMode);