Commit e3c66f6e authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/4.8.1'

parents 72d2961a 2406657c
Pipeline #111679 passed with stages
in 9 minutes and 52 seconds
project.name=http://textgrid.de/exist/fontane-develop
project.version=4.8.0
project.version=4.8.1
project.abbrev=fontane
project.title=[Fontane] SADE-Project
project.processorversion=4.7.0
......
......@@ -50,7 +50,6 @@
<get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane-lucene-exist-module&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fontane-lucene-latest.xar" ignoreerrors="true"/>
<get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=markdown&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/markdown-latest.xar" ignoreerrors="true"/>
<get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=xqjson&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/xqjson-latest.xar" ignoreerrors="true"/>
<get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=fundocs&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fundocs-latest.xar" ignoreerrors="true"/>
<copy file="${destfile}" todir="${test.dir}/eXist-db-${project.processorversion}/autodeploy" />
......
......@@ -5,7 +5,7 @@ let $login := xmldb:login("/db/sade-projects/textgrid/", "admin", "")
let $configdoc := doc( "/db/sade-projects/textgrid/config.xml" )
let $do := (
let $credentials := (
update replace $configdoc//param[@key="textgrid.user"]/text() with text {"TODO"},
update replace $configdoc//param[@key="textgrid.password"]/text() with text {"TODO"},
update replace $configdoc//param[@key="secret"]/text() with text {"TODO"},
......@@ -13,5 +13,18 @@ let $do := (
update replace $configdoc//param[@key="dokuwiki.user"]/text() with text {"TODO"},
update replace $configdoc//param[@key="dokuwiki.password"]/text() with text {"TODO"})
let $package-urls := ("http://exist-db.org/apps/eXide", "http://exist-db.org/apps/existdb-packageservice", "http://exist-db.org/apps/fundocs", "http://exist-db.org/apps/usermanager")
let $remove-packages :=
if(environment-variable("CI_COMMIT_REF_NAME") ne "master") then false() else
for $package-url in $package-urls
return
if ($package-url = repo:list()) then
let $undeploy := repo:undeploy($package-url)
let $remove := repo:remove($package-url)
return
$remove
else
false()
return
"done."
......@@ -5,6 +5,5 @@
<dependency package="http://textgrid.de/ns/SADE-fontane@dependency.track@"/>
<dependency package="http://textgrid.de/exist/tgconnect-fontane@dependency.track@"/>
<dependency package="http://textgrid.de/exist/fontane-lucene-exist-module"/>
<dependency package="http://xqilla.sourceforge.net/pkg/xqjson"/>
<dependency package="http://bdn-edition.de/ns/code-view@dependency.track@"/>
</package>
......@@ -2,7 +2,6 @@ xquery version "3.1";
declare namespace tgmd="http://textgrid.info/namespaces/metadata/core/2010";
import module namespace etTransfo="http://fontane-nb.dariah.eu/etTransfo" at "/db/apps/SADE/modules/fontane/edited-text/etTransfo.xqm";
import module namespace tests="https://sade.textgrid.de/ns/tests/fontane" at "tests.xqm";
import module namespace tgclient="http://textgrid.info/namespaces/xquery/tgclient" at "../textgrid-connect/tgclient.xqm";
import module namespace tgconnect="http://textgrid.info/namespaces/xquery/tgconnect" at "../textgrid-connect/tg-connect.xql";
......@@ -221,8 +220,3 @@ for $uri at $pos in (collection("/db/apps/SADE")/base-uri())[ends-with(., ".xqm"
sm:chmod(xs:anyURI("/db/system/autostart"), "rwxrwx---"),
sm:chmod(xs:anyURI("/db/system/autostart/reindex.xq"), "rwxrwx---"),
sm:chmod(xs:anyURI("/db/sade-projects/textgrid/data/xml/xq/get.xq"), "rwxr-xr--")
(: EDITED TEXT :)
(: util:log-system-out( "creating the edited text..." ), :)
(: etTransfo:complete(), :)
(: util:log-system-out( "done." ) :)
xquery version "3.1";
import module namespace fontaneTransfo="http://fontane-nb.dariah.eu/Transfo" at "/db/apps/SADE/modules/fontane/transform.xqm";
import module namespace xqjson="http://xqilla.sourceforge.net/lib/xqjson";
declare default element namespace "http://www.tei-c.org/ns/1.0";
(::)
(:declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";:)
(:declare namespace json="http://www.json.org";:)
declare namespace tei="http://www.tei-c.org/ns/1.0";
declare namespace digilib="digilib:digilib";
declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
declare namespace svg="http://www.w3.org/2000/svg";
declare namespace tei="http://www.tei-c.org/ns/1.0";
declare namespace xlink="http://www.w3.org/1999/xlink";
declare option exist:serialize "method=text media-type=application/json omit-xml-declaration=yes";
declare default element namespace "http://www.tei-c.org/ns/1.0";
declare option output:method "json";
declare option output:media-type "application/json";
(: see: http://exist-db.org/exist/apps/doc/xquery.xml#serialization :)
(:declare option output:method "json";:)
......@@ -80,21 +77,21 @@ typeswitch($node)
let $zh := if( $node/@lry ) then $h - $zy - number($node/@lry) * $dpcm else $h - $zy
return
<item type="object">
<pair name="@id" type="string">_:N{util:uuid()}</pair>
<pair name="@type" type="string">oa:Annotation</pair>
<pair name="motivation" type="string">sc:painting</pair>
<pair name="resource" type="object">
<pair name="@id" type="string">_:N{util:uuid()}</pair>
<pair name="@type" type="string">cnt:ContentAsText</pair>
<pair name="format" type="string">text/plain</pair>
<pair name="chars" type="string">{$node//text()}</pair>
<pair name="language" type="string">de</pair>
</pair>
<pair name="on" type="string">https://textgridlab.org/1.0/iiif/manifests/{$tei}/canvas/{$img}.json#xywh={$zx},{$zy},50,50</pair>
</item>
map{
"@id": "_:N" || util:uuid(),
"@type": "oa:Annotation",
"motivation": "sc:painting",
"resource": map{
"@id": "_:N" || util:uuid(),
"@type": "cnt:ContentAsText",
"format": "text/plain",
"chars": string-join($node//text()),
"language": "de"
},
"on": "https://textgridlab.org/1.0/iiif/manifests/"
|| $tei || "/canvas/" || $img || ".json#xywh="
|| $zx || "," || $zy || ",50,50"
}
case text()
return replace($node, '"', "&quot;")
default
......@@ -111,40 +108,17 @@ let $imgurl := "http://textgridrep.org/"||$img
let $xml :=
<json type="object">
<pair name="@context" type="string">http://www.shared-canvas.org/ns/context.json</pair>
<pair name="@id" type="string">http://localhost:8080/exist/rest/apps/SADE/modules/fontane/anno.xq?tei={$tei}&amp;img={$img}</pair>
<pair name="@type" type="string">sc:AnnotationList</pair>
<pair name="resources" type="array">
{$surfaces//tei:zone ! local:dispatch(.)}
<!-- {$surfaces//tei:zone[@uly][contains(., "STAATSBIBLIOTHEK")] ! local:dispatch(.)}
-->
</pair>
</json>
map {
"@context": "http://www.shared-canvas.org/ns/context.json",
"@id": "http://localhost:8080/exist/rest/apps/SADE/modules/fontane/anno.xq?tei="
|| $tei || "&amp;img=" || $img,
"@type": "sc:AnnotationList",
"resources": array {
$surfaces//tei:zone ! local:dispatch(.)
}
}
let $egal := response:set-header("Access-Control-Allow-Origin", "*")
(:let $xml := :)
(:<json type="object">:)
(:<pair name="@context" type="string">http://www.shared-canvas.org/ns/context.json</pair>:)
(:<pair name="@id" type="string">http://localhost/iiif/ann1.json</pair>:)
(:<pair name="@type" type="string">sc:AnnotationList</pair>:)
(:<pair name="resources" type="array">:)
(:<item type="object">:)
(:<pair name="@id" type="string">_:N9ffd445be244485d9cbff9fcdc9dcbd4</pair>:)
(:<pair name="@type" type="string">oa:Annotation</pair>:)
(:<pair name="motivation" type="string">sc:painting</pair>:)
(:<pair name="resource" type="object">:)
(:<pair name="@id" type="string">_:N3dbab1b51a6646c390ab3fae21c4c3af</pair>:)
(:<pair name="@type" type="string">cnt:ContentAsText</pair>:)
(:<pair name="format" type="string">text/plain</pair>:)
(:<pair name="chars" type="string">no[n] habetis Nondu[m] cognoscitis</pair>:)
(:<pair name="language" type="string">lat</pair>:)
(:</pair>:)
(:<pair name="on" type="string">http://textgridlab.org/1.0/iiif/manifests/textgrid:2smvd.0/canvas/textgrid:164g9.1.json#xywh=1711,557,1208,224</pair>:)
(:</item>:)
(:</pair>:)
(:</json>:)
return
xqjson:serialize-json($xml)
$xml
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2264,3 +2264,7 @@ li.editorialNote li {
.gesamtinhaltsverzeichnis li.tocItem > .nbname {
color: lightgrey;
}
#regImage img {
max-height: 25em;
}
......@@ -5,6 +5,8 @@
padding: 10px;
margin: auto;
margin-bottom: 30px;
background-color: #f6f1ed;
border-radius: 5px;
}
#editedText ul {
......@@ -66,6 +68,7 @@
margin: auto;
margin-bottom: 20px;
margin-top: 20px;
max-width: 75%;
}
#editedText .nb-img {
......@@ -75,6 +78,16 @@
text-align: center;
}
#editedText .nb-double-img {
width: 100%;
text-align: center;
}
/* D1 */
#editedText .nb-double-img[id="719e6ae667061cfc884b436071321a0b"] {
margin-bottom: 56px;
}
#editedText .nb-caption-data {
vertical-align: top;
padding-top: 5px;
......@@ -94,6 +107,11 @@
margin-right: 15px;
}
#editedText .nb-list li {
padding-top: 10px;
padding-bottom: 10px;
}
#editedText .nb-paragraph {
display: inline-block;
margin-left: 20px;
......@@ -219,7 +237,7 @@
.et-section-header #infoViewBtn {
display: inline;
margin-right: 15px;
float:left;
float: left;
max-width: 15px;
cursor: pointer;
}
......@@ -236,7 +254,7 @@
text-align: center;
font-size: smaller;
margin-top: -5px;
margin-bottom: -5px;
margin-bottom: 10px;
}
#editedText .multiphrase .multiphrase-top,
......@@ -260,13 +278,25 @@
}
/* paragraph lines */
#editedText .short-paragraph-line {
#editedText .short-paragraph-line,
#editedText .sum {
width: 33%;
border-bottom: 1px black solid;
margin-top: 20px;
margin-left: 33%;
}
#editedText .sum,
#editedText .double-sum {
width: 20%;
margin-left: 0;
}
#editedText .double-sum {
border-bottom: 4px double #333;
padding: 10px 0;
}
/* integrations */
#editedText .integration {
......@@ -291,3 +321,79 @@
height: 20px;
margin-top: -18px;
}
#editedText .nb-footnote {
border-left: 2px solid lightslategray;
padding-left: 10px;
margin-left: 20px;
}
#editedText .nb-missing-hyphen,
#editedText .nb-missing-syllable,
#editedText .nb-supplied {
font-style: italic;
}
#editedText .sum,
#editedText .double-sum,
#editedText .difference {
width: 25%;
margin-top: 10px;
margin-bottom: 10px;
}
#editedText .sum,
#editedText .difference {
border-bottom: 1px solid black;
}
#editedText .double-sum {
border-bottom: 3px double black;
}
#editedText .nb-computation-table {
margin-top: 10px;
margin-bottom: 10px;
}
#editedText .nb-computation-table td {
padding-left: 10px;
padding-right: 10px;
}
#editedText li {
list-style-type: none;
}
#editedText .nb-said {
margin-left: 20px;
}
#editedText .nb-framed {
border: 1px solid;
width: max-content;
padding: 3px;
}
#editedText .nb-additional {
margin-top: 20px;
margin-bottom: 20px;
border-left: 7px solid lightgray;
padding-left: 12px;
}
#editedText .nb-marked_off {
border-left: 1px dashed black;
padding-left: 10px;
margin-top: 5px;
margin-bottom: 5px;
}
#editedText .nb-editorial {
font-style: italic;
}
#editedText .nb-blue-underlined {
border-bottom: 1px solid royalblue;
}
......@@ -14,8 +14,8 @@ place them in the alphanumeric order of the signatures
background: whitesmoke;
}
#A07 #s5v .quartercircle-upper-right {
width: 18px;
#A07 #s5r .quartercircle-upper-right {
width: 0.5cm !important;
}
#A07 #s27r div.zone div.line span.mod.subst span.addWrapper {
position: relative;
......@@ -421,6 +421,10 @@ left: -0.1cm;
background-image: url('public/img/caret_umschlungener-bogen.svg');
}
#D07 #s53r .retraceHover::before {
content: "unter-"
}
#D08 #s68r.surface div.zone.illustration.figure div.zone:nth-child(14) div.line:nth-child(3) {
font-size: 0.85em;
}
......
......@@ -55,6 +55,10 @@ pre {border:none;}
.surface ~ .surface[id$='v'] {
display: none;
}
.surface.nested.Broschüre + div[id] {
/* C4 36r */
display: none;
}
.double .surface ~ .surface[id$='v'] {
display: block;
}
......@@ -369,6 +373,9 @@ svg.deletion-points, svg.connect-points {
fill:sienna;
stroke:sienna;
}
.brown_ink svg > g > polyline {
stroke: sienna !important;
}
.blue_ink {
color: blue;
border-color:blue;
......@@ -378,6 +385,9 @@ svg.deletion-points, svg.connect-points {
.light_blue_ink {
color: #6666FF;
}
.blue_ballpoint {
color: mediumblue;
}
.modmedium_pencil .add .blue_pencil.Fontane.Latf.standard {
color: darkslategray;
......@@ -1556,6 +1566,12 @@ svg {
-o-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
border-image: url('/public/img/border-wavy.png') 27 27 26 fill repeat;
}
.border-right-style.wavy.brown_ink {
-moz-border-image: url('/public/img/border-wavy-brown_ink.png') 27 27 26 repeat;
-webkit-border-image: url('/public/img/border-wavy-brown_ink.png') 27 27 26 repeat;
-o-border-image: url('/public/img/border-wavy-brown_ink.png') 27 27 26 repeat;
border-image: url('/public/img/border-wavy-brown_ink.png') 27 27 26 fill repeat;
}
.border-bottom-style.wavy{
border-style: solid;
border-width: 0 0 7px 0;
......@@ -1659,15 +1675,17 @@ svg {
padding-right: 0.5cm;
}
.zone.margin-top.d05cm.margin-left.minus-07cm {
top: 50% !important;
position: relative !important;
right: -0.7cm !important;
left: auto !important;
left: auto !important;
margin-top: 0.5cm;
position: absolute !important;
margin-left: -0.7cm;
}
.zone.margin-left.minus-17cm.margin-top.d07cm {
top: 50% !important;
position: relative !important;
left: -1.7cm !important;
left: auto !important;
margin-top: 0.7cm;
position: absolute !important;
margin-left: -1.7cm;
}
}
.border-right.dashed {
border-right-width: 1px;
......@@ -1952,6 +1970,16 @@ hr.Schlusslinie.slightly_wavy.brown_ink {
border-top: 0 none;
border-bottom-width:3px;
}
hr.Schlusslinie.slightly_wavy.black_ink {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
border-image-source: url('/public/img/border-slightly_wavy.png');
border-left: 0 none;
border-right: 0 none;
border-style: none none solid;
border-top: 0 none;
border-bottom-width:3px;
}
hr.Seitenzahlabgrenzungslinie {
margin: 0;
border: 0.5px solid black;
......
// script for dynamic content in index view.
var getUrlParameter = function getUrlParameter(sParam) {
var sPageURL = decodeURIComponent(window.location.search.substring(1)),
sURLVariables = sPageURL.split('&amp;'),
......@@ -14,6 +13,7 @@ for (i = 0; i < sURLVariables.length; i++) {
}
}
};
$( document ).ready(function() {
var entity=getUrlParameter('e');
var pos=$("#"+entity).offset().top - 150;
......@@ -29,4 +29,37 @@ $( document ).ready(function() {
$( e.target ).parent().parent().remove();});
});
//load image from TextGrid Repository
switch($(".registerEintrag")[0].classList[1]) {
case "place": var type = "plc"; break;
case "item": var type = "wrk"; break;
case "person": var type = "psn"; break;
case "personGrp": var type = "psn"; break;
case "event": var type = "eve"; break;
case "org": var type = "org"; break;
default:
console.log("unable to parse entity type. maybe the developer has to extend the list.");
}
fetch("api/index/image/" + type + "/" + entity)
.then(response => response.json())
.then(function(data) {
var hits = data.length;
if (hits > 0) {
// link
var link = document.createElement("a");
link.setAttribute('href', 'https://textgridrep.org/' + data[0]);
link.setAttribute('style', 'height: inherit;');
link.setAttribute('target', '_blank');
// imgage
var img = new Image();
link.appendChild(img);
var div = document.getElementById('regImage');
img.onload = function() {
div.insertBefore(link, div.firstChild);
};
img.src = 'https://textgridlab.org/1.0/digilib/rest/IIIF/' + data[0] + '/full/,1000/0/native.jpg';
img.style="display: block; height: inherit;";
}
});
});
......@@ -28,6 +28,7 @@
<div class="row">
<ul id="entity" data-template="ixv:item"/>
</div>
<div class="row" id="regImage"></div>
</div>
<script src="js/register.js"></script>
</div>
xquery version "3.1";
import module namespace etTransfo="http://fontane-nb.dariah.eu/etTransfo" at "/db/apps/SADE/modules/fontane/edited-text/etTransfo.xqm";
import module namespace tgconnect="http://textgrid.info/namespaces/xquery/tgconnect" at "/db/apps/textgrid-connect/tg-connect.xql";
import module namespace tgclient="http://textgrid.info/namespaces/xquery/tgclient" at "/db/apps/textgrid-connect/tgclient.xqm";
......@@ -25,16 +26,17 @@ for $uri in tokenize($uris, ",")
let $startTime := util:eval("current-dateTime()")
where starts-with($uri, "textgrid:")
let $response :=
try {
try {(
tgconnect:publish($uri,
$sid,
"data",
"admin",
$password,
"textgrid",
"")
""),
etTransfo:transform-single-nb(substring-after($uri, "textgrid:"))
} catch * { <error code="{$err:code}" timestamp="{util:eval("current-dateTime()")}">{$err:description}</error> }
)} catch * { <error code="{$err:code}" timestamp="{util:eval("current-dateTime()")}">{$err:description}</error> }
return
let $log := update insert ( <report uri="{$uri}" started="{$startTime}" finished="{util:eval("current-dateTime()")}">{$response}</report>) into //initlog/install/done
return
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment