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.

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

update to eXist 5 #376

Merged
merged 40 commits into from
Dec 10, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6fa2622
apply some fixes for current eXist-db 4.7
peterstadler May 28, 2019
0ba0ded
add collation for sorting of facets
peterstadler May 29, 2019
1072455
some speedups for eXist 4.7
peterstadler Apr 27, 2020
bdf098c
add `norm:create-norm-doc-documents()`
peterstadler Apr 28, 2020
d3c2c8a
response data is always an array
peterstadler Apr 28, 2020
2681650
Merge branch 'develop' into test-4.7
peterstadler Sep 25, 2020
77e9fda
Merge branch 'develop' into test-4.7
peterstadler Sep 29, 2020
9c7ed8f
Merge branch 'develop' into test-4.7
peterstadler Sep 29, 2020
4005093
move functions
peterstadler Sep 30, 2020
f58fbbd
refactor to use eXist5 facets and fields
peterstadler Sep 30, 2020
c3b3eab
remove outdated stuff
peterstadler Sep 30, 2020
46eadb8
move `strip-diacritics()` to WeGA-WebApp-lib str module
peterstadler Sep 30, 2020
21af8d5
get rid of norm module completely
peterstadler Sep 30, 2020
186c334
fix `core:undated`
peterstadler Sep 30, 2020
9a3766c
declare namespace
peterstadler Sep 30, 2020
df76556
remove superfluous lines
peterstadler Oct 1, 2020
afcf3b7
refactor `core:undated()` to use date filter
peterstadler Oct 1, 2020
5d40748
add function `core:index-keys-for-field()`
peterstadler Oct 1, 2020
82b7b6c
fix filtering
peterstadler Oct 2, 2020
2906dd2
Merge branch 'develop' into test-4.7
peterstadler Oct 8, 2020
ec89ce4
set semver-min
peterstadler Nov 9, 2020
65baecd
update processing/filtering of tests
peterstadler Nov 9, 2020
b54447f
Merge branch 'develop' into test-4.7
peterstadler Nov 23, 2020
a3a8f94
Merge branch 'develop' into test-4.7
peterstadler Nov 23, 2020
c0f04b8
update Dockerfile to use eXist5.2.0
peterstadler Nov 30, 2020
fb4ef35
use local curl binary
peterstadler Nov 30, 2020
b4215c1
update (some) expected results
peterstadler Nov 30, 2020
d03a894
add dependencies
peterstadler Nov 30, 2020
99b486d
getting saxon from sourceforge
peterstadler Nov 30, 2020
dff6de5
try to reduce memory consumption
peterstadler Nov 30, 2020
231cb2c
normalize characterNames
peterstadler Nov 30, 2020
f450351
update expected results
peterstadler Nov 30, 2020
b049fd2
try more recent distro for travis
peterstadler Nov 30, 2020
307dd3a
Merge branch 'develop' into test-4.7
peterstadler Dec 2, 2020
894c153
ups, never meant to commit these files
peterstadler Dec 2, 2020
5d8139a
exclude xpr-files from the xar package
peterstadler Dec 2, 2020
33b672d
Merge branch 'develop' into test-4.7
peterstadler Dec 2, 2020
914136e
refactor some API endpoints
peterstadler Dec 7, 2020
ea19a17
Merge branch 'develop' into test-4.7
peterstadler Dec 8, 2020
a9581e8
update Readme
peterstadler Dec 10, 2020
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
update (some) expected results
  • Loading branch information
