SADE merge requestshttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests2023-11-14T08:17:37Zhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/74Release v5.4.32023-11-14T08:17:37ZMathias GoebelRelease v5.4.3Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/73fix: set develop for code-viewer dependency2023-06-07T15:23:19ZMathias Goebelfix: set develop for code-viewer dependencythere is no new release of this dependency, so we move to the develop
branch since this is used and tested successful on dev.there is no new release of this dependency, so we move to the develop
branch since this is used and tested successful on dev.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/71Release 5.3.52023-04-21T15:46:55ZMathias GoebelRelease 5.3.5This MR makes the app compatible to eXist 6.0.1.This MR makes the app compatible to eXist 6.0.1.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/70Develop2021-02-19T11:51:20ZMathias GoebelDevelophotfix removed app.xql still imported at view.xqlhotfix removed app.xql still imported at view.xqlMathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/69Bugfix/#142 errors in edited text2020-08-24T09:07:58ZMichelle WeidlingBugfix/#142 errors in edited textReverts most of the refactoring changes that have taken place in June since they produced a lot of errors.
The new module name as well as some comments and new function names have been kept.
Has been tested with `16b00`, which produced ...Reverts most of the refactoring changes that have taken place in June since they produced a lot of errors.
The new module name as well as some comments and new function names have been kept.
Has been tested with `16b00`, which produced an XHTML.Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/68more custom errors2020-08-24T06:41:46ZMathias Goebelmore custom errorsthis MR sets a custom error code when `tei:idno` has no contentthis MR sets a custom error code when `tei:idno` has no contentMichelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/67Feature/update docs2020-06-15T06:52:39ZMichelle WeidlingFeature/update docsDokusprint vom 12.06.2020Dokusprint vom 12.06.2020Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/65Improve index look-up (closes #139)2020-05-08T08:27:48ZMichelle WeidlingImprove index look-up (closes #139)Hardens the item look-up in the index files.
Before the hardening, #139 occurred because there were two files in `$ixp:dataCollection` which held the same `xml:id`, causing the look-up to throw an exception. With narrowing down the fi...Hardens the item look-up in the index files.
Before the hardening, #139 occurred because there were two files in `$ixp:dataCollection` which held the same `xml:id`, causing the look-up to throw an exception. With narrowing down the files in which the look-up is performed to the actual index files, we can be sure that we have no double ID entries (this is ensured in the TextGridLab).Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/66Fixes bug in tei:line processing, adds fictional places (closes #140)2020-05-08T08:23:56ZMichelle WeidlingFixes bug in tei:line processing, adds fictional places (closes #140)Adds a missing feature, displaying fictional places, for the print serialization of the indices.
Also there was a curious bug I cannot explain, cf. https://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/commit/f842e8e0d2f164d800900f74991e...Adds a missing feature, displaying fictional places, for the print serialization of the indices.
Also there was a curious bug I cannot explain, cf. https://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/commit/f842e8e0d2f164d800900f74991e6e37f4dce7f5#note_144194. In case there are better solutions for this problem I'd be happy to have them.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/63fix return for empty array2020-01-10T15:02:45ZMathias Goebelfix return for empty arraythis function is enabled for queries larger than one character. this MR sets the correct return (empty array) if a single char is given.
closes #135this function is enabled for queries larger than one character. this MR sets the correct return (empty array) if a single char is given.
closes #135Mathias GoebelMichelle WeidlingMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/64fix parser for index list for person in work index2020-01-06T14:09:37ZMathias Goebelfix parser for index list for person in work indexa index entry nested in a different index type, e.g. a (fictional) person listed in the index of works, the list name was not pared correctly.
this MR closes #134a index entry nested in a different index type, e.g. a (fictional) person listed in the index of works, the list name was not pared correctly.
this MR closes #134Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/62Feature/#107 requirements et2019-12-19T08:37:11ZMichelle WeidlingFeature/#107 requirements etThis MR implements all the requirements that haven't been met yet for the edited text.
Closes #107.This MR implements all the requirements that haven't been met yet for the edited text.
Closes #107.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/57Bugfix/#131 multi volume reference2019-12-19T08:32:33ZMichelle WeidlingBugfix/#131 multi volume referenceThis MR fixes the index issue that occurs when there are works with several books belongin to them.
This doesn't seem to affect the edited text at all.
Closes #131.This MR fixes the index issue that occurs when there are works with several books belongin to them.
This doesn't seem to affect the edited text at all.
Closes #131.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/58Implement entities in work index2019-11-29T11:46:19ZMichelle WeidlingImplement entities in work indexImplement entities in work index (closes #124), general formatting.
I'm not that happy about the fact that some code now has duplicates (`ixp:prepare-work` and `ixp:prepare-minified-work`) but I tried to make it as generic as possible.Implement entities in work index (closes #124), general formatting.
I'm not that happy about the fact that some code now has duplicates (`ixp:prepare-work` and `ixp:prepare-minified-work`) but I tried to make it as generic as possible.Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/60Commentary for sketches encompassing two pages2019-11-21T15:01:36ZMichelle WeidlingCommentary for sketches encompassing two pagesAter merging this MR editorial commentaries that refer two double sided sketches are displayed both on the left and the right page of the sketch.
Closes #123.Ater merging this MR editorial commentaries that refer two double sided sketches are displayed both on the left and the right page of the sketch.
Closes #123.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/61remove test on caching, closes #1322019-11-21T14:54:56ZMathias Goebelremove test on caching, closes #132since the caching function is not in use currently, we remove the test that takes a long time to prepare a ~37mb file with 373k lines.since the caching function is not in use currently, we remove the test that takes a long time to prepare a ~37mb file with 373k lines.Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/59Add translation of tei:surface/@n2019-11-21T14:21:07ZMichelle WeidlingAdd translation of tei:surface/@nAdds a translation of tei:surface/@n in the index views to achieve a consistens German labeling.
Closes #125.Adds a translation of tei:surface/@n in the index views to achieve a consistens German labeling.
Closes #125.Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/56using a deep-equal to filter for distinct notes. would be better to prevent...2019-11-18T07:32:23ZMathias Goebelusing a deep-equal to filter for distinct notes. would be better to prevent...using a deep-equal to filter for distinct notes. would be better to prevent double preparation, closes #127using a deep-equal to filter for distinct notes. would be better to prevent double preparation, closes #127Michelle WeidlingMichelle Weidlinghttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/55Closes #130, minor formatting2019-11-12T12:56:45ZMichelle WeidlingCloses #130, minor formattingSometimes in the index of literary sources ("Literaturverzeichnis") cases like these occur were we have a general bibliographic entry and two volumes belonging to it:
```xml
<bibl xmlns="http://www.tei-c.org/ns/1.0" xml:id="Varnhagen_18...Sometimes in the index of literary sources ("Literaturverzeichnis") cases like these occur were we have a general bibliographic entry and two volumes belonging to it:
```xml
<bibl xmlns="http://www.tei-c.org/ns/1.0" xml:id="Varnhagen_1836">
<choice>
<abbr>Varnhagen 1836</abbr>
<expan>Varnhagen von Ense, Karl August: Galerie von Bildnissen aus Rahel's Umgang und Briefwechsel. 2 Bände. Leipzig: Reichenbach 1836.</expan>
</choice>
<idno type="SWB" xml:base="http://swb.bsz-bw.de/DB=2.1/PRS=rdf/PPNSET?PPN=">028276094</idno>
<linkGrp targFunc="active passive">
<link corresp="http://bibframe.org/vocab/hasInstance" target="wrk:Varnhagen_Galerie_Werk #Varnhagen_1836"/>
</linkGrp>
<bibl xml:id="Varnhagen_1836_I">
<choice>
<abbr>Varnhagen 1836 I</abbr>
<expan>Varnhagen von Ense, Karl August: Galerie von Bildnissen aus Rahel's Umgang und Briefwechsel. Erster Theil. Leipzig: Reichenbach 1836.</expan>
</choice>
<idno type="URN" xml:base="http://nbn-resolving.de/urn/resolver.pl?urn=">urn:nbn:de:bvb:12-bsb10067589-4</idno>
<ptr type="fulltext" target="http://opacplus.bsb-muenchen.de/title/BV001166103/ft/bsb10067589?page=1"/>
<linkGrp targFunc="active passive"/>
</bibl>
<bibl xml:id="Varnhagen_1836_II">
<choice>
<abbr>Varnhagen 1836 II</abbr>
<expan>Varnhagen von Ense, Karl August: Galerie von Bildnissen aus Rahel's Umgang und Briefwechsel. Zweiter Theil. Leipzig: Reichenbach 1836.</expan>
</choice>
<idno type="URN" xml:base="http://nbn-resolving.de/urn/resolver.pl?urn=">urn:nbn:de:bvb:12-bsb10067590-2</idno>
<ptr type="fulltext" target="http://opacplus.bsb-muenchen.de/title/BV001166104/ft/bsb10067590?page=1"/>
<linkGrp targFunc="active passive"/>
</bibl>
</bibl>
```
Up until now this isn't considered and causes `ueberblickskommentar.xqm` to try to do string operations like `replace` on all descending `tei:abbr` which leads to the error
> It is a type error if, during the static analysis phase, an expression is found to have a static type that is not appropriate for the context in which the expression occurs, or during the dynamic evaluation phase, the dynamic type of a value does not match a required type as specified by the matching rules in 2.5.4 SequenceType Matching. Invalid cardinality for parameter $vp0. Expected zero or one, got 3.
This MR solves this issue (closes #130).Mathias GoebelMathias Goebelhttps://gitlab.gwdg.de/fontane-notizbuecher/SADE/-/merge_requests/54Feature/#121 index fontanes works in title2019-11-06T08:21:44ZMichelle WeidlingFeature/#121 index fontanes works in titleImplementiert eine Referenz auf den Personenregistereintrag "Fontane" bei den Werken Theodor Fontanes.
Closes #121.Implementiert eine Referenz auf den Personenregistereintrag "Fontane" bei den Werken Theodor Fontanes.
Closes #121.Michelle WeidlingMichelle Weidling