Skip to content

We no longer need to give $search parameter to searchobjects #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WilcoLouwerse wants to merge 3 commits into
base: main
Choose a base branch
from
Open

We no longer need to give $search parameter to searchobjects #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdf9240
We no longer need to give $search parameter to searchobjects
WilcoLouwerse Jul 2, 2024
6cf3f32
We need CoreBundle 1.4.13 or higher for this
WilcoLouwerse Jul 2, 2024
08ab4c6
And also update CountObject
WilcoLouwerse Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"minimum-stability": "dev",
"require": {
"php": ">=8.2",
"commongateway/corebundle": "^1.3.18 | <2.0",
"commongateway/corebundle": "^1.4.13 | <2.0",
"smalot/pdfparser": "^2.8"
},
"require-dev": {
Expand Down
12 changes: 6 additions & 6 deletions publiccode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ nl:
dependsOn:
open:
- name: CommonGateway
versionMin: 1.3
versionMax: 2.0
version: 1.3.18
versionMin: 1.4
versionMax: 1.5
version: 1.4.13
optional: false
- name: CoreBundle
versionMin: 1.3
versionMax: 2.0
version: 1.3.18
versionMin: 1.4
versionMax: 1.5
version: 1.4.13
optional: false
roadmap: null
inputTypes:
Expand Down
8 changes: 4 additions & 4 deletions src/Service/SitemapService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private function getSitemap(array $parameters): array
);

$publisherSchema = $this->resourceService->getSchema('https://commongateway.nl/woo.sitemap.schema.json', 'common-gateway/woo-bundle');
$publishers = $this->cacheService->searchObjects(null, ['oin' => $parameters['oin']], [$publisherSchema->getId()->toString()])['results'];
$publishers = $this->cacheService->searchObjects(['oin' => $parameters['oin']], [$publisherSchema->getId()->toString()])['results'];

if (count($publishers) === 0) {
$this->logger->error('Couldn\'t find a publisher for this oin: '.$parameters['oin'], ['plugin' => 'common-gateway/woo-bundle']);
Expand All @@ -233,7 +233,7 @@ private function getSitemap(array $parameters): array

// $filter = ['_limit' => 50000];
// Get all the publication objects with the given query.
$objects = $this->cacheService->searchObjects(null, $filter, [$publicatieSchema->getId()->toString()])['results'];
$objects = $this->cacheService->searchObjects($filter, [$publicatieSchema->getId()->toString()])['results'];

$sitemap = [];
foreach ($objects as $object) {
Expand Down Expand Up @@ -299,7 +299,7 @@ private function getSitemapindex(array $parameters): array
}

// Count all the publication objects with the given query.
$count = $this->cacheService->countObjects(null, $filter, [$publicatieSchema->getId()->toString()]);
$count = $this->cacheService->countObjects($filter, [$publicatieSchema->getId()->toString()]);
$pages = ((int) (($count - 1) / 50000) + 1);

// Get the domain of the request.
Expand Down Expand Up @@ -341,7 +341,7 @@ private function getRobot(array $parameters): array

$host = $this->requestStack->getMainRequest()->getHost();

$sitemaps = $this->cacheService->searchObjects(null, ['domains' => $host], [$sitemapSchema->getId()->toString()]);
$sitemaps = $this->cacheService->searchObjects(['domains' => $host], [$sitemapSchema->getId()->toString()]);

if (count($sitemaps['results']) === 1) {
$oin = $sitemaps['results'][0]['oin'];
Expand Down