@ -330,7 +330,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
$find = $query
$find = $query
// Add the language code of the indexed item to the result of the query,
// Add the language code of the indexed item to the result of the query,
// since the entity will be rendered using the respective language.
// since the entity will be rendered using the respective language.
->fields('i', array('langcode'))
->fields('i', ['langcode'])
// And since SearchQuery makes these into GROUP BY queries, if we add
// And since SearchQuery makes these into GROUP BY queries, if we add
// a field, for PostgreSQL we also need to make it an aggregate or a
// a field, for PostgreSQL we also need to make it an aggregate or a
// GROUP BY. In this case, we want GROUP BY.
// GROUP BY. In this case, we want GROUP BY.
@ -342,7 +342,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
$status = $query->getStatus();
$status = $query->getStatus();
if ($status & SearchQuery::EXPRESSIONS_IGNORED) {
if ($status & SearchQuery::EXPRESSIONS_IGNORED) {
drupal_set_message($this->t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', array('@count' => $this->searchSettings->get('and_or_limit'))), 'warning');
drupal_set_message($this->t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', ['@count' => $this->searchSettings->get('and_or_limit')]), 'warning');
}
}
if ($status & SearchQuery::LOWER_CASE_OR) {
if ($status & SearchQuery::LOWER_CASE_OR) {
@ -366,7 +366,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
* Array of search result item render arrays (empty array if no results).
* Array of search result item render arrays (empty array if no results).
*/
*/
protected function prepareResults(StatementInterface $found) {
protected function prepareResults(StatementInterface $found) {
$results = array();
$results = [];
// 'fedora_resource' comes from the entity type id declared
// 'fedora_resource' comes from the entity type id declared
// in the annotation for \Drupal\islandora\Entity\FedoraResource.
// in the annotation for \Drupal\islandora\Entity\FedoraResource.
@ -395,13 +395,13 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
$result = $this->database->queryRange("SELECT c.id, MAX(sd.reindex) FROM {fedora_resource} c LEFT JOIN {search_dataset} sd ON sd.sid = c.id AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0 GROUP BY c.id ORDER BY MAX(sd.reindex) is null DESC, MAX(sd.reindex) ASC, c.id ASC", 0, $limit, array(':type' => $this->getPluginId()), array('target' => 'replica'));
$result = $this->database->queryRange("SELECT c.id, MAX(sd.reindex) FROM {fedora_resource} c LEFT JOIN {search_dataset} sd ON sd.sid = c.id AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0 GROUP BY c.id ORDER BY MAX(sd.reindex) is null DESC, MAX(sd.reindex) ASC, c.id ASC", 0, $limit, [':type' => $this->getPluginId()], ['target' => 'replica']);
$rids = $result->fetchCol();
$rids = $result->fetchCol();
if (!$rids) {
if (!$rids) {
@ -569,9 +569,9 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
public function indexStatus() {
public function indexStatus() {
$total = $this->database->query('SELECT COUNT(*) FROM {fedora_resource}')->fetchField();
$total = $this->database->query('SELECT COUNT(*) FROM {fedora_resource}')->fetchField();
$remaining = $this->database->query("SELECT COUNT(DISTINCT c.id) FROM {contact} c LEFT JOIN {search_dataset} sd ON sd.sid = c.id AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0", array(':type' => $this->getPluginId()))->fetchField();
$remaining = $this->database->query("SELECT COUNT(DISTINCT c.id) FROM {contact} c LEFT JOIN {search_dataset} sd ON sd.sid = c.id AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0", [':type' => $this->getPluginId()])->fetchField();
if ($form_state->hasValue('name') && !empty(($value = trim($form_state->getValue('name'))))) {
if ($form_state->hasValue('name') && !empty(($value = trim($form_state->getValue('name'))))) {
@ -695,7 +695,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
// Put the keywords and advanced parameters into GET parameters. Make sure
// Put the keywords and advanced parameters into GET parameters. Make sure
// to put keywords into the query even if it is empty, because the page
// to put keywords into the query even if it is empty, because the page
// controller uses that to decide it's time to check for search results.
// controller uses that to decide it's time to check for search results.
$query = array('keys' => $keys);
$query = ['keys' => $keys];
if ($filters) {
if ($filters) {
$query['f'] = $filters;
$query['f'] = $filters;
}
}
@ -722,20 +722,20 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
* a modified 'keys' element for the bare search keywords.
* a modified 'keys' element for the bare search keywords.
*/
*/
protected function parseAdvancedDefaults(array $f, $keys) {
protected function parseAdvancedDefaults(array $f, $keys) {
$defaults = array();
$defaults = [];
// Split out the advanced search parameters.
// Split out the advanced search parameters.
foreach ($f as $advanced) {
foreach ($f as $advanced) {
list($key, $value) = explode(':', $advanced, 2);
list($key, $value) = explode(':', $advanced, 2);
if (!isset($defaults[$key])) {
if (!isset($defaults[$key])) {
$defaults[$key] = array();
$defaults[$key] = [];
}
}
$defaults[$key][] = $value;
$defaults[$key][] = $value;
}
}
// Split out the negative, phrase, and OR parts of keywords.
// Split out the negative, phrase, and OR parts of keywords.
// For phrases, the form only supports one phrase.
// For phrases, the form only supports one phrase.
$matches = array();
$matches = [];
$keys = ' ' . $keys . ' ';
$keys = ' ' . $keys . ' ';
if (preg_match('/ "([^"]+)" /', $keys, $matches)) {
if (preg_match('/ "([^"]+)" /', $keys, $matches)) {
$keys = str_replace($matches[0], ' ', $keys);
$keys = str_replace($matches[0], ' ', $keys);
@ -778,9 +778,9 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
* {@inheritdoc}
* {@inheritdoc}
*/
*/
public function defaultConfiguration() {
public function defaultConfiguration() {
$configuration = array(
$configuration = [
'rankings' => array(),
'rankings' => [],
);
];
return $configuration;
return $configuration;
}
}
@ -789,34 +789,34 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
*/
*/
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
// Output form for defining rank factor weights.
// Output form for defining rank factor weights.
$form['content_ranking'] = array(
$form['content_ranking'] = [
'#type' => 'details',
'#type' => 'details',
'#title' => t('Content ranking'),
'#title' => t('Content ranking'),
'#open' => TRUE,
'#open' => TRUE,
);
];
$form['content_ranking']['info'] = array(
$form['content_ranking']['info'] = [
'#markup' => '' . $this->t('Influence is a numeric multiplier used in ordering search results. A higher number means the corresponding factor has more influence on search results; zero means the factor is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . '',
'#markup' => '' . $this->t('Influence is a numeric multiplier used in ordering search results. A higher number means the corresponding factor has more influence on search results; zero means the factor is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . '',
dannylamb
8 years ago
committed by