From 048a68a3a044d192e14c097187dd0de030c49388 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 3 Jan 2018 19:49:47 +0100 Subject: [PATCH 1/7] small css fix for popover, closes #214 --- resources/less/gui.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/less/gui.less b/resources/less/gui.less index ffbf16cbe..d0859d682 100644 --- a/resources/less/gui.less +++ b/resources/less/gui.less @@ -39,12 +39,6 @@ /* Settings for popovers */ .popover { - div.media-body { - width: 75%; - margin: 0; - padding-left:3px; - float:left; - } div.preview-icon { width: 25%; margin: 0; @@ -80,6 +74,12 @@ overflow: scroll; overflow-x:hidden; overflow-y:auto; + > div.media-body { + width: 75%; + margin: 0; + padding-left:3px; + float:left; + } } .carousel-indicators { bottom:-60px; From 72c94c83f9d327a921820125b4784e7d971a91c6 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 4 Jan 2018 19:39:04 +0100 Subject: [PATCH 2/7] removed duplicate filtering --- modules/wdt.xqm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wdt.xqm b/modules/wdt.xqm index 3faea22e2..6dd6951ce 100644 --- a/modules/wdt.xqm +++ b/modules/wdt.xqm @@ -639,7 +639,7 @@ declare function wdt:biblio($item as item()*) as map(*) { $filter($item) }, 'filter-by-person' := function($personID as xs:string) as document-node()* { - wdt:biblio($item)('filter')()//tei:author[@key = $personID]/root() | wdt:biblio($item)('filter')()//tei:editor[@key = $personID]/root() => $filter() + ($item/root()//tei:author[@key = $personID]/root() | $item/root()//tei:editor[@key = $personID]/root()) => $filter() }, 'filter-by-date' := function($dateFrom as xs:date?, $dateTo as xs:date?) as document-node()* { $wdt:filter-by-date($item, $dateFrom, $dateTo)[parent::tei:imprint]/root() => $filter() From 1117f3f80d7c834d7134ab8e308d078fda702e76 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 4 Jan 2018 19:40:24 +0100 Subject: [PATCH 3/7] small adjustment to remove error message in log files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error message was: „ERROR (NativeStructuralIndexWorker.java [findAncestorsByTagName]:256) - Error while searching structural index: null“ --- modules/wdt.xqm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wdt.xqm b/modules/wdt.xqm index 6dd6951ce..ce4a0117c 100644 --- a/modules/wdt.xqm +++ b/modules/wdt.xqm @@ -625,7 +625,7 @@ declare function wdt:var($item as item()*) as map(*) { declare function wdt:biblio($item as item()*) as map(*) { let $filter := function($docs as document-node()*) as document-node()* { - $docs[descendant-or-self::tei:biblStruct][not(ancestor-or-self::tei:TEI)][not(descendant::tei:TEI)]/root() | $docs[ancestor::tei:biblStruct][not(ancestor::tei:TEI)]/root() + $docs[descendant-or-self::tei:biblStruct][not(ancestor-or-self::tei:TEI)][not(descendant::tei:TEI)]/root() | $docs[ancestor-or-self::tei:biblStruct][not(ancestor::tei:TEI)]/root() } return map { From 8f442a38cce90166864ff79d44998f181f7b6ddf Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 4 Jan 2018 21:15:16 +0100 Subject: [PATCH 4/7] more replacements of `ancestor` with `ancestor-or-self` to avoid errors in the logs --- modules/wdt.xqm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/wdt.xqm b/modules/wdt.xqm index ce4a0117c..59ac85124 100644 --- a/modules/wdt.xqm +++ b/modules/wdt.xqm @@ -29,13 +29,13 @@ declare function wdt:orgs($item as item()*) as map(*) { else false() }, 'filter' := function() as document-node()* { - $item[descendant-or-self::tei:org][descendant-or-self::tei:orgName]/root() | $item[ancestor::tei:org]/root() + $item[descendant-or-self::tei:org][descendant-or-self::tei:orgName]/root() | $item[ancestor-or-self::tei:org]/root() }, 'filter-by-person' := function($personID as xs:string) as document-node()* { () }, 'filter-by-date' := function($dateFrom as xs:date?, $dateTo as xs:date?) as document-node()* { - $wdt:filter-by-date($item, $dateFrom, $dateTo)[ancestor::tei:org]/root() + $wdt:filter-by-date($item, $dateFrom, $dateTo)[ancestor-or-self::tei:org]/root() }, 'sort' := function($params as map(*)?) as document-node()* { if(sort:has-index('orgs')) then () @@ -88,14 +88,14 @@ declare function wdt:persons($item as item()*) as map(*) { else false() }, 'filter' := function() as document-node()* { - $item[descendant-or-self::tei:person][descendant-or-self::tei:persName]/root() | $item[ancestor::tei:person]/root() + $item[descendant-or-self::tei:person][descendant-or-self::tei:persName]/root() | $item[ancestor-or-self::tei:person]/root() }, 'filter-by-person' := function($personID as xs:string) as document-node()* { (:distinct-values((norm:get-norm-doc('letters')//@addresseeID[contains(., $personID)]/parent::norm:entry | norm:get-norm-doc('letters')//@authorID[contains(., $personID)]/parent::norm:entry)/(@authorID, @addresseeID)/tokenize(., '\s+'))[. != $personID] ! core:doc(.):) () }, 'filter-by-date' := function($dateFrom as xs:date?, $dateTo as xs:date?) as document-node()* { - $wdt:filter-by-date($item, $dateFrom, $dateTo)[ancestor::tei:person]/root() + $wdt:filter-by-date($item, $dateFrom, $dateTo)[ancestor-or-self::tei:person]/root() }, 'sort' := function($params as map(*)?) as document-node()* { if(sort:has-index('persons')) then () From 6a50f404d16af42a1dd4699a68f456b5d8dfc88d Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 4 Jan 2018 21:17:17 +0100 Subject: [PATCH 5/7] transform work titles with a combination of TEI and MEI templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error message in the logs was: „net.sf.saxon.trans.XPathException: The source document is in namespace http://www.music-encoding.org/ns/mei, but none of the template rules match elements in this namespace“ --- modules/wdt.xqm | 4 ++-- xsl/works.xsl | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/wdt.xqm b/modules/wdt.xqm index 59ac85124..7cbe653eb 100644 --- a/modules/wdt.xqm +++ b/modules/wdt.xqm @@ -387,7 +387,7 @@ declare function wdt:works($item as item()*) as map(*) { }, ()) }, (: Sollte beim Titel noch der Komponist etc. angegeben werden? :) - 'title' := function($serialization as xs:string) as item()? { + 'title' := function($serialization as xs:string) as item()* { let $mei := typeswitch($item) case xs:string return core:doc($item)/mei:mei @@ -398,7 +398,7 @@ declare function wdt:works($item as item()*) as map(*) { return switch($serialization) case 'txt' return str:normalize-space(replace(string-join(str:txtFromTEI($title-element, config:guess-language(())), ''), '\s*\n+\s*(\S+)', '. $1')) - case 'html' return wega-util:transform($title-element, doc(concat($config:xsl-collection-path, '/common_main.xsl')), config:get-xsl-params(())) + case 'html' return wega-util:transform($title-element, doc(concat($config:xsl-collection-path, '/works.xsl')), config:get-xsl-params(())) default return core:logToFile('error', 'wdt:works()("title"): unsupported serialization "' || $serialization || '"') }, 'label-facets' := function() as xs:string? { diff --git a/xsl/works.xsl b/xsl/works.xsl index dfca4832d..985e662fd 100644 --- a/xsl/works.xsl +++ b/xsl/works.xsl @@ -16,4 +16,8 @@ + + + + \ No newline at end of file From 68bbdb9eff539e0c9482287c404facffd8a05f99 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 4 Jan 2018 21:17:31 +0100 Subject: [PATCH 6/7] updated expected results --- testing/expected-results/diaries/A065417.html | 12 +++++++----- testing/expected-results/var/Aktuelles | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testing/expected-results/diaries/A065417.html b/testing/expected-results/diaries/A065417.html index 1258d1236..93c89ed6a 100644 --- a/testing/expected-results/diaries/A065417.html +++ b/testing/expected-results/diaries/A065417.html @@ -11,8 +11,8 @@ - - + + @@ -314,6 +314,8 @@