peterstadler committed Nov 30, 2020
commit b4215c195f9ab5e14f4554e8c49df515041adcde
6 changes: 3 additions & 3 deletions testing/expected-results/diaries/A060026.html
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h2>
<span><span class="tei_hi_latintype">Visite</span> bey <a class="preview persons A002156" href="">Fräul. <span class="tei_hi_latintype">Winkel</span></a>.</span>
<span>nach Hause.</span>
<span><a class="preview letters A041017" href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz/A041017.html">geschrieben</a> <span class="tei_hi_underline1">an <a class="preview persons A000213" href="/exist/apps/WeGA-WebApp/de/A000213.html">Lina</a></span></span> <br />
<span>und <span class="preview writings A030050" data-ref=" ">Aufsaz <span class="tei_del">über</span><a class="noteMarker" id="ref-d10e107" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e107">‡</a> <span class="tei_hi_underline1">an die Kunstliebenden Bewohner <a class="preview places A130003" href="">Dresdens</a></span></span> geschrieben<a class="noteMarker" href="/exist/apps/WeGA-WebApp/de/A009004/Themenkommentare/A090010.html">T</a>.</span> <br />
<span>und <span class="preview writings A030050" data-ref=" ">Aufsaz <span class="tei_del">über</span><a class="noteMarker" id="ref-d10e105" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e105">‡</a> <span class="tei_hi_underline1">an die Kunstliebenden Bewohner <a class="preview places A130003" href="">Dresdens</a></span></span> geschrieben<a class="noteMarker" href="/exist/apps/WeGA-WebApp/de/A009004/Themenkommentare/A090010.html">T</a>.</span> <br />
<span class="payment_12">Semmel </span>
</p>
</div>
Expand Down Expand Up @@ -446,8 +446,8 @@ <h3 class="media-heading">Textkonstitution</h3>
<ul class="apparatus textConstitution">
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e107" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e107" data-title="Löschung" data-counter="1" data-href="#d10e107"><span class="tei_lemma">„über“</span>durchgestrichen.</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e105" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e105" data-title="Löschung" data-counter="1" data-href="#d10e105"><span class="tei_lemma">„über“</span>durchgestrichen.</div>
</div>
</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions testing/expected-results/diaries/A060406.html
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ <h2>
<span><span class="tei_hi_underline1">4 Uhr <span class="tei_hi_latintype"><span class="77105115101114101114101">Miserere</span></span> <span class="tei_hi_latintype"><a class="preview persons A001393" href="">Naumann</a></span></span>.</span>
<span>ins Theater</span> <br />
<span>dann <span class="tei_hi_underline1"><span class="tei_hi_latintype"><a class="preview works A020002" href="">Agnus Dei</a></span> vollendet</span>.</span>
<span>Brief von <span class="tei_hi_underline1"><a class="preview persons A002374" href="">Löhle</a></span> <span class="tei_add tei_hi_superscript"><span class="tei_measure">3.<span class="suppliedCurrencySymbol"> gr</span></span> <span class="tei_measure">6.<span class="suppliedCurrencySymbol"> pf</span></span><a class="noteMarker" id="ref-d10e144" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e144">‡</a></span>. und <span class="tei_hi_underline1"><a class="preview persons A000214" href="">Mutter</a></span> erhalten</span>
<span>Brief von <span class="tei_hi_underline1"><a class="preview persons A002374" href="">Löhle</a></span> <span class="tei_add tei_hi_superscript"><span class="tei_measure">3.<span class="suppliedCurrencySymbol"> gr</span></span> <span class="tei_measure">6.<span class="suppliedCurrencySymbol"> pf</span></span><a class="noteMarker" id="ref-d10e142" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e142">‡</a></span>. und <span class="tei_hi_underline1"><a class="preview persons A000214" href="">Mutter</a></span> erhalten</span>
</p>
</div>
<div class="tableRight">
Expand Down Expand Up @@ -452,8 +452,8 @@ <h3 class="media-heading">Textkonstitution</h3>
</li>
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e144" class="apparatus-link">3.</a></div>
<div class="apparatusEntry col-11" id="d10e144" data-title="Hinzufügung" data-counter="3" data-href="#d10e144"><span class="tei_lemma">„<span class="tei_measure_inline">3.</span> <span class="tei_measure_inline">6.</span>“</span>über der Zeile hinzugefügt.</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e142" class="apparatus-link">3.</a></div>
<div class="apparatusEntry col-11" id="d10e142" data-title="Hinzufügung" data-counter="3" data-href="#d10e142"><span class="tei_lemma">„<span class="tei_measure_inline">3.</span> <span class="tei_measure_inline">6.</span>“</span>über der Zeile hinzugefügt.</div>
</div>
</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions testing/expected-results/diaries/A060490.html
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,13 @@ <h2>
<span>an <a class="preview persons A000825" href="">Herzog von <span class="tei_hi_latintype">Cambridge</span></a> und <a class="preview persons A004817" href="">König von <span class="tei_placeName"><span class="tei_country">Frankreich</span></span></a> <br />
<a class="preview letters A041416" href="">geschrieben</a>.</span>
<span>um 9 Uhr zu <a class="preview persons A001590" href="">Rochlitz</a>.</span>
<span><span class="tei_hi_underline1">um 10 Uhr ChorProb<span class="tei_supplied" id="d10e37"><span class="brackets_supplied">[</span>e<span class="brackets_supplied">]</span></span></span> <br />
<span><span class="tei_hi_underline1">um 10 Uhr ChorProb<span class="tei_supplied" id="d10e36"><span class="brackets_supplied">[</span>e<span class="brackets_supplied">]</span></span></span> <br />
<span class="tei_hi_underline1"><span class="tei_hi_latintype"><a class="preview works A020386" href="">Jacob</a></span></span>.</span>
<span><span class="preview works A020090 A020091 A020170 A020171 A020177 A020178 A020179" data-ref=" ">Volkslieder</span> notirt.</span>
<span>überlaufen.</span>
<span class="payment_6">Abschrift <a class="preview writings A031251" href="/exist/apps/WeGA-WebApp/de/A002068/Schriften/A031251.html">Schlambeizger</a> <span class="tei_hi_latintype">pp</span> </span> <br />
<span class="payment_7">Rosinen und Mandeln für <a class="preview persons A000213" href="/exist/apps/WeGA-WebApp/de/A000213.html">Lina</a> </span> <br />
<span><span class="tei_del"><span class="tei_hi_latintype">Concert</span> des <a class="preview persons A001631" href="/exist/apps/WeGA-WebApp/de/A001631.html">H: Nani</a>. dann bey <span class="tei_hi_latintype"><span class="preview persons A000389" data-ref="">Dillons</span></span></span><a class="noteMarker" id="ref-d10e87" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e87">‡</a>.</span>
<span><span class="tei_del"><span class="tei_hi_latintype">Concert</span> des <a class="preview persons A001631" href="/exist/apps/WeGA-WebApp/de/A001631.html">H: Nani</a>. dann bey <span class="tei_hi_latintype"><span class="preview persons A000389" data-ref="">Dillons</span></span></span><a class="noteMarker" id="ref-d10e84" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e84">‡</a>.</span>
<span>Abends <span class="tei_hi_underline2andMore"><span class="tei_hi_latintype"><a class="preview works A020450" href="">Die <br />
Blinden von Toledo</a> zum Erstenmale</span></span>. ging sehr gut.</span>
</p>
Expand Down Expand Up @@ -456,8 +456,8 @@ <h3 class="media-heading">Textkonstitution</h3>
<ul class="apparatus textConstitution">
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e87" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e87" data-title="Löschung" data-counter="1" data-href="#d10e87"><span class="tei_lemma">„<span class="tei_hi_latintype">Concert</span> des <a class="preview persons A001631" href="/exist/apps/WeGA-WebApp/de/A001631.html">H: Nani</a>. dann bey <span class="tei_hi_latintype"><span class="preview persons A000389" data-ref="">Dillons</span></span>“</span>durchgestrichen.</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e84" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e84" data-title="Löschung" data-counter="1" data-href="#d10e84"><span class="tei_lemma">„<span class="tei_hi_latintype">Concert</span> des <a class="preview persons A001631" href="/exist/apps/WeGA-WebApp/de/A001631.html">H: Nani</a>. dann bey <span class="tei_hi_latintype"><span class="preview persons A000389" data-ref="">Dillons</span></span>“</span>durchgestrichen.</div>
</div>
</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions testing/expected-results/diaries/A060655.html
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ <h2>
<span><span class="tei_hi_underline1">um 11 Uhr Probe vom <a class="preview works A020727" href="">Fischermädchen</a></span>.</span>
<span>spazieren.</span>
<span>abends <br />
in <span class="tei_hi_underline1"><span class="tei_hi_latintype"><span class="preview works A020819" data-ref=""><span class="tei_sic">Moametto</span><a class="noteMarker" id="ref-d10e25" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e25">‡</a></span></span></span>.</span>
in <span class="tei_hi_underline1"><span class="tei_hi_latintype"><span class="preview works A020819" data-ref=""><span class="tei_sic">Moametto</span><a class="noteMarker" id="ref-d10e24" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e24">‡</a></span></span></span>.</span>
<span>Schmidels Töchter zum Thee bey <a class="preview persons A000213" href="/exist/apps/WeGA-WebApp/de/A000213.html">Lina</a>.</span> <br />
<span><span class="tei_hi_underline1">Zum 1<span class="tei_hi_superscript">t</span> male Eingeheizt</span>.</span>
</p>
Expand Down Expand Up @@ -426,8 +426,8 @@ <h3 class="media-heading">Textkonstitution</h3>
<ul class="apparatus textConstitution">
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e25" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e25" data-title="sic" data-counter="1" data-href="#d10e25"><span class="tei_lemma">„Moametto“</span>sic!</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e24" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e24" data-title="sic" data-counter="1" data-href="#d10e24"><span class="tei_lemma">„Moametto“</span>sic!</div>
</div>
</li>
</ul>
Expand Down
14 changes: 7 additions & 7 deletions testing/expected-results/diaries/A060725.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@ <h2>
<span class="tei_date">d: 26<span class="tei_hi_superscript">t</span></span>
<span>schlechte Nacht.</span>
<span>übriges ziemlich gut.</span>
<span>um 10 Uhr mit <span class="preview persons A002404" data-ref=""><span class="tei_add tei_hi_superscript">Kar<a class="noteMarker" id="ref-d10e17" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e17">‡</a></span> Schmidl</span> <br />
<span>um 10 Uhr mit <span class="preview persons A002404" data-ref=""><span class="tei_add tei_hi_superscript">Kar<a class="noteMarker" id="ref-d10e15" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e15">‡</a></span> Schmidl</span> <br />
zu <a class="preview persons A007999" href="">Mlle: Ertel</a> als Stellvertreterin <a class="preview persons A001251" href="">Ihro Majestät der Königin</a></span> <br />
<span><span class="tei_hi_underline1">um 3 Uhr Nachmittag wurde unser geliebtes <a class="preview persons A002083" href="">Töchterlein</a></span> <br />
<span class="tei_hi_underline1">in den Schooß der Christenheit aufgenommen durch</span> <br />
<span class="tei_hi_underline1">den <a class="preview persons A001704" href="">Herrn Pater <span class="tei_hi_latintype">Superior</span> Schmidt</a>. in der Katholischen</span> <br />
<span class="tei_hi_underline1">Hofkirche</span>.</span>
<span>Pathen waren Ihro Majestäten der <br />
<span class="tei_hi_underline2andMore"><a class="preview persons A000537" href="">König</a></span> und die <span class="tei_hi_underline2andMore"><a class="preview persons A001251" href="">Königin</a></span>, Ihre Stellen vertraten <br />
<span class="tei_hi_latintype">mirabile dictu</span> – der <span class="tei_hi_underline1"><a class="preview persons A002402" href="">Kammerdiener</a></span> und die <span class="tei_hi_underline1"><a class="preview persons A007999" href="">Kam<span class="tei_supplied" id="d10e86"><span class="brackets_supplied">[</span>mer<span class="brackets_supplied">]</span></span>dienerin</a></span>. <br />
<span class="tei_hi_latintype">mirabile dictu</span> – der <span class="tei_hi_underline1"><a class="preview persons A002402" href="">Kammerdiener</a></span> und die <span class="tei_hi_underline1"><a class="preview persons A007999" href="">Kam<span class="tei_supplied" id="d10e84"><span class="brackets_supplied">[</span>mer<span class="brackets_supplied">]</span></span>dienerin</a></span>. <br />
<a class="preview persons A002402" href="">H: <span class="tei_hi_underline1">Schmidl</span></a> und <a class="preview persons A007999" href="">Mlle: <span class="tei_hi_underline1">Ertel</span></a>.</span>
<span>Gott gebe seinen <br />
Segen!!!</span>
Expand All @@ -390,7 +390,7 @@ <h2>
<span class="payment_11">2 Torten </span> <br />
<span class="payment_12">2 Teller mit Bisquit <span class="tei_hi_latintype">pp</span> </span> <br />
<span class="payment_13"><span class="tei_hi_latintype">dito</span> zum Kaffee </span> <br />
<span class="payment_14">2 Bäben <span class="tei_add tei_hi_superscript"><span class="tei_measure">1 rh</span><a class="noteMarker" id="ref-d10e219" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e219">‡</a></span> und 2 Bouth: Wein für die Hebamme und Stuhlfrau </span> <br />
<span class="payment_14">2 Bäben <span class="tei_add tei_hi_superscript"><span class="tei_measure">1 rh</span><a class="noteMarker" id="ref-d10e216" data-toggle="popover" data-trigger="focus" tabindex="0" data-ref="#d10e216">‡</a></span> und 2 Bouth: Wein für die Hebamme und Stuhlfrau </span> <br />
<span class="payment_15">dem Kutscher der <a class="preview persons A007999" href="">Mlle: Ertel</a> </span> <br />
<span class="payment_16">Ihrem Bedienten 1 Both: Wein </span>
</p>
Expand Down Expand Up @@ -458,14 +458,14 @@ <h3 class="media-heading">Textkonstitution</h3>
<ul class="apparatus textConstitution">
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e17" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e17" data-title="Hinzufügung" data-counter="1" data-href="#d10e17"><span class="tei_lemma">„Kar“</span>über der Zeile hinzugefügt.</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e15" class="apparatus-link">1.</a></div>
<div class="apparatusEntry col-11" id="d10e15" data-title="Hinzufügung" data-counter="1" data-href="#d10e15"><span class="tei_lemma">„Kar“</span>über der Zeile hinzugefügt.</div>
</div>
</li>
<li>
<div class="row">
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e219" class="apparatus-link">2.</a></div>
<div class="apparatusEntry col-11" id="d10e219" data-title="Hinzufügung" data-counter="2" data-href="#d10e219"><span class="tei_lemma">„<span class="tei_measure_inline">1 rh</span>“</span>über der Zeile hinzugefügt.</div>
<div class="col-1 text-nowrap"><a href="#transcription" data-href="#ref-d10e216" class="apparatus-link">2.</a></div>
<div class="apparatusEntry col-11" id="d10e216" data-title="Hinzufügung" data-counter="2" data-href="#d10e216"><span class="tei_lemma">„<span class="tei_measure_inline">1 rh</span>“</span>über der Zeile hinzugefügt.</div>
</div>
</li>
</ul>
Expand Down
Loading