Skip to content
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

Jump to bottom

Add paging to RSS results #366

Open
wants to merge 24 commits into
base: 7.x
Choose a base branch
from
Open

Add paging to RSS results #366

Changes from 8 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dea01bd
Add RSS limit option
May 30, 2019
03613bd
Add variable to install file
May 30, 2019
c2e79d4
Add paging to RSS results
Jun 10, 2019
fb390cc
Merge branch '7.x' of https:/Islandora/islandora_solr_sea…
Jun 10, 2019
e699f45
coding standards
Jun 10, 2019
92cc96b
Fix links
Jun 12, 2019
35a6575
fix encoding problem
Jun 12, 2019
730fb69
whoops semicolon
Jun 12, 2019
0a48be6
Change URL concatenation to drupal url function
Jun 13, 2019
1673240
Use drupal_get_query_parameters for page number
Jun 13, 2019
a930af2
Drupalize request parsing
Jun 14, 2019
8f694be
fix page_prev problem
Jun 17, 2019
7da5931
Everything works I think
Jun 17, 2019
07574b9
Remove unused variable
Jun 17, 2019
05975b0
Fix missing variable for link_prev
Jun 17, 2019
59f65b1
Remove page attribute from first page and do not print next link if n…
Jun 18, 2019
e6bc6a1
Paging starts at zero not one
Jun 19, 2019
0fb906d
Make links conditional
Jun 20, 2019
e088ddb
Remove empty link_prev
Jun 20, 2019
8daa6d1
Drupal functions to produce URLs
Jun 21, 2019
45dc075
Make it simpler
Jun 21, 2019
0450aaf
Fix the total problem
Jun 21, 2019
fd35ba3
Fix the first page link and make it Drupaly
Jun 24, 2019
4143e16
Remove debug messages
Jun 28, 2019
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
48 changes: 47 additions & 1 deletion islandora_solr_config/includes/rss_results.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class IslandoraSolrResultsRSS extends IslandoraSolrResults {
$channel = $this->rssChannel($query);
$rss_attributes = array('version' => '2.0');
drupal_alter('islandora_solr_config_rss_root_element_attributes', $rss_attributes, $channel, $items);

dd($channel);
bondjimbond marked this conversation as resolved.
Show resolved Hide resolved
// Give the results clean variable names.
$title = $channel['title'];
$url = $channel['url'];
Expand Down Expand Up @@ -191,7 +191,53 @@ class IslandoraSolrResultsRSS extends IslandoraSolrResults {
$result['url'] = $base_url;
$result['description'] = t('Aggregated search results of: @query', array('@query' => $query));
$result['langcode'] = NULL;

$feed_url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
bondjimbond marked this conversation as resolved.
Show resolved Hide resolved
if (strpos($feed_url, '&page') == FALSE) {
bondjimbond marked this conversation as resolved.
Show resolved Hide resolved
$page_number = '1';
}
else {
$arr = explode('&page=', $feed_url);
bondjimbond marked this conversation as resolved.
Show resolved Hide resolved
$page_number = $arr[1];
}
$link_self = $feed_url;
if (isset($arr)) {
$link_first = $arr[0];
}
else {
$link_first = $feed_url;
}
$page_next = $page_number + 1;
if ($page_number > 1) {
$page_prev = $page_number - 1;
}
$link_next = url($link_first . '&page=' . $page_next);
bondjimbond marked this conversation as resolved.
Show resolved Hide resolved
if (isset($page_prev)) {
$link_prev = $link_first . '&page=' . $page_prev;
}

$result['args'] = array(
array(
'key' => 'link',
'attributes' => array(
'rel' => 'next'),
'value' => $link_next,
'encoded' => TRUE,
),
array(
'key' => 'link',
'attributes' => array(
'rel' => 'previous'),
'value' => $link_prev,
'encoded' => TRUE,
),
array(
'key' => 'link',
'attributes' => array(
'rel' => 'first'),
'value' => $link_first,
'encoded' => TRUE,
),
array(
'key' => 'copyright',
'value' => $rss_channel['copyright']),
Expand Down