geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- composer updates

Browse Source 
- dynamical connection string to solr for the search via .env-file: settings for SOLR_HOST und SOLR_CORE
This commit is contained in:
Arno Kaimbacher 2020-06-02 16:11:07 +02:00
parent 3fd4a66fbf
commit c0e381ba3a
7 changed files with 315 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -15,7 +15,7 @@
"felixkiss/uniquewith-validator": "^3.1",
"fideloper/proxy": "^4.0",
"laravel/framework": "^6.2",
"laravel/tinker": "^1.0",
"laravel/tinker": "^2.0",
"laravelcollective/html": "^6.1",
"mcamara/laravel-localization": "^1.3",
"solarium/solarium": "^3.8",

509
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "413b881be459667c601f26e12d21c034",
"content-hash": "c10fba87120a63900b4a05afb5fe518b",
"packages": [
{
"name": "arifhp86/laravel-clear-expired-cache-file",
@ -234,16 +234,16 @@
},
{
"name": "doctrine/inflector",
"version": "2.0.2",
"version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d"
"reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/3fc171224a316569faad2df6b18a1fd8cce5a56d",
"reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210",
"reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210",
"shasum": ""
},
"require": {
@ -321,7 +321,7 @@
"type": "tidelift"
}
],
"time": "2020-05-25T20:08:47+00:00"
"time": "2020-05-29T15:13:26+00:00"
},
{
"name": "doctrine/lexer",
@ -743,96 +743,6 @@
],
"time": "2019-09-04T11:59:31+00:00"
},
{
"name": "jakub-onderka/php-console-color",
"version": "v0.2",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
"reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
"reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "1.0",
"jakub-onderka/php-parallel-lint": "1.0",
"jakub-onderka/php-var-dump-check": "0.*",
"phpunit/phpunit": "~4.3",
"squizlabs/php_codesniffer": "1.*"
},
"type": "library",
"autoload": {
"psr-4": {
"JakubOnderka\\PhpConsoleColor\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-2-Clause"
],
"authors": [
{
"name": "Jakub Onderka",
"email": "jakub.onderka@gmail.com"
}
],
"abandoned": "php-parallel-lint/php-console-color",
"time": "2018-09-29T17:23:10+00:00"
},
{
"name": "jakub-onderka/php-console-highlighter",
"version": "v0.4",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
"reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
"reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"jakub-onderka/php-console-color": "~0.2",
"php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "~1.0",
"jakub-onderka/php-parallel-lint": "~1.0",
"jakub-onderka/php-var-dump-check": "~0.1",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
"type": "library",
"autoload": {
"psr-4": {
"JakubOnderka\\PhpConsoleHighlighter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jakub Onderka",
"email": "acci@acci.cz",
"homepage": "http://www.acci.cz/"
}
],
"description": "Highlight PHP code in terminal",
"abandoned": "php-parallel-lint/php-console-highlighter",
"time": "2018-09-29T18:48:56+00:00"
},
{
"name": "laravel/framework",
"version": "v6.18.16",
@ -982,36 +892,37 @@
},
{
"name": "laravel/tinker",
"version": "v1.0.10",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7"
"reference": "cde90a7335a2130a4488beb68f4b2141869241db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"url": "https://api.github.com/repos/laravel/tinker/zipball/cde90a7335a2130a4488beb68f4b2141869241db",
"reference": "cde90a7335a2130a4488beb68f4b2141869241db",
"shasum": ""
},
"require": {
"illuminate/console": "~5.1|^6.0",
"illuminate/contracts": "~5.1|^6.0",
"illuminate/support": "~5.1|^6.0",
"php": ">=5.5.9",
"psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
"illuminate/console": "^6.0|^7.0|^8.0",
"illuminate/contracts": "^6.0|^7.0|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"php": "^7.2",
"psy/psysh": "^0.10.3",
"symfony/var-dumper": "^4.3|^5.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0|~5.0"
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^8.4|^9.0"
},
"suggest": {
"illuminate/database": "The Illuminate Database package (~5.1)."
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "2.x-dev"
},
"laravel": {
"providers": [
@ -1041,7 +952,7 @@
"laravel",
"psysh"
],
"time": "2019-08-07T15:10:45+00:00"
"time": "2020-04-07T15:01:31+00:00"
},
{
"name": "laravelcollective/html",
@ -1456,16 +1367,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.34.2",
"version": "2.35.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "3e87404329b8072295ea11d548b47a1eefe5a162"
"reference": "4b9bd835261ef23d36397a46a76b496a458305e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162",
"reference": "3e87404329b8072295ea11d548b47a1eefe5a162",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4b9bd835261ef23d36397a46a76b496a458305e5",
"reference": "4b9bd835261ef23d36397a46a76b496a458305e5",
"shasum": ""
},
"require": {
@ -1535,7 +1446,7 @@
"type": "tidelift"
}
],
"time": "2020-05-19T22:14:16+00:00"
"time": "2020-05-24T18:27:52+00:00"
},
{
"name": "nikic/php-parser",
@ -1896,32 +1807,30 @@
},
{
"name": "psy/psysh",
"version": "v0.9.12",
"version": "v0.10.4",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "90da7f37568aee36b116a030c5f99c915267edd4"
"reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/90da7f37568aee36b116a030c5f99c915267edd4",
"reference": "90da7f37568aee36b116a030c5f99c915267edd4",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560",
"reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1.*",
"ext-json": "*",
"ext-tokenizer": "*",
"jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
"nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0|~5.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0|~5.0"
"nikic/php-parser": "~4.0|~3.0|~2.0|~1.3",
"php": "^8.0 || ^7.0 || ^5.5.9",
"symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
"symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"hoa/console": "~2.15|~3.16",
"phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
"hoa/console": "3.17.*"
},
"suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@ -1936,7 +1845,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "0.9.x-dev"
"dev-master": "0.10.x-dev"
}
},
"autoload": {
@ -1966,7 +1875,7 @@
"interactive",
"shell"
],
"time": "2019-12-06T14:19:43+00:00"
"time": "2020-05-03T19:32:03+00:00"
},
{
"name": "ramsey/uuid",
@ -2177,22 +2086,23 @@
},
{
"name": "symfony/console",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
"reference": "326b064d804043005526f5a0494cfb49edb59bb0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
"reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
"url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
"reference": "326b064d804043005526f5a0494cfb49edb59bb0",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1|^2"
},
"conflict": {
@ -2263,29 +2173,29 @@
"type": "tidelift"
}
],
"time": "2020-03-30T11:41:10+00:00"
"time": "2020-05-30T20:06:45+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.0.8",
"version": "v5.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
"reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
"reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e544e24472d4c97b2d11ade7caacd446727c6bf9",
"reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9",
"shasum": ""
},
"require": {
"php": "^7.2.5"
"php": ">=7.2.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
"dev-master": "5.1-dev"
}
},
"autoload": {
@ -2330,25 +2240,26 @@
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00"
"time": "2020-05-20T17:43:50+00:00"
},
{
"name": "symfony/debug",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "346636d2cae417992ecfd761979b2ab98b339a45"
"reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45",
"reference": "346636d2cae417992ecfd761979b2ab98b339a45",
"url": "https://api.github.com/repos/symfony/debug/zipball/28f92d08bb6d1fddf8158e02c194ad43870007e6",
"reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0"
"php": ">=7.1.3",
"psr/log": "~1.0",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"symfony/http-kernel": "<3.4"
@ -2400,26 +2311,27 @@
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
"time": "2020-05-24T08:33:35+00:00"
},
{
"name": "symfony/error-handler",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358"
"reference": "0df9a23c0f9eddbb6682479fee6fd58b88add75b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358",
"reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/0df9a23c0f9eddbb6682479fee6fd58b88add75b",
"reference": "0df9a23c0f9eddbb6682479fee6fd58b88add75b",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"psr/log": "~1.0",
"symfony/debug": "^4.4.5",
"symfony/polyfill-php80": "^1.15",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
@ -2470,24 +2382,24 @@
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00"
"time": "2020-05-28T10:39:14+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
"reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"symfony/event-dispatcher-contracts": "^1.1"
},
"conflict": {
@ -2554,7 +2466,7 @@
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
"time": "2020-05-20T08:37:50+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@ -2616,7 +2528,7 @@
},
{
"name": "symfony/finder",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@ -2679,20 +2591,20 @@
},
{
"name": "symfony/http-foundation",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2"
"reference": "3adfbd7098c850b02d107330b7b9deacf2581578"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2",
"reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/3adfbd7098c850b02d107330b7b9deacf2581578",
"reference": "3adfbd7098c850b02d107330b7b9deacf2581578",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"symfony/mime": "^4.3|^5.0",
"symfony/polyfill-mbstring": "~1.1"
},
@ -2744,30 +2656,31 @@
"type": "tidelift"
}
],
"time": "2020-04-18T20:40:08+00:00"
"time": "2020-05-23T09:11:46+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "1799a6c01f0db5851f399151abdb5d6393fec277"
"reference": "54526b598d7fc86a67850488b194a88a79ab8467"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/1799a6c01f0db5851f399151abdb5d6393fec277",
"reference": "1799a6c01f0db5851f399151abdb5d6393fec277",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/54526b598d7fc86a67850488b194a88a79ab8467",
"reference": "54526b598d7fc86a67850488b194a88a79ab8467",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"psr/log": "~1.0",
"symfony/error-handler": "^4.4",
"symfony/event-dispatcher": "^4.4",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-php73": "^1.9"
"symfony/polyfill-php73": "^1.9",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"symfony/browser-kit": "<4.3",
@ -2848,26 +2761,27 @@
"type": "tidelift"
}
],
"time": "2020-04-28T18:47:42+00:00"
"time": "2020-05-31T05:25:51+00:00"
},
{
"name": "symfony/mime",
"version": "v5.0.8",
"version": "v5.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
"reference": "56261f89385f9d13cf843a5101ac72131190bc91"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
"reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
"url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
"reference": "56261f89385f9d13cf843a5101ac72131190bc91",
"shasum": ""
},
"require": {
"php": "^7.2.5",
"php": ">=7.2.5",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0"
"symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"symfony/mailer": "<4.4"
@ -2879,7 +2793,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
"dev-master": "5.1-dev"
}
},
"autoload": {
@ -2924,7 +2838,7 @@
"type": "tidelift"
}
],
"time": "2020-04-17T03:29:44+00:00"
"time": "2020-05-25T12:33:44+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -3362,17 +3276,93 @@
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/process",
"version": "v4.4.8",
"name": "symfony/polyfill-php80",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
"reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
"reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
"shasum": ""
},
"require": {
"php": ">=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php80\\": ""
},
"files": [
"bootstrap.php"
],
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ion Bazan",
"email": "ion.bazan@gmail.com"
},
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/process",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"shasum": ""
},
"require": {
@ -3422,20 +3412,20 @@
"type": "tidelift"
}
],
"time": "2020-04-15T15:56:18+00:00"
"time": "2020-05-30T20:06:45+00:00"
},
{
"name": "symfony/routing",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c"
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c",
"reference": "67b4e1f99c050cbc310b8f3d0dbdc4b0212c052c",
"url": "https://api.github.com/repos/symfony/routing/zipball/0f557911dde75c2a9652b8097bd7c9f54507f646",
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646",
"shasum": ""
},
"require": {
@ -3512,24 +3502,24 @@
"type": "tidelift"
}
],
"time": "2020-04-21T19:59:53+00:00"
"time": "2020-05-30T20:07:26+00:00"
},
{
"name": "symfony/service-contracts",
"version": "v2.0.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "144c5e51266b281231e947b51223ba14acf1a749"
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
"reference": "144c5e51266b281231e947b51223ba14acf1a749",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
"shasum": ""
},
"require": {
"php": "^7.2.5",
"php": ">=7.2.5",
"psr/container": "^1.0"
},
"suggest": {
@ -3538,7 +3528,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"autoload": {
@ -3570,24 +3560,38 @@
"interoperability",
"standards"
],
"time": "2019-11-18T17:27:11+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-20T17:43:50+00:00"
},
{
"name": "symfony/translation",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191"
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/8272bbd2b7e220ef812eba2a2b30068a5c64b191",
"reference": "8272bbd2b7e220ef812eba2a2b30068a5c64b191",
"url": "https://api.github.com/repos/symfony/translation/zipball/79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^1.1.6|^2"
},
@ -3660,24 +3664,24 @@
"type": "tidelift"
}
],
"time": "2020-04-12T16:45:36+00:00"
"time": "2020-05-30T20:06:45+00:00"
},
{
"name": "symfony/translation-contracts",
"version": "v2.0.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed"
"reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed",
"reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e5ca07c8f817f865f618aa072c2fe8e0e637340e",
"reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e",
"shasum": ""
},
"require": {
"php": "^7.2.5"
"php": ">=7.2.5"
},
"suggest": {
"symfony/translation-implementation": ""
@ -3685,7 +3689,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"autoload": {
@ -3717,26 +3721,41 @@
"interoperability",
"standards"
],
"time": "2019-11-18T17:27:11+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-20T17:43:50+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v4.4.8",
"version": "v4.4.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf"
"reference": "56b3aa5eab0ac6720dcd559fd1d590ce301594ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/c587e04ce5d1aa62d534a038f574d9a709e814cf",
"reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/56b3aa5eab0ac6720dcd559fd1d590ce301594ac",
"reference": "56b3aa5eab0ac6720dcd559fd1d590ce301594ac",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php72": "~1.5"
"symfony/polyfill-php72": "~1.5",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
@ -3807,7 +3826,7 @@
"type": "tidelift"
}
],
"time": "2020-04-12T16:14:02+00:00"
"time": "2020-05-30T20:06:45+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@ -3933,16 +3952,16 @@
},
{
"name": "yajra/laravel-datatables-oracle",
"version": "v9.10.0",
"version": "v9.10.1",
"source": {
"type": "git",
"url": "https://github.com/yajra/laravel-datatables.git",
"reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229"
"reference": "01b4a4fdbd13e4d77fa2d27916cdafac789d2d1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/b0b9e2c37b5a17ca35bb2c6d3927bf6176393229",
"reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229",
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/01b4a4fdbd13e4d77fa2d27916cdafac789d2d1a",
"reference": "01b4a4fdbd13e4d77fa2d27916cdafac789d2d1a",
"shasum": ""
},
"require": {
@ -3994,32 +4013,42 @@
"email": "aqangeles@gmail.com"
}
],
"description": "jQuery DataTables API for Laravel 4|5",
"description": "jQuery DataTables API for Laravel 4|5|6|7",
"keywords": [
"datatables",
"jquery",
"laravel"
],
"time": "2020-04-23T01:21:11+00:00"
"funding": [
{
"url": "https://www.paypal.me/yajra",
"type": "custom"
},
{
"url": "https://www.patreon.com/yajra",
"type": "patreon"
}
],
"time": "2020-05-30T04:43:39+00:00"
}
],
"packages-dev": [
{
"name": "doctrine/instantiator",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
@ -4058,7 +4087,21 @@
"constructor",
"instantiate"
],
"time": "2019-10-21T16:45:58+00:00"
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
"type": "tidelift"
}
],
"time": "2020-05-29T17:27:14+00:00"
},
{
"name": "fzaninotto/faker",

2
public/js/search/main.js
View File

File diff suppressed because one or more lines are too long

17
resources/js/search/app-class.ts
View File

@ -7,6 +7,13 @@ import VsPagination from './search-results/vs-pagination.vue';
import rdrApi from './search-results/dataservice';
import FilterItem from './models/filter-item';
interface SolrSettings {
core: string;
host: string;
}
// declare var solrCore: string;
declare var SOLR: SolrSettings;
@Component({
components: {
VsInput,
@ -31,10 +38,12 @@ export default class App extends Vue {
};
loaded = false;
numFound: number;
solrCore: string = SOLR.core;
solrHost: string = SOLR.host;
async onPaginate(start: number): Promise<void> {
// console.log(start);
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, start.toString());
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, this.solrCore, this.solrHost, start.toString());
this.results = res.response.docs;
}
@ -42,7 +51,7 @@ export default class App extends Vue {
// alert(categoryName);
delete this.activeFilterCategories[categoryName];
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories);
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, this.solrCore, this.solrHost);
this.results = res.response.docs;
this.numFound = res.response.numFound;
@ -96,7 +105,7 @@ export default class App extends Vue {
if (!this.activeFilterCategories[filter.Category].some(e => e === filter.value)) {
this.activeFilterCategories[filter.Category].push(filter.value);
// alert(this.activeFilterCategories[filter.Category]);
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories);
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, this.solrCore, this.solrHost);
this.results = res.response.docs;
this.numFound = res.response.numFound;
@ -148,7 +157,7 @@ export default class App extends Vue {
// }
this.facets = {};
this.searchTerm = term;
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories);
var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, this.solrCore, this.solrHost);
this.results = res.response.docs;
this.numFound = res.response.numFound;

