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

- query solr via nginx

Browse Source 
- rewrite dataservice.js
- facet ui fia vuejs
This commit is contained in:
Arno Kaimbacher 2019-10-04 16:13:29 +02:00
parent 4605778578
commit 961c99adc1
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

12
resources/assets/js/search/search-results/dataservice.js
View File

@ -2,19 +2,19 @@ import axios from "axios";
export default {
async search (term) {
async search(term) {
// solr endpoint
// const host = 'http://voyagerdemo.com/';
const host = '//repository.geologie.ac.at:8983/';
const host = 'https://repository.geologie.ac.at/';
const path = 'solr/rdr_data/select';
const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned
const dismaxFields="title^3 abstract^2 subject^1";
const dismaxFields = "title^3 abstract^2 subject^1";
const facetFields = "facet.field=language";//&fq=year:(2019)";//&facet.query=year:2018";
// $dismax->setQueryFields('title^3 abstract^2 subject^1');
const api = `${host}${path}?defType=dismax&q=${term}&fl=${fields}&qf=${dismaxFields}&facet=on&${facetFields}&wt=json&rows=20&indent=on`;
const res = await axios.get(api);
const res = await axios.get(api);
return res.data;//.response;//.docs;
}

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

@ -11,13 +11,12 @@
<!-- SEARCH RESULTS GO HERE, EXACTLY AS BEFORE -->
<div id="test" class="search-container row">
<div class="four columns left-bar">
{{-- <div class="four columns left-bar">
<div id="left-bar" class="sidebar left-bar">
<h2 class="indexheader">DataXplore</h2>
@if (isset($resultset))
<?php $facet = $resultset->getFacetSet()->getFacet('language'); ?>
<div class="panel panel-primary">
<h3 class="panel-title">Language</h3>
<ul class="filter-items">
@ -32,8 +31,7 @@
@endforeach
</ul>
</div>
<?php $facet = $resultset->getFacetSet()->getFacet('datatype'); ?>
<div class="panel panel-primary">
<h3 class="panel-title">Data Type</h3>
<ul class="filterItems">
@ -47,8 +45,7 @@
@endforeach
</ul>
</div>
<?php $facet = $resultset->getFacetSet()->getFacet('year'); ?>
<div class="panel panel-primary">
<h3 class="panel-title">Year</h3>
<ul class="filterItems">
@ -67,8 +64,6 @@
</div>
</div>
<div class="eight columns right-bar">
<div id="right-bar" class="sidebar right-bar">
<div class="row">
@ -150,7 +145,7 @@
</section>
@endif
</div>
</div>
</div> --}}
</div>
@ -166,5 +161,5 @@
@endsection
@section('after-scripts')
{{-- <script type="text/javascript" src="{{ asset('js/search/main.js') }}"></script> --}}
<script type="text/javascript" src="{{ asset('js/search/main.js') }}"></script>
@stop