Skip to content

Commit 6c0a625

Browse files
melaniekungmelaniekung
committed
WIP: Update index for ES 6.x
1 parent ff1ba0a commit 6c0a625

30 files changed

+142
-90
lines changed

‎apps/qubit/modules/actor/actions/browseAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ protected function doSearch($request)
499499

500500
$this->search->query->setQuery($this->search->queryBool);
501501

502-
return QubitSearch::getInstance()->index->getType('QubitActor')->search($this->search->getQuery(false));
502+
return QubitSearch::getInstance()->index['QubitActor']->search($this->search->getQuery(false));
503503
}
504504

505505
private function getRelatedAuthorityUsingSlug($slug)

‎apps/qubit/modules/actor/actions/relatedInformationObjectsAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static function getRelatedInformationObjects($actorId, $page, $limit, $ev
108108
$query->setSize($limit);
109109
$query->setFrom($limit * ($page - 1));
110110

111-
return QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
111+
return QubitSearch::getInstance()->index['QubitInformationObject']->search($query);
112112
}
113113

114114
public static function nestedActorAndEventTypeQuery($actorId, $eventTypeId)

‎apps/qubit/modules/clipboard/actions/viewAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function execute($request)
5151

5252
$this->search->query->setQuery($this->search->queryBool);
5353

54-
$resultSet = QubitSearch::getInstance()->index->getType($this->entityType)->search($this->search->query);
54+
$resultSet = QubitSearch::getInstance()->index[$this->entityType]->search($this->search->query);
5555
}
5656

5757
// Page results

‎apps/qubit/modules/default/actions/browseAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ protected function populateAggs($resultSet)
146146

147147
$this->search->query->setRawQuery($queryParams);
148148

149-
$resultSetWithoutLanguageFilter = QubitSearch::getInstance()->index->getType($this::INDEX_TYPE)->search($this->search->query);
149+
$resultSetWithoutLanguageFilter = QubitSearch::getInstance()->index[$this::INDEX_TYPE]->search($this->search->query);
150150

151151
$count = $resultSetWithoutLanguageFilter->getTotalHits();
152152
}

‎apps/qubit/modules/default/actions/moveAction.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ public function execute($request)
140140
$this->query->setQuery($this->queryBool);
141141

142142
if ($this->resource instanceof QubitInformationObject) {
143-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($this->query);
143+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($this->query);
144144
} elseif ($this->resource instanceof QubitTerm) {
145145
// TODO: Add parent_id for terms in ES, add move button
146-
$resultSet = QubitSearch::getInstance()->index->getType('QubitTerm')->search($this->query);
146+
$resultSet = QubitSearch::getInstance()->index['QubitTerm']->search($this->query);
147147
}
148148

149149
// Page results

‎apps/qubit/modules/informationobject/actions/autocompleteAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function execute($request)
9494

9595
$this->query->setQuery($this->queryBool);
9696

97-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($this->query);
97+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($this->query);
9898

9999
// Page results
100100
$this->pager = new QubitSearchPager($resultSet);

‎apps/qubit/modules/informationobject/actions/browseAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function execute($request)
244244

245245
$this->setView($request);
246246

247-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($this->search->getQuery(false, true));
247+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($this->search->getQuery(false, true));
248248

249249
// Page results
250250
$this->pager = new QubitSearchPager($resultSet);

‎apps/qubit/modules/informationobject/actions/inventoryAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,6 @@ private static function getResults($resource, $limit = 10, $page = 1, $sort = nu
174174
QubitAclSearch::filterDrafts($queryBool);
175175
$query->setQuery($queryBool);
176176

177-
return QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
177+
return QubitSearch::getInstance()->index['QubitInformationObject']->search($query);
178178
}
179179
}

‎apps/qubit/modules/repository/actions/browseAction.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function execute($request)
142142

143143
$this->search->query->setQuery($this->search->queryBool);
144144

145-
$resultSet = QubitSearch::getInstance()->index->getType('QubitRepository')->search($this->search->query);
145+
$resultSet = QubitSearch::getInstance()->index['QubitRepository']->search($this->search->query);
146146

147147
$this->pager = new QubitSearchPager($resultSet);
148148
$this->pager->setPage($request->page ? $request->page : 1);
@@ -201,7 +201,7 @@ private function getAdvancedFilterTerms()
201201
$query = new \Elastica\Query(new \Elastica\Query\MatchAll());
202202
$query->setSize($limit);
203203

204-
$this->repositories = QubitSearch::getInstance()->index->getType('QubitRepository')->search($query);
204+
$this->repositories = QubitSearch::getInstance()->index['QubitRepository']->search($query);
205205
}
206206

