Skip to content
Snippets Groups Projects
Commit 47fd99ab authored by Mike Lynch's avatar Mike Lynch
Browse files

Tidying up a few more bugs in the new ViewDoc code, removed a bunch of

console.logs from Router and SolrService
parent a31c3a31
Branches
No related merge requests found
......@@ -32,6 +32,7 @@ const Router = async function (state) {
if (verb === '#view/') {
console.log(`In view: currentSearch = ${JSON.stringify(state.main.currentSearch)}`);
const res = await solrService.select(state.search, {
start: 0,
page: 1,
......@@ -73,8 +74,6 @@ const Router = async function (state) {
const showFacet = search['showFacet'] || null;
delete search['showFacet'];
console.log(`search ${JSON.stringify(search)} showFacet ${showFacet}`);
const res = await solrService.select(state.search, {
start: start,
page: page,
......@@ -106,8 +105,6 @@ const Router = async function (state) {
}
} else {
console.log(`facet search fields: ${JSON.stringify(state.main.facetSearchField)}`);
const res = await solrService.select(state.search, {
start: state.main.start,
page: state.main.page,
......
......@@ -13,7 +13,6 @@ function escapeSolrQuery(raw) {
const SolrService = {
select: async function (config, {start: start, page: page, search: search, facets: facets, facetLimit: facetLimit, facetViewAll: facetViewAll}) {
console.log("SolrService.select " + JSON.stringify(search));
try {
var searchParams = config.mainSearch + '%3A*'; // default if search is empty
if( search && Object.keys(search).length > 0 ) {
......@@ -30,7 +29,6 @@ const SolrService = {
var query = `select?q=${searchParams}&start=${start}&page=${page}`;
if(facets) {
console.log(`facets ${facetLimit} ${facetViewAll}`);
query += `&facet=true&facet.field=${[...facets].join('&facet.field=')}&facet.limit=${facetLimit || 5}`;
if( facetViewAll ) {
// remove the facet limit if we're viewing one facet
......@@ -38,7 +36,6 @@ const SolrService = {
}
}
console.log(`solr query = ${query}`);
const res = await axios.get(`${config.solrUrl}/${query}`);
if (res.data) {
return {data: res.data['response'], facets: res.data['facet_counts'], status: res.status};
......
......@@ -12,7 +12,7 @@ const ViewDoc = function (data) {
<div class="container col-sm-12 col-xl-9"><div class="row">
<div class="col-3 docSummary">
${summary(data)}
<div class="summaryField"><a href="${SearchPath.toURI(data.currentSearch)}">&lt; back to search</a></div>
<div class="summaryField"><a href="${SearchPath.toURI(data.main.currentSearch)}">&lt; back to search</a></div>
</div>
<div class="col-8">
......@@ -49,7 +49,6 @@ function summary(data) {
if( fieldcf['facet'] ) {
const facet = facetcf[fieldcf['facet']];
for( v of values ) {
console.log(fieldcf['field'], v);
if( facet['JSON'] ) {
const j = tryJSON(v);
const value = {
......
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