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

allow for different authors in the URL, closes #316 #333

Merged
merged 13 commits into from
Nov 28, 2019
Merged

allow for different authors in the URL, closes #316 #333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2c3bac5
fix breadcrumbs and URL rewritings for multiple authors #316
peterstadler Nov 14, 2019
7f530c7
fix breadcrumb for authors without key #316
peterstadler Nov 14, 2019
66bf5a1
fix csLink for multiple authors/senders #316
peterstadler Nov 14, 2019
7ae91b9
improve jsonld output for multiple authors #316
peterstadler Nov 15, 2019
9df9c34
update expected results
peterstadler Nov 15, 2019
7ca6c6f
keep author/sender context for links #316
peterstadler Nov 25, 2019
b1bd45a
Merge branch 'develop' into issue-316
peterstadler Nov 25, 2019
d2e0eb7
fix breadcrumb
peterstadler Nov 25, 2019
3cbc9d9
small fix
peterstadler Nov 25, 2019
c85116b
check explicitly for sequences
peterstadler Nov 25, 2019
dfbd1ba
update expected results
peterstadler Nov 25, 2019
a24d273
only output context when there's more than a senderID
peterstadler Nov 25, 2019
73be194
update expected results
peterstadler Nov 25, 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
only output context when there's more than a senderID
  • Loading branch information
@peterstadler
peterstadler committed Nov 25, 2019
commit a24d27368583e8b61c858603002de4b02d802dfd
11 changes: 8 additions & 3 deletions modules/app.xqm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,11 @@ declare
};


(:~
: Add context information to the current model map
: NB: If no context information is found, an empty sequence will be returned
: effectively removing the HTML subtree under $node from the output.
:)
declare
%templates:wrap
function app:context($node as node(), $model as map(*)) as map(*)? {
Expand All @@ -1522,12 +1527,12 @@ declare
switch($model?docType)
case 'letters' return map:merge((
query:context-relatedItems($model?doc),
query:correspContext($model?doc, $senderID),
map:entry('senderID', $senderID)
query:correspContext($model?doc, $senderID)
))
default return query:context-relatedItems($model?doc)
return
if(wega-util-shared:has-content($context)) then $context
if(wega-util-shared:has-content($context))
then map:merge(($context, map:entry('senderID', $senderID)))
else ()
};

Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030006.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Aufführungsbesprechung München: Dez. 1812, 1. Abonnements
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span>Anonymus</span>
</li>
<li>
<span>Schriften</span>
</li>
<li>
<span>A030006</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span>Anonymus</span>
</li>
<li>
<span>Schriften</span>
</li>
<li>
<span>A030006</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030013.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Über die Oper „Undine“ von Motte-Fouqué und Hoffmann
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030013</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030013</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030124.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Chronik der Königl. Schaubühne zu Dresden vom 30. April 1
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span>Anonymus</span>
</li>
<li>
<span>Schriften</span>
</li>
<li>
<span>A030124</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span>Anonymus</span>
</li>
<li>
<span>Schriften</span>
</li>
<li>
<span>A030124</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030129.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Dramatisch-musikalische Notizen (Dresden): "Das Waisenhaus"
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030129</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030129</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030135.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,30 +212,33 @@ <h1 class="document">Beurteilungen aus Dresden vom 9. Juni 1817</h1>
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A000194/Schriften">Schriften</a>
</li>
<li>
<span>A030135</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A000194/Schriften">Schriften</a>
</li>
<li>
<span>A030135</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
49 changes: 26 additions & 23 deletions testing/expected-results/writings/A030169.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,30 +212,33 @@ <h1 class="document">Über das Instrument Terpodion. (Labesang.)</h1>
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030169</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Schriften">Schriften</a>
</li>
<li>
<span>A030169</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down
Loading