207207
/**

‎apps/qubit/modules/repository/actions/holdingsAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@ public static function getHoldings($id, $page, $limit)
9191
$title = sprintf('i18n.%s.title.alphasort', sfContext::getInstance()->user->getCulture());
9292
$query->setSort([$title => 'asc']);
9393

94-
return QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
94+
return QubitSearch::getInstance()->index['QubitInformationObject']->search($query);
9595
}
9696
}

‎apps/qubit/modules/repository/actions/maintainedActorsAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ public static function getActors($repositoryId, $page, $limit)
8282
$field = sprintf('i18n.%s.authorizedFormOfName.alphasort', sfContext::getInstance()->user->getCulture());
8383
$query->setSort([$field => 'asc']);
8484

85-
return QubitSearch::getInstance()->index->getType('QubitActor')->search($query);
85+
return QubitSearch::getInstance()->index['QubitActor']->search($query);
8686
}
8787
}

‎apps/qubit/modules/search/actions/autocompleteAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function execute($request)
3939
$culture = $this->context->user->getCulture();
4040

4141
$client = QubitSearch::getInstance()->client;
42-
$index = QubitSearch::getInstance()->index->getInstance();
4342

4443
// Multisearch object
4544
$mSearch = new \Elastica\Multi\Search($client);
@@ -75,6 +74,7 @@ public function execute($request)
7574
];
7675

7776
foreach ($items as $item) {
77+
$index = QubitSearch::getInstance()->index[$item['type']]->getInstance();
7878
$search = new \Elastica\Search($client);
7979
$search->addIndex($index)->addType($index->getType($item['type']));
8080

‎apps/qubit/modules/search/actions/descriptionUpdatesAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function doSearch()
187187
$query->setFrom($limit * ($page - 1));
188188
$query->setSort(['createdAt' => 'desc']);
189189

190-
$resultSet = QubitSearch::getInstance()->index->getType($this->form->getValue('className'))->search($query);
190+
$resultSet = QubitSearch::getInstance()->index[$this->form->getValue('className')]->search($query);
191191

192192
// Page results
193193
$this->pager = new QubitSearchPager($resultSet);

‎apps/qubit/modules/search/actions/indexAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function execute($request)
4848
QubitAclSearch::filterDrafts($this->search->queryBool);
4949
$this->search->query->setQuery($this->search->queryBool);
5050

51-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($this->search->query);
51+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($this->search->query);
5252

5353
$total = $resultSet->getTotalHits();
5454
if (1 > $total) {

‎apps/qubit/modules/taxonomy/actions/indexAction.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function execute($request)
224224
$this->query->setSort(['updatedAt' => $request->sortDir]);
225225
}
226226

227-
$resultSet = QubitSearch::getInstance()->index->getType('QubitTerm')->search($this->query);
227+
$resultSet = QubitSearch::getInstance()->index['QubitTerm']->search($this->query);
228228

229229
// Return special response in JSON for XHR requests
230230
if ($request->isXmlHttpRequest()) {

‎apps/qubit/modules/term/actions/indexAction.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public function execute($request)
248248
QubitAclSearch::filterDrafts($this->search->queryBool);
249249
$this->search->query->setQuery($this->search->queryBool);
250250

251-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($this->search->query);
251+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($this->search->query);
252252

253253
// Page results
254254
$this->pager = new QubitSearchPager($resultSet);
@@ -328,7 +328,7 @@ protected function loadListTerms($request)
328328
$listQueryBool->addMust(new \Elastica\Query\Term(['taxonomyId' => $this->resource->taxonomyId]));
329329

330330
$listQuery->setQuery($listQueryBool);
331-
$this->listResultSet = QubitSearch::getInstance()->index->getType('QubitTerm')->search($listQuery);
331+
$this->listResultSet = QubitSearch::getInstance()->index['QubitTerm']->search($listQuery);
332332

333333
// Page list results
334334
$this->listPager = new QubitSearchPager($this->listResultSet);

‎apps/qubit/modules/term/actions/navigateRelatedComponent.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function getEsDocsRelatedToTerm($relatedModelClass, $term, $option
6262
QubitAclSearch::filterDrafts($search->queryBool);
6363
}
6464

65-
return QubitSearch::getInstance()->index->getType($relatedModelClass)->search($search->getQuery(false));
65+
return QubitSearch::getInstance()->index[$relatedModelClass]->search($search->getQuery(false));
6666
}
6767

6868
public static function getEsDocsRelatedToTermCount($relatedModelClass, $termId, $search = null)

‎lib/QubitLftSyncer.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private function repairEsChildrenLftValues()
9393
$results = QubitPdo::fetchAll($sql, $params, ['fetchMode' => PDO::FETCH_ASSOC]);
9494

9595
$bulk = new Elastica\Bulk(QubitSearch::getInstance()->client);
96-
$bulk->setIndex(QubitSearch::getInstance()->index->getName());
96+
$bulk->setIndex(QubitSearch::getInstance()->index['QubitInformationObject']->getName());
9797
$bulk->setType('QubitInformationObject');
9898

9999
foreach ($results as $row) {

‎lib/job/arRepositoryCsvExportJob.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function exportResults($path)
8585
{
8686
$itemsExported = 0;
8787

88-
$search = QubitSearch::getInstance()->index->getType('QubitRepository')->createSearch($this->search->getQuery(false, false));
88+
$search = QubitSearch::getInstance()->index['QubitRepository']->createSearch($this->search->getQuery(false, false));
8989

9090
$writer = new csvRepositoryExport($path, null, 10000);
9191
$writer->loadResourceSpecificConfiguration('QubitRepository');

‎lib/job/arUpdateEsActorRelationsJob.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static function previousRelationActorIds($actorId)
102102
{
103103
try {
104104
// Get actor's previously indexed relations from Elasticsearch
105-
$doc = QubitSearch::getInstance()->index->getType('QubitActor')->getDocument($actorId);
105+
$doc = QubitSearch::getInstance()->index['QubitActor']->getDocument($actorId);
106106

107107
return self::uniqueIdsFromRelationData($doc->getData()['actorRelations']);
108108
} catch (\Elastica\Exception\NotFoundException $e) {

‎lib/job/arUpdatePublicationStatusJob.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function runJob($parameters)
9191
'conflicts' => 'proceed',
9292
];
9393

94-
$response = QubitSearch::getInstance()->index->updateByQuery($query, $queryScript, $options)->getData();
94+
$response = QubitSearch::getInstance()->index['QubitTerm']->updateByQuery($query, $queryScript, $options)->getData();
9595

9696
$message = $this->i18n->__(
9797
'Index update completed in %1 ms.',

‎lib/model/QubitInformationObject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2183,7 +2183,7 @@ public static function getByTitleIdentifierAndRepo($identifier, $title, $repoNam
21832183

21842184
$query = new \Elastica\Query($queryBool);
21852185
$query->setSize(1);
2186-
$resultSet = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
2186+
$resultSet = QubitSearch::getInstance()->index['QubitInformationObject']->search($query);
21872187

21882188
if ($resultSet->count()) {
21892189
return $resultSet[0]->getId();

‎lib/model/QubitTerm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ public static function getEsTermsByTaxonomyId($taxonomyId, $limit = 10)
895895
$query = new \Elastica\Query($queryBool);
896896
$query->setSize($limit);
897897

898-
return QubitSearch::getInstance()->index->getType('QubitTerm')->search($query);
898+
return QubitSearch::getInstance()->index['QubitTerm']->search($query);
899899
}
900900

901901
/**

‎lib/task/propel/propelGenerateSlugsTask.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ private function getSlugStringFromES($id, $property)
311311
$query->setQuery($queryBool);
312312
$query->setSize(1);
313313

314-
$results = QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
314+
$results = QubitSearch::getInstance()->index['QubitInformationObject']->search($query);
315315

316316
if (!$results->count()) {
317317
return null;

‎lib/task/search/arDocumentTask.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function execute($arguments = [], $options = [])
3737
if (null !== $slugObject = QubitObject::getBySlug($arguments[slug])) {
3838
$this->log(sprintf("Fetching data for %s ID %d...\n", $slugObject->className, $slugObject->id));
3939

40-
$doc = QubitSearch::getInstance()->index->getType($slugObject->className)->getDocument($slugObject->id);
40+
$doc = QubitSearch::getInstance()->index[$slugObject->className]->getDocument($slugObject->id);
4141

4242
echo json_encode($doc->getData(), JSON_PRETTY_PRINT)."\n";
4343
} else {

‎lib/task/search/arSearchStatusTask.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private function objectsIndexed($docType)
7878
// Determine model class name from document type name
7979
$docTypeModelClass = 'Qubit'.ucfirst($docType);
8080

81-
return QubitSearch::getInstance()->index->getType($docTypeModelClass)->count();
81+
return QubitSearch::getInstance()->index[$docTypeModelClass]->count();
8282
}
8383

8484
private function objectsAvailableToIndex($docType)

‎lib/task/tools/updatePublicationStatusTask.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected function updatePublicationStatusDescendants($resource, $publicationSta
173173

174174
$options = ['conflicts' => 'proceed'];
175175

176-
$response = QubitSearch::getInstance()->index->updateByQuery($query, $queryScript, $options)->getData();
176+
$response = QubitSearch::getInstance()->index['QubitTerm']->updateByQuery($query, $queryScript, $options)->getData();
177177

178178
if (!empty($response['failures'])) {
179179
$this->failures += count($response['failures']);

0 commit comments

Comments
 (0)