diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e0a42ec301310fa637b2fdf9ef1fa7b13480f2e..98c2a05a709954f82fbc16ee5a157e7b76864305 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,14 +18,14 @@ update(144.76.113.134): - cd MetaGer_neu - composer install - scp -P 63824 metager@metager3.de:~/.env . - - scp -P 63824 metager@metager3.de:~/sumas.xml config/ - - scp -P 63824 metager@metager3.de:~/sumasEn.xml config/ + - scp -P 63824 metager@metager3.de:~/sumas.json config/ + - scp -P 63824 metager@metager3.de:~/sumasEn.json config/ - scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/ - scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/ - touch storage/logs/laravel.log - touch storage/logs/worker.log - touch database/metager.sqlite - - chmod 777 config/sumas.xml config/sumasEn.xml database/metager.sqlite + - chmod 777 config/sumas.json config/sumas.json database/metager.sqlite - chmod -R 777 storage - chmod -R 777 bootstrap/cache - npm install @@ -58,14 +58,14 @@ update(metager2): - cd MetaGer_neu - composer install - scp -P 63824 metager@metager3.de:~/.env . - - scp -P 63824 metager@metager3.de:~/sumas.xml config/ - - scp -P 63824 metager@metager3.de:~/sumasEn.xml config/ + - scp -P 63824 metager@metager3.de:~/sumas.json config/ + - scp -P 63824 metager@metager3.de:~/sumas.json config/ - scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/ - scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/ - touch storage/logs/laravel.log - touch storage/logs/worker.log - touch database/metager.sqlite - - chmod 777 config/sumas.xml config/sumasEn.xml database/metager.sqlite + - chmod 777 config/sumas.json config/sumas.json database/metager.sqlite - chmod -R 777 storage - chmod -R 777 bootstrap/cache - npm install @@ -98,14 +98,14 @@ update(metager3.de): - cd MetaGer_neu - composer install - scp -P 63824 metager@metager3.de:~/.env . - - scp -P 63824 metager@metager3.de:~/sumas.xml config/ - - scp -P 63824 metager@metager3.de:~/sumasEn.xml config/ + - scp -P 63824 metager@metager3.de:~/sumas.json config/ + - scp -P 63824 metager@metager3.de:~/sumas.json config/ - scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/ - scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/ - touch storage/logs/laravel.log - touch storage/logs/worker.log - touch database/metager.sqlite - - chmod 777 config/sumas.xml config/sumasEn.xml database/metager.sqlite + - chmod 777 config/sumas.json config/sumas.json database/metager.sqlite - chmod -R 777 storage - chmod -R 777 bootstrap/cache - npm install diff --git a/app/Models/parserSkripte/Exalead.php b/app/Models/parserSkripte/Exalead.php index 68ba296f56b92e1435a6ca9b618b4f116f7fb465..399b888e5351fddd82d40a490bcbf387771a620a 100644 --- a/app/Models/parserSkripte/Exalead.php +++ b/app/Models/parserSkripte/Exalead.php @@ -22,8 +22,8 @@ class Exalead extends Searchengine if (!$content) { return; } - $results = $content; - $prefix = ""; + $results = $content; + $prefix = ""; $namespace = ""; foreach ($results->getDocNamespaces() as $strPrefix => $strNamespace) { if (strlen($strPrefix) == 0) { @@ -42,10 +42,10 @@ class Exalead extends Searchengine foreach ($results as $result) { try { $result->registerXPathNamespace($prefix, $namespace); - $title = $result->xpath("a:metas/a:Meta[@name='title']/a:MetaString[@name='value']")[0]->__toString(); - $link = $result["url"]->__toString(); + $title = $result->xpath("a:metas/a:Meta[@name='title']/a:MetaString[@name='value']")[0]->__toString(); + $link = $result["url"]->__toString(); $anzeigeLink = $link; - $descr = ""; + $descr = ""; if (sizeOf($result->xpath("a:metas/a:Meta[@name='metadesc']/a:MetaString[@name='value']")) === 0 && sizeOf($result->xpath("a:metas/a:Meta[@name='summary']/a:MetaText[@name='value']")) !== 0) { $tmp = $result->xpath("a:metas/a:Meta[@name='summary']/a:MetaText[@name='value']"); foreach ($tmp as $el) { @@ -61,7 +61,7 @@ class Exalead extends Searchengine $link, $anzeigeLink, $descr, - $this->engine->{"display-name"},$this->engine->homepage, + $this->engine->{"display-name"}, $this->engine->homepage, $this->counter ); } catch (\ErrorException $e) { diff --git a/config/.gitignore b/config/.gitignore index 558a1fd61dd97499b3664d0c3fec12968e134f00..d656390f7390261846d4004c73f6a8053e2a74c6 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,5 +1,6 @@ sumas.xml sumasEn.xml sumas.json +sumasEn.json blacklistUrl.txt blacklistDomains.txt \ No newline at end of file diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php index c248d973f55f645e2a3b02bb3a43a88432578c48..3480fcfb5e51d1bc7c2a410699eaedaf13241fac 100644 --- a/resources/views/layouts/researchandtabs.blade.php +++ b/resources/views/layouts/researchandtabs.blade.php @@ -41,7 +41,7 @@ @foreach($metager->getAvailableParameterFilter() as $filterName => $filter) <div class="option-selector"> <label for="{{$filterName}}">@lang($filter->name)</label> - <select name="{{$filter->{'get-parameter'} }}" form="searchForm"> + <select name="{{$filter->{'get-parameter'} }}" form="searchForm" onchange="this.form.submit()"> @foreach($filter->values as $value => $text) <option value="{{$value}}" @if(Request::input($filter->{'get-parameter'}, '') === $value)selected="selected" @endif>{{trans($text)}}</option> @endforeach