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

adding a search session and query parameter to singleViews, closes #282 #329

Merged
merged 7 commits into from
Nov 22, 2019
Merged

adding a search session and query parameter to singleViews, closes #282 #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d7e09a
add processing and styling of exist:match elements #282
peterstadler Nov 10, 2019
834ff43
add lucene search to single views #282
peterstadler Nov 10, 2019
c7776c5
pass query parameter from search page to subsequent single view #282
peterstadler Nov 10, 2019
ccc0c37
store search results in session
peterstadler Nov 12, 2019
866fe58
first shot at adding a search navigation in document singleView #282
peterstadler Nov 12, 2019
20c8cc4
add search navigation to further singleViews #282
peterstadler Nov 13, 2019
09bd1af
improve links
peterstadler Nov 13, 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
Prev Previous commit
Next Next commit
first shot at adding a search navigation in document singleView #282
  • Loading branch information
@peterstadler
peterstadler committed Nov 13, 2019
commit 866fe58c776be067726bb3fefab110a626b20c2f
20 changes: 20 additions & 0 deletions modules/search.xqm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import module namespace str="http://xquery.weber-gesamtausgabe.de/modules/str" a
import module namespace wdt="http://xquery.weber-gesamtausgabe.de/modules/wdt" at "wdt.xqm";
import module namespace lang="http://xquery.weber-gesamtausgabe.de/modules/lang" at "lang.xqm";
import module namespace wega-util="http://xquery.weber-gesamtausgabe.de/modules/wega-util" at "wega-util.xqm";
import module namespace controller="http://xquery.weber-gesamtausgabe.de/modules/controller" at "controller.xqm";
import module namespace app="http://xquery.weber-gesamtausgabe.de/modules/app" at "app.xqm";
import module namespace functx="http://www.functx.com";

declare variable $search:ERROR := QName("http://xquery.weber-gesamtausgabe.de/modules/search", "Error");
Expand Down Expand Up @@ -459,3 +461,21 @@ declare %private function search:search-session($model as map(), $callback as fu
then session:get-attribute('wegasearch')
else $callback($updatedModel)
};

declare
%templates:wrap
function search:get-session-for-singleview($node as node(), $model as map(*)) as map()? {
let $wegasearch := session:get-attribute('wegasearch')
let $index-of-current-doc := functx:index-of-node($wegasearch?search-results?doc, $model?doc)
let $url := controller:resolve-link('$link/search', $model) || '?q=' || $wegasearch?query-string-org || '&d=' || string-join($wegasearch?query-docTypes, '&d=')
let $search-prev-item-url := app:createUrlForDoc($wegasearch?search-results[$index-of-current-doc - 1]?doc, $model?lang) || '?q=' || $wegasearch?query-string-org
let $search-next-item-url := app:createUrlForDoc($wegasearch?search-results[$index-of-current-doc + 1]?doc, $model?lang) || '?q=' || $wegasearch?query-string-org
return
map:merge((
$wegasearch,
map:entry('index-of-current-doc', $index-of-current-doc),
map:entry('search-backlink', $url),
map:entry('search-prev-item-url', $search-prev-item-url),
map:entry('search-next-item-url', $search-next-item-url)
))
};
57 changes: 36 additions & 21 deletions templates/document.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,43 @@ <h1 class="document" data-template="app:document-title">CARL MARIA VON WEBER AN
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="$link/index">Home</a>
</li>
<li>
<a data-template="app:breadcrumb-person">Carl Maria von Weber</a>
</li>
<li>
<a data-template="app:breadcrumb-docType">Korrespondenz</a>
</li>
<li>
<span data-template="app-shared:print" data-template-key="docID">A040080</span> <span data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no">
<span data-template="app:status" class="docStatus">in Bearbeitung</span>
</span>
</li>
</ol>
<div data-template="templates:if-parameter-unset" data-template-param="q">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="$link/index">Home</a>
</li>
<li>
<a data-template="app:breadcrumb-person">Carl Maria von Weber</a>
</li>
<li>
<a data-template="app:breadcrumb-docType">Korrespondenz</a>
</li>
<li>
<span data-template="app-shared:print" data-template-key="docID">A040080</span> <span data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no">
<span data-template="app:status" class="docStatus">in Bearbeitung</span>
</span>
</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"/>
<span data-template="lang:translate">back</span>
</div>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"/>
<span data-template="lang:translate">back</span>
</div>
<div data-template="templates:if-parameter-set" data-template-param="q">
<div class="row" data-template="search:get-session-for-singleview">
<div class="col-md-4">
<a href="$link/search" data-template="app-shared:set-attr" data-template-attr="href" data-template-key="search-prev-item-url"><i class="fa fa-arrow-left"/> Zurück in der Trefferliste</a>
</div>
<div class="col-md-4">
<span data-template="app-shared:print" data-template-key="index-of-current-doc">15</span> / <a href="$link/search" data-template="app-shared:set-attr" data-template-attr="href" data-template-key="search-backlink"><span data-template="search:results-count">124 Suchergebnisse</span></a>
</div>
<div class="col-md-4">
<a href="$link/search" data-template="app-shared:set-attr" data-template-attr="href" data-template-key="search-next-item-url">Vor in der Trefferliste <i class="fa fa-arrow-right"/></a>
</div>
</div>
</div>
</div>
Expand Down