From d5358356df3acb78fe4de560726ba542e30f6909 Mon Sep 17 00:00:00 2001 From: asajedi Date: Wed, 6 Oct 2021 02:07:09 +0200 Subject: [PATCH 1/2] Address linked note annotations --- src/Controller/Tei2SolrController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Controller/Tei2SolrController.php b/src/Controller/Tei2SolrController.php index 7591451..0630fe4 100755 --- a/src/Controller/Tei2SolrController.php +++ b/src/Controller/Tei2SolrController.php @@ -998,8 +998,8 @@ class Tei2SolrController extends AbstractController $tText .= ''; $gnd = false; } elseif (isset($note) && true === $note) { - $eText .= ''; - $tText .= ''; + $eText .= ' ' . $childElement->data; + $tText .= ' ' . $childElement->data; $note = false; } elseif (isset($abbr) && !empty($abbr)) { $tText .= $abbr; @@ -1056,6 +1056,7 @@ class Tei2SolrController extends AbstractController $segBiblTargetArr = explode('#', $segBiblTarget); $segTextBibl = str_replace('_', ' ', $segBiblTargetArr[1]); $segBiblTargetlink = $segBiblTargetArr[0]; + $segTextBibl = ''.$segTextBibl.''; $segText = $this->getElementText($childElement); } } else { @@ -1074,12 +1075,12 @@ class Tei2SolrController extends AbstractController } } elseif ($childElement->nodeName === "note") { $noteText = $this->getElementText($childElement); - if (false === $noteBibl && (isset($noteUuid) && !empty($noteUuid)) && !empty($noteText)) { + if ((isset($noteBibl) && false === $noteBibl) && (isset($noteUuid) && !empty($noteUuid)) && !empty($noteText)) { $notesUuids[$noteUuid] = trim($noteText); $pagesNotesUuids[$k][$noteUuid] = trim($noteText); - } elseif (true === $noteBibl && (isset($noteUuid) && !empty($noteUuid)) && !empty($segBiblTargetlink)) { + } elseif ((isset($noteBibl) && true === $noteBibl) && (isset($noteUuid) && !empty($noteUuid)) && !empty($segBiblTargetlink)) { $notesUuids[$noteUuid] = trim($segBiblTargetlink); - $pagesNotesUuids[$k][$noteUuid] = trim($segBiblTargetlink); + $pagesNotesUuids[$k][$noteUuid] = trim(' '); } unset($noteUuid); } elseif ('item' === $childElement->nodeName) { -- GitLab From da57530ed495896f8e00871c204ee91a5a5db0df Mon Sep 17 00:00:00 2001 From: asajedi Date: Wed, 6 Oct 2021 02:09:50 +0200 Subject: [PATCH 2/2] Update dependencies --- composer.lock | 116 ++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 51 deletions(-) diff --git a/composer.lock b/composer.lock index 66942e8..21d953d 100755 --- a/composer.lock +++ b/composer.lock @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.196.1", + "version": "3.197.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2845899d05c66a00d88eabbf7cf5d3dbae2da58a" + "reference": "c5391ef7c979473b97d81329100bfa5fb018fa62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2845899d05c66a00d88eabbf7cf5d3dbae2da58a", - "reference": "2845899d05c66a00d88eabbf7cf5d3dbae2da58a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c5391ef7c979473b97d81329100bfa5fb018fa62", + "reference": "c5391ef7c979473b97d81329100bfa5fb018fa62", "shasum": "" }, "require": { @@ -143,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.196.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.197.0" }, - "time": "2021-10-01T18:23:06+00:00" + "time": "2021-10-05T18:14:34+00:00" }, { "name": "doctrine/annotations", @@ -596,12 +596,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "e38c668f3b565bf9d045f20460a9bdf415073bf8" + "reference": "6b499cc5e2a7dd66c3131500a54abeec35383add" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e38c668f3b565bf9d045f20460a9bdf415073bf8", - "reference": "e38c668f3b565bf9d045f20460a9bdf415073bf8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6b499cc5e2a7dd66c3131500a54abeec35383add", + "reference": "6b499cc5e2a7dd66c3131500a54abeec35383add", "shasum": "" }, "require": { @@ -713,7 +713,7 @@ "type": "tidelift" } ], - "time": "2021-09-05T19:58:29+00:00" + "time": "2021-10-05T15:50:51+00:00" }, { "name": "guzzlehttp/promises", @@ -721,12 +721,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "e32022e4122e70220050fb47c6467477e269d16c" + "reference": "6482c05c394f91793fec16ef6e46eff0e1fd2a0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/e32022e4122e70220050fb47c6467477e269d16c", - "reference": "e32022e4122e70220050fb47c6467477e269d16c", + "url": "https://api.github.com/repos/guzzle/promises/zipball/6482c05c394f91793fec16ef6e46eff0e1fd2a0f", + "reference": "6482c05c394f91793fec16ef6e46eff0e1fd2a0f", "shasum": "" }, "require": { @@ -798,7 +798,7 @@ "type": "tidelift" } ], - "time": "2021-10-02T14:35:57+00:00" + "time": "2021-10-05T15:50:34+00:00" }, { "name": "guzzlehttp/psr7", @@ -806,12 +806,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "9d006741ba865a45adccfac45d8e1053086a5a3f" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/9d006741ba865a45adccfac45d8e1053086a5a3f", - "reference": "9d006741ba865a45adccfac45d8e1053086a5a3f", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -894,7 +894,21 @@ "issues": "https://github.com/guzzle/psr7/issues", "source": "https://github.com/guzzle/psr7/tree/1.x" }, - "time": "2021-09-05T19:11:18+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "jetbrains/phpstorm-stubs", @@ -2131,12 +2145,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "0f36fa483bc30d0032f700a38b40141cfa383910" + "reference": "0005eb9eaecc2a3a00b8ee34c06643a316ebb228" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0f36fa483bc30d0032f700a38b40141cfa383910", - "reference": "0f36fa483bc30d0032f700a38b40141cfa383910", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0005eb9eaecc2a3a00b8ee34c06643a316ebb228", + "reference": "0005eb9eaecc2a3a00b8ee34c06643a316ebb228", "shasum": "" }, "require": { @@ -2181,7 +2195,7 @@ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" }, - "time": "2021-09-27T19:30:08+00:00" + "time": "2021-10-05T20:58:53+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2876,12 +2890,12 @@ "source": { "type": "git", "url": "https://github.com/subugoe/EMOBundle.git", - "reference": "3606bd942f2764458b06e1e558dfb915719ee160" + "reference": "474c377f8f1426673499c823256f5aecddec7254" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/subugoe/EMOBundle/zipball/3606bd942f2764458b06e1e558dfb915719ee160", - "reference": "3606bd942f2764458b06e1e558dfb915719ee160", + "url": "https://api.github.com/repos/subugoe/EMOBundle/zipball/474c377f8f1426673499c823256f5aecddec7254", + "reference": "474c377f8f1426673499c823256f5aecddec7254", "shasum": "" }, "require": { @@ -2913,7 +2927,7 @@ "issues": "https://github.com/subugoe/EMOBundle/issues", "source": "https://github.com/subugoe/EMOBundle/tree/master" }, - "time": "2021-10-03T23:41:04+00:00" + "time": "2021-10-05T23:53:03+00:00" }, { "name": "symfony/asset", @@ -2990,12 +3004,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "4d9074f2777dfde2b78c5c60affa66c5e7518117" + "reference": "84a39ad8e9f9e4b807e7087f3924fc2c3030af7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/4d9074f2777dfde2b78c5c60affa66c5e7518117", - "reference": "4d9074f2777dfde2b78c5c60affa66c5e7518117", + "url": "https://api.github.com/repos/symfony/cache/zipball/84a39ad8e9f9e4b807e7087f3924fc2c3030af7c", + "reference": "84a39ad8e9f9e4b807e7087f3924fc2c3030af7c", "shasum": "" }, "require": { @@ -3077,7 +3091,7 @@ "type": "tidelift" } ], - "time": "2021-09-25T11:31:41+00:00" + "time": "2021-10-05T20:27:01+00:00" }, { "name": "symfony/cache-contracts", @@ -3401,12 +3415,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4" + "reference": "480eb7148cff3ce7f79383a3b47ee79b3d68b327" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4", - "reference": "75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/480eb7148cff3ce7f79383a3b47ee79b3d68b327", + "reference": "480eb7148cff3ce7f79383a3b47ee79b3d68b327", "shasum": "" }, "require": { @@ -3479,7 +3493,7 @@ "type": "tidelift" } ], - "time": "2021-09-21T06:20:06+00:00" + "time": "2021-10-04T08:53:26+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3973,12 +3987,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03" + "reference": "658f638119ec95f462e1c576d4a9dd81144ed25e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/f05406b33681409b83285f4d2ff4efbca7c55b03", - "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03", + "url": "https://api.github.com/repos/symfony/flex/zipball/658f638119ec95f462e1c576d4a9dd81144ed25e", + "reference": "658f638119ec95f462e1c576d4a9dd81144ed25e", "shasum": "" }, "require": { @@ -4018,7 +4032,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.16.3" + "source": "https://github.com/symfony/flex/tree/main" }, "funding": [ { @@ -4034,7 +4048,7 @@ "type": "tidelift" } ], - "time": "2021-09-28T17:00:52+00:00" + "time": "2021-10-05T09:47:42+00:00" }, { "name": "symfony/form", @@ -4364,12 +4378,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "09b3202651ab23ac8dcf455284a48a3500e56731" + "reference": "8688860ebbbd6fb01d4486f317d6f440ca83a3dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/09b3202651ab23ac8dcf455284a48a3500e56731", - "reference": "09b3202651ab23ac8dcf455284a48a3500e56731", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8688860ebbbd6fb01d4486f317d6f440ca83a3dc", + "reference": "8688860ebbbd6fb01d4486f317d6f440ca83a3dc", "shasum": "" }, "require": { @@ -4424,7 +4438,7 @@ "type": "tidelift" } ], - "time": "2021-08-26T15:51:23+00:00" + "time": "2021-10-02T17:16:26+00:00" }, { "name": "symfony/http-kernel", @@ -6452,12 +6466,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "1f12cc0c2e880a5f39575c19af81438464717839" + "reference": "0f8c2270e45ff32a7e771a50c12cd9ffb39bdf67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f12cc0c2e880a5f39575c19af81438464717839", - "reference": "1f12cc0c2e880a5f39575c19af81438464717839", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f8c2270e45ff32a7e771a50c12cd9ffb39bdf67", + "reference": "0f8c2270e45ff32a7e771a50c12cd9ffb39bdf67", "shasum": "" }, "require": { @@ -6533,7 +6547,7 @@ "type": "tidelift" } ], - "time": "2021-09-24T15:30:11+00:00" + "time": "2021-10-02T06:52:46+00:00" }, { "name": "symfony/var-exporter", @@ -6757,12 +6771,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a7d0568c90c3fb4ffe40193e3b8641ec11f455b9" + "reference": "5e7ec8b53dd0f74dad97d7a8cd89e0bfe76e8e55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a7d0568c90c3fb4ffe40193e3b8641ec11f455b9", - "reference": "a7d0568c90c3fb4ffe40193e3b8641ec11f455b9", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/5e7ec8b53dd0f74dad97d7a8cd89e0bfe76e8e55", + "reference": "5e7ec8b53dd0f74dad97d7a8cd89e0bfe76e8e55", "shasum": "" }, "require": { @@ -6828,7 +6842,7 @@ "type": "tidelift" } ], - "time": "2021-09-29T12:16:58+00:00" + "time": "2021-10-04T09:04:25+00:00" }, { "name": "webmozart/assert", -- GitLab