‡ mit dem jungen Graf Wrede getroffen
- und mit Ihnen nach Tische nach Jägern‡dorf zum Gesandten
+ und mit Ihnen nach Tische nach Jägern‡dorf zum Gesandten
D’Ollri gefahren, nachdem ich vorher meinen Brief
von H: Mayer, an H: v: Mohr, Sek: de Leg: de Luc: abgegeben
hatte. Fuhrlohn
@@ -441,9 +443,9 @@

XML

diff --git a/testing/expected-results/var/Aktuelles b/testing/expected-results/var/Aktuelles index 85cf45f42..785592dde 100644 --- a/testing/expected-results/var/Aktuelles +++ b/testing/expected-results/var/Aktuelles @@ -12,7 +12,7 @@ - + @@ -289,7 +289,7 @@ Digitale Edition Version 3.2 veröffentlicht

22. Dezember 2017

-

Insgesamt versammeln sich in diesem Release 95 neue Personenbeschreibungen (sowie 325 Korrekturen/Überarbeitungen) und 62 neue Briefe (bei über 900 Korrekturen/Überarbeitungen). Bei den Schriften …

+

Es weihnachtet sehr, überall im Land werden Päckchen gepackt und geschnürt, und auch die WeGA-Wichtel haben sich wieder viel Mühe gegeben, noch rechtzeitig zum Fest ein aktuelles Release zu schnüren …

Kennung: A050356 From 9e7789437590608d36fde611acbb7c73c7ee1ad5 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Mon, 8 Jan 2018 11:17:57 +0100 Subject: [PATCH 7/7] updating for hot fix release --- build.properties | 2 +- catalogues/options.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 147794d30..b4d2e6419 100644 --- a/build.properties +++ b/build.properties @@ -4,7 +4,7 @@ # project.app=WeGA-WebApp project.name=http://weber-gesamtausgabe.de/webapp -project.version=3.2.0 +project.version=3.2.1 build.dir=build dist.dir=dist tmp.dir=tmp diff --git a/catalogues/options.xml b/catalogues/options.xml index 85ab14392..b44f3e5f2 100644 --- a/catalogues/options.xml +++ b/catalogues/options.xml @@ -20,10 +20,10 @@ 2 EAO5d_GiQPkJeTGACYYOFahJm2HRNvJUWwIkyw4j0Ys AE39DA5613844228642EE48196AAA94A - 3.2.0 + 3.2.1 3.2.0 A050356 - 2017-12-22 + 2018-01-08 10