14
resources/js/search/search-results/dataservice.ts
View File

@ -14,11 +14,12 @@ var SOLR_CONFIG = {
export default {
async search(term: string, filterItems: Object, start?: string): Promise<any> {
async search(term: string, filterItems: Object, solrCore: string, solrHost: string, start?: string): Promise<any> {
// solr endpoint
// const host = 'http://voyagerdemo.com/';
const host = 'https://repository.geologie.ac.at/';
const path = 'solr/rdr_data/select?';
//const host = 'https://www.tethys.at/';
const host = 'https://' + solrHost;
const path = '/solr/' + solrCore + '/select?';
var base = host + path;
//const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned
@ -73,11 +74,12 @@ export default {
},
// for the autocomplete search
async searchTerm(term: string): Promise<any> {
async searchTerm(term: string, solrCore: string, solrHost: string): Promise<any> {
// solr endpoint
// const host = 'http://voyagerdemo.com/';
const host = 'https://repository.geologie.ac.at/';
const path = 'solr/rdr_data/select?';
// const host = 'https://www.tethys.at/';''
const host = 'https://' + solrHost;
const path = '/solr/' + solrCore + '/select?';
var base = host + path;
//const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned

10
resources/js/search/text-search/vs-input-class.ts
View File

@ -3,7 +3,11 @@ import { Component, Prop } from 'vue-property-decorator';
import debounce from 'lodash/debounce';
import rdrApi from '../search-results/dataservice';
interface SolrSettings {
core: string;
host: string;
}
declare var SOLR: SolrSettings;
@Component({})
export default class VsInput extends Vue {
@ -27,6 +31,8 @@ export default class VsInput extends Vue {
selectedIndex: number = null;
selectedDisplay = null;
isFocussed: boolean = false;
solrCore: string = SOLR.core;
solrHost: string = SOLR.host;
// get results() {
// return this.items;
@ -127,7 +133,7 @@ export default class VsInput extends Vue {
async request() {
try {
var res = await rdrApi.searchTerm(this.display);
var res = await rdrApi.searchTerm(this.display, this.solrCore, this.solrHost);
this.error = null
this.results = res.response.docs;
this.loading = false;

8
resources/views/frontend/search/index.blade.php
View File

@ -161,6 +161,12 @@
@endsection
@section('after-scripts')
{{-- <script type="text/javascript" src="{{ asset('js/search/main.js') }}"></script> --}}
<script>
const SOLR = <?php echo json_encode([
'core' => config('solarium.endpoint.repository.core'),
'host' => config('solarium.endpoint.repository.host'),
]); ?>
</script>
<script type="text/javascript" src="{{ asset('js/search/main.js') }}"></script>
@stop