-
- {{ item.val }} ({{ item.count }})
+
+ {{ itemAlias(item.val) }} ({{ item.count }})
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/vs-input/vs-input.ts b/src/components/vs-input/vs-input.ts
index 1b08792..822343a 100644
--- a/src/components/vs-input/vs-input.ts
+++ b/src/components/vs-input/vs-input.ts
@@ -2,12 +2,17 @@
// import debounce from 'lodash/debounce';
// import { DatasetService } from "../../services/dataset.service";
import DatasetService from "../../services/dataset.service";
-import { SolrSettings } from "@/models/solr";
-// import { ref } from "vue";
+// import { SolrSettings } from "@/models/solr"; // PENDING USE
+
+import { OpenSettings } from "@/models/solr";
import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
-// import { Prop, Emit } from "vue-property-decorator";
import { Dataset, Suggestion, SearchType } from "@/models/dataset";
-import { SOLR_HOST, SOLR_CORE } from "@/constants";
+// import { SOLR_HOST, SOLR_CORE } from "@/constants";
+
+import { OPEN_HOST, OPEN_CORE } from "@/constants"; // PENDING USE
+import { HitHighlight } from "@/models/headers";
+
+import DOMPurify from 'dompurify'; // To sanitize the HTML content to prevent XSS attacks!
@Component({
name: "VsInput",
@@ -16,30 +21,40 @@ export default class VsInput extends Vue {
// @Prop()
// private title!: string;
+ // Define the placeholder text for the input field
@Prop({ default: "Search" })
readonly placeholder!: string;
- private display = "";
+ private display = ""; // Input display value
@Prop()
private propDisplay = "";
private value!: Suggestion | string;
private error = "";
- private results: Array
= [];
- private loading = false;
- private selectedIndex = -1;
- // private selectedDisplay = "";
- private solr: SolrSettings = {
- core: SOLR_CORE, //"rdr_data", // SOLR.core;
- host: SOLR_HOST, //"tethys.at",
+ private results: Array = []; // Array to store search results
+ private highlights: Array = [];
+
+ private loading = false; // Loading state indicator
+ private selectedIndex = -1; // Index of the currently selected suggestion
+
+ // private solr: SolrSettings = {
+ // core: SOLR_CORE, //"rdr_data", // SOLR.core;
+ // host: SOLR_HOST, //"tethys.at",
+ // };
+
+ private openSearch: OpenSettings = {
+ core: OPEN_CORE, //"rdr_data", // SOLR.core;
+ host: OPEN_HOST, //"tethys.at",
// core: "test_data", // SOLR.core;
// host: "repository.geologie.ac.at",
};
- // private rdrAPI!: DatasetService;
- itemRefs!: Array;
- emits = ["filter"];
+ // private rdrAPI!: DatasetService;
+ itemRefs!: Array; // Array to store references to suggestion items
+ emits = ["filter"]; // Emits filter event
+
+ // Set reference for each item
setItemRef(el: Element): void {
this.itemRefs.push(el);
}
@@ -68,53 +83,143 @@ export default class VsInput extends Vue {
return this.error !== null;
}
+ // Computed property to generate suggestions based on search results
get suggestions(): Suggestion[] {
- // const suggestion = {
- // titles: new Array(),
- // authors: new Array(),
- // subjects: new Array(),
- // };
+
const suggestions = new Array();
- this.results.forEach((dataset) => {
- // const del = dataset.title_output?.toLowerCase();
- if (dataset.title_output.toLowerCase().includes(this.display.toLowerCase())) {
- const title = dataset.title_output;
- // if (!suggestion["titles"].find((value) => value === title)) {
- // suggestion.titles.push(title);
- // }
- const hasTitleSuggestion = suggestions.some((suggestion) => suggestion.value === title && suggestion.type == SearchType.Title);
- if (!hasTitleSuggestion) {
- const suggestion = new Suggestion(title, SearchType.Title);
- suggestions.push(suggestion);
- }
- }
- if (this.find(dataset.author, this.display.toLowerCase()) !== "") {
- const author = this.find(dataset.author, this.display.toLowerCase());
+ // console.log("getSuggestions > Display:", this.display);
+ // console.log("results:", this.results );
+ // console.log("highlights:", this.highlights);
+
+ //The method checks if there are any highlighted titles in the highlight object. If found, it joins the highlighted fragments into a single string
+ // Generate suggestions based on search results
+ this.results.forEach((dataset, index) => {
- const hasAuthorSuggestion = suggestions.some((suggestion) => suggestion.value === author && suggestion.type == SearchType.Author);
+ const highlight = this.highlights[index];
+
+ // console.log("get suggestions:id", dataset.id);
+ // console.log("get suggestions:title_output", dataset.title_output);
+ // console.log("get suggestions:author", dataset.author);
+ // console.log("get suggestions:subjects", dataset.subjects);
+
+ // Checks if a suggestion with the same title and type already exists in the suggestions array. If not, it creates a new Suggestion object and adds it to the suggestions array.
+ if (highlight.title && highlight.title.length > 0) {
+ /** This line checks if the highlight object has a title property and if that property is an array with at least one element.
+ * The highlight object contains highlighted fragments of the search term in various fields (e.g., title, author, subjects) as returned by the OpenSearch API.
+ * This check ensures that we only process results that have highlighted titles. */
+ const highlightedTitle = highlight.title.join(" ");
+ /**
+ * The highlight.title property is an array of strings, where each string is a highlighted fragment of the title. join(" ") combines these fragments into a single string with spaces between them.
+ * This step constructs a full highlighted title from the individual fragments.
+ * OpenSearch can return multiple fragments of a field (like the title) in its response, especially when the field contains multiple terms that match the search query.
+ * This can happen because OpenSearch's highlighting feature is designed to provide context around each match within the field, which can result in multiple highlighted fragments.
+ */
+ const hasTitleSuggestion = suggestions.some((suggestion) => suggestion.highlight.toLowerCase() === highlightedTitle.toLowerCase() && suggestion.type == SearchType.Title);
+ if (!hasTitleSuggestion) {
+ const suggestion = new Suggestion(dataset.title_output, highlightedTitle, SearchType.Title);
+ suggestions.push(suggestion);
+ }
+ }
+ if (highlight.author && highlight.author.length > 0) {
+ const highlightedAuthor = highlight.author.join(" ");
+ const datasetAuthor = this.find(dataset.author, this.display.toLowerCase());
+ const hasAuthorSuggestion = suggestions.some((suggestion) => suggestion.highlight.toLowerCase() === highlightedAuthor.toLowerCase() && suggestion.type == SearchType.Author);
if (!hasAuthorSuggestion) {
- const suggestion = new Suggestion(author, SearchType.Author);
+ const suggestion = new Suggestion(datasetAuthor, highlightedAuthor, SearchType.Author);
suggestions.push(suggestion);
}
}
- if (this.find(dataset.subject, this.display.toLowerCase()) != "") {
- const subject = this.find(dataset.subject, this.display.toLowerCase());
- const hasSubjectSuggestion = suggestions.some((suggestion) => suggestion.value === subject && suggestion.type == SearchType.Subject);
+ if (highlight.subjects && highlight.subjects.length > 0) {
+ const highlightedSubject = highlight.subjects.join(" ");
+ const datasetSubject = this.find(dataset.subjects, this.display.toLowerCase());
+ const hasSubjectSuggestion = suggestions.some((suggestion) => suggestion.highlight.toLowerCase() === highlightedSubject.toLowerCase() && suggestion.type == SearchType.Subject);
if (!hasSubjectSuggestion) {
- const suggestion = new Suggestion(subject, SearchType.Subject);
+ const suggestion = new Suggestion(datasetSubject, highlightedSubject, SearchType.Subject);
suggestions.push(suggestion);
}
}
+
+ // To allow search by doctype
+ if (highlight.doctype && highlight.doctype.length > 0) {
+ const highlightedDoctype = highlight.doctype.join(" ");
+
+ const hasDoctypeSuggestion = suggestions.some((suggestion) => suggestion.highlight.toLowerCase() === highlightedDoctype.toLowerCase() && suggestion.type == SearchType.Doctype);
+ if (!hasDoctypeSuggestion) {
+ const suggestion = new Suggestion(dataset.doctype, highlightedDoctype, SearchType.Doctype);
+ suggestions.push(suggestion);
+ }
+ }
+
+ // ORIGINAL SOLR ===================================================================================================
+ // if (dataset.title_output.toLowerCase().includes(this.display.toLowerCase())) {
+ // const title = dataset.title_output;
+ // // Check if there is already a suggestion with this title and type
+ // const hasTitleSuggestion = suggestions.some((suggestion) => suggestion.value === title && suggestion.type == SearchType.Title);
+ // if (!hasTitleSuggestion) {
+ // // If there is no such suggestion, create a new one and add it to the suggestions array
+ // const suggestion = new Suggestion(title, SearchType.Title);
+ // suggestions.push(suggestion);
+ // }
+ // }
+ // if (this.find(dataset.author, this.display.toLowerCase()) !== "") {
+ // const author = this.find(dataset.author, this.display.toLowerCase());
+ // // Check if there is already a suggestion with this author and type
+ // const hasAuthorSuggestion = suggestions.some((suggestion) => suggestion.value === author && suggestion.type == SearchType.Author);
+ // if (!hasAuthorSuggestion) {
+ // const suggestion = new Suggestion(author, SearchType.Author);
+ // suggestions.push(suggestion);
+ // }
+ // }
+ // if (this.find(dataset.subjects, this.display.toLowerCase()) != "") {
+ // const subject = this.find(dataset.subjects, this.display.toLowerCase());
+ // const hasSubjectSuggestion = suggestions.some((suggestion) => suggestion.value === subject && suggestion.type == SearchType.Subject);
+ // if (!hasSubjectSuggestion) {
+ // const suggestion = new Suggestion(subject, SearchType.Subject);
+ // suggestions.push(suggestion);
+ // }
+ // }
+
});
return suggestions;
}
+ /**
+ * This method combines the suggestion value and type into a single HTML string. It also sanitizes the HTML content using DOMPurify to prevent XSS attacks.
+ * The vue file uses the v-html directive to bind the combined HTML string to the label element. This ensures that the HTML content (e.g., Wien) is rendered correctly in the browser.
+ */
+ formatSuggestion(result: Suggestion): string {
+ const sanitizedValue = DOMPurify.sanitize(result.highlight);
+ // Replacing the predefined format for highlights given by OpenSearch from emphasys to bold
+ const replacedValue = sanitizedValue.replace(//g, '').replace(/<\/em>/g, '');
+ // return `${replacedValue} | ${result.type}`;
+ return `${replacedValue} | ${this.getTypeAlias(result.type)}`;
+ }
+
+ /**
+ * The alias for the result type will be set depending on the name of the type.
+ * This will allow to display the customised terms instead of the values currently used in the OpenSearch index.
+ * TODO: This should be corrected directly in the index
+ */
+ getTypeAlias(type: string): string {
+ switch (type) {
+ case "author":
+ return "creator";
+ case "subjects":
+ return "keyword";
+ case "doctype":
+ return "data type";
+ default:
+ return type;
+ }
+ }
+
/**
* Clear all values, results and errors
**/
clear(): void {
+ console.log("clear");
this.display = "";
// this.value = null;
this.results = [];
@@ -122,15 +227,20 @@ export default class VsInput extends Vue {
// this.$emit("clear");
}
+ /* When the search button is clicked or the search input is changed, it updates the value property of the component with the current value of display,
+ and emits a search-change event with the current value of display as the argument. */
@Emit("search-change")
search(): string {
+ console.log("search");
this.results = [];
// this.$emit("search", this.display)
this.value = this.display; //(obj["title_output"]) ? obj["title_output"] : obj.id
return this.display;
}
+ // Handler for search input change
searchChanged(): void {
+ // console.log("Search changed!");
this.selectedIndex = -1;
// Let's warn the parent that a change was made
// this.$emit("input", this.display);
@@ -142,7 +252,9 @@ export default class VsInput extends Vue {
}
}
+ // Perform the search request
private resourceSearch() {
+ // console.log("resourceSearch");
if (!this.display) {
this.results = [];
return;
@@ -152,23 +264,29 @@ export default class VsInput extends Vue {
this.request();
}
+ // Make the API request to search for datasets
private request(): void {
- DatasetService.searchTerm(this.display, this.solr.core, this.solr.host).subscribe({
- next: (res: Dataset[]) => this.dataHandler(res),
+ console.log("request()");
+ // DatasetService.searchTerm(this.display, this.solr.core, this.solr.host).subscribe({
+ DatasetService.searchTerm(this.display, this.openSearch.core, this.openSearch.host).subscribe({
+ // next: (res: Dataset[]) => this.dataHandler(res),
+ next: (res: { datasets: Dataset[], highlights: HitHighlight[] }) => this.dataHandler(res.datasets, res.highlights),
error: (error: string) => this.errorHandler(error),
complete: () => (this.loading = false),
});
}
- private dataHandler(datasets: Dataset[]): void {
+ // Handle the search results
+ private dataHandler(datasets: Dataset[], highlights: HitHighlight[]): void {
this.results = datasets;
- // this.$emit("search", this.display);
- // this.loading = false;
+ this.highlights = highlights; // Store highlights
+ // console.log(datasets);
+
}
+ // Handle errors from the search request
private errorHandler(err: string): void {
this.error = err;
- // this.loading = false;
}
/**
@@ -180,7 +298,9 @@ export default class VsInput extends Vue {
return key === this.selectedIndex;
}
+ // Handle arrow down key press to navigate suggestions
onArrowDown(ev: Event): void {
+ console.log("onArrowDown");
ev.preventDefault();
if (this.selectedIndex === -1) {
this.selectedIndex = 0;
@@ -190,6 +310,7 @@ export default class VsInput extends Vue {
this.fixScrolling();
}
+ // Scroll the selected suggestion into view
private fixScrolling() {
const currentElement = this.itemRefs[this.selectedIndex];
currentElement.scrollIntoView({
@@ -199,7 +320,9 @@ export default class VsInput extends Vue {
});
}
+ // Handle arrow up key press to navigate suggestions
onArrowUp(ev: Event): void {
+ console.log("onArrowUp");
ev.preventDefault();
if (this.selectedIndex === -1) {
this.selectedIndex = this.suggestions.length - 1;
@@ -209,7 +332,10 @@ export default class VsInput extends Vue {
this.fixScrolling();
}
+ // Handle enter key press to select a suggestion
onEnter(): void {
+ console.log("onEnter");
+
if (this.selectedIndex === -1) {
// this.$emit("nothingSelected", this.display);
this.display && this.search();
@@ -222,18 +348,18 @@ export default class VsInput extends Vue {
@Emit("search-change")
private select(obj: Suggestion): Suggestion {
- // if (!obj) {
- // return;
- // }
- this.value = obj; //(obj["title_output"]) ? obj["title_output"] : obj.id
- this.display = obj.value; // this.formatDisplay(obj)
- // this.selectedDisplay = this.display;
+ console.log("select:");
+ this.value = obj;
+ console.log(obj);
+
+ this.display = obj.value;
this.close();
- // this.$emit("update", this.value);
+
return this.value;
}
+ // Find a search term in an array
private find(myarray: Array, searchterm: string): string {
for (let i = 0, len = myarray.length; i < len; i += 1) {
if (typeof myarray[i] === "string" && myarray[i].toLowerCase().indexOf(searchterm) !== -1) {
@@ -248,15 +374,11 @@ export default class VsInput extends Vue {
* Close the results list. If nothing was selected clear the search
*/
close(): void {
+ console.log("close");
if (!this.value) {
this.clear();
}
- // if (this.selectedDisplay !== this.display && this.value) {
- // this.display = this.selectedDisplay;
- // }
this.results = [];
this.error = "";
- //this.removeEventListener()
- // this.$emit("close");
}
}
diff --git a/src/components/vs-input/vs-input.vue b/src/components/vs-input/vs-input.vue
index 7980aed..b4235d1 100644
--- a/src/components/vs-input/vs-input.vue
+++ b/src/components/vs-input/vs-input.vue
@@ -1,10 +1,15 @@
+
-
+
-
+
+
@@ -127,7 +136,7 @@ input {
list-style-type: none;
z-index: 1000;
position: absolute;
- max-height: 200px;
+ max-height: 192px;
overflow-y: auto;
overflow: hidden;
background: white;
@@ -140,15 +149,17 @@ input {
.autocomplete-result-item {
list-style: none;
text-align: left;
- /* padding: 7px 10px; */
+ padding: 0px 0px 0px 5px; // top,right,bottom,left
cursor: pointer;
}
.autocomplete-result-item.is-active {
background: rgba(0, 180, 255, 0.15);
+ // background: #3cc;
}
.autocomplete-result-item:hover {
- background: rgba(0, 180, 255, 0.075);
+ // background: rgba(0, 180, 255, 0.075);
+ background: #baedf1;
}
diff --git a/src/components/vs-result/vs-result.ts b/src/components/vs-result/vs-result.ts
index 6984809..39f6514 100644
--- a/src/components/vs-result/vs-result.ts
+++ b/src/components/vs-result/vs-result.ts
@@ -14,6 +14,16 @@ export default class VsResult extends Vue {
return this.datasets;
}
+ public simplifyAuthor(author:string): string {
+
+ if (author.endsWith(" ")) {
+ return author.substring(0, author.indexOf(","));
+ } else {
+ let firstNameInitial:string = author.charAt(author.indexOf(",") + 2);
+ return author.substring(0, author.indexOf(",") + 2) + firstNameInitial;
+ }
+ }
+
public getDomainWithoutSubdomain(): string {
const urlParts = new URL(window.location.href).hostname.split(".");
@@ -23,13 +33,15 @@ export default class VsResult extends Vue {
.join(".");
}
- private convert(unixtimestamp: number): string {
+ // private convert(unixtimestamp: number): string { // SOLR
+ private convert(unixtimestamp: string): string { // OpenSearch
// Unixtimestamp
// var unixtimestamp = document.getElementById('timestamp').value;
// Months array
const months_arr = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
// Convert timestamp to milliseconds
- const date = new Date(unixtimestamp * 1000);
+ // const date = new Date(unixtimestamp * 1000); // SOLR
+ const date = new Date(Number(unixtimestamp) * 1000); // OpenSearch
// Year
const year = date.getFullYear();
// Month
diff --git a/src/components/vs-result/vs-result.vue b/src/components/vs-result/vs-result.vue
index 60b1494..5387123 100644
--- a/src/components/vs-result/vs-result.vue
+++ b/src/components/vs-result/vs-result.vue
@@ -3,49 +3,46 @@
-
-
-
{{ "https://doi.org/" + document.identifier[0] + " ➤" }}
- {{ document.author[0] }}
+
+
+
+
+
+
+ {{ simplifyAuthor(document.author[0]) }}
+
+
+
+
+ {{ simplifyAuthor(author) }};
+
+
+
+
+
+ {{ simplifyAuthor(author) }};
+
+ et al.
+
+
-
-
-
-
- {{
- document.title_output
- }}
+
-
-
{{ convert(document.server_date_published) + ": " }}
- {{ document.abstract_output }}
+
+ {{ document.abstract[0] }}
...
@@ -53,11 +50,9 @@
{{ document.doctype }}
-
Open Access
-
diff --git a/src/constants.ts b/src/constants.ts
index acd7381..2bc8d53 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,20 +1,26 @@
-// declare const POINT_URL: string;
-// declare const EDGE_URL: string;
declare const APP_URL: string;
declare const VUE_API: string;
-declare const SOLR_HOST: string;
-declare const SOLR_CORE: string;
+// declare const SOLR_HOST: string;
+// declare const SOLR_CORE: string;
+
+// OPENSEARCH
+declare const OPEN_HOST: string;
+declare const OPEN_CORE: string;
-// const _EDGE_URL = EDGE_URL;
-// const _POINT_URL = POINT_URL;
const _APP_URL = APP_URL;
const _VUE_API = VUE_API;
-const _SOLR_HOST = SOLR_HOST;
-const _SOLR_CORE = SOLR_CORE;
+// const _SOLR_HOST = SOLR_HOST;
+// const _SOLR_CORE = SOLR_CORE;
+
+// OPENSEARCH
+const _OPEN_HOST = OPEN_HOST;
+const _OPEN_CORE = OPEN_CORE;
-// export { _EDGE_URL as EDGE_URL };
-// export { _POINT_URL as POINT_URL };
export { _APP_URL as APP_URL };
export { _VUE_API as VUE_API };
-export { _SOLR_HOST as SOLR_HOST };
-export { _SOLR_CORE as SOLR_CORE };
+// export { _SOLR_HOST as SOLR_HOST };
+// export { _SOLR_CORE as SOLR_CORE };
+
+// OPENSEARCH
+export { _OPEN_HOST as OPEN_HOST };
+export { _OPEN_CORE as OPEN_CORE };
diff --git a/src/main.ts b/src/main.ts
index e4bd3bd..34651e1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -15,7 +15,7 @@ const host = window.location.host;
const parts = host.split(".");
// const domainLength = 2; // route1.example.com => domain length = 3
let router, app;
-// let routes;
+// exmample change
if (parts[0] === "doi") {
router = route1;
app = App2;
diff --git a/src/models/dataset.ts b/src/models/dataset.ts
index c3de319..9df56f3 100644
--- a/src/models/dataset.ts
+++ b/src/models/dataset.ts
@@ -1,72 +1,92 @@
// import moment from "moment";
import dayjs from "dayjs";
+// // SOLR Dataset original
+// export interface Dataset {
+// abstract_additional: Array
;// OpenSearch: abstract: Array
+// abstract_output: string;// -----
+// author: Array;// EQUAL
+// author_sort: Array;// -----
+// belongs_to_bibliography: boolean;// EQUAL
+// creating_corporation: string;// EQUAL
+// doctype: string;// EQUAL
+// geo_location: string;// EQUAL
+// id: number;// EQUAL
+// identifier: Identifier;// OpenSearch: identifier: Array
+// language: string;// EQUAL
+// licence: string;// EQUAL
+// publisher_name: string;// EQUAL
+// server_date_published: Array;// OpenSearch not array!
+// subject: Array;// OpenSearch: subjectS
+// title_output: string;// EQUAL
+// year: number;// EQUAL
+// year_inverted: number;// EQUAL
+// }
+
+// OpenSearch Dataset
export interface Dataset {
- abstract_additional: Array;
- abstract_output: string;
- author: Array;
- author_sort: Array;
- belongs_to_bibliography: boolean;
- creating_corporation: string;
- doctype: string;
- geo_location: string;
- id: number;
- identifier: Identifier;
- language: string;
- licence: string;
- publisher_name: string;
- server_date_published: Array;
- subject: Array;
- title_output: string;
- year: number;
- year_inverted: number;
+ abstract: Array;// OpenSearch: abstract: Array
+ // abstract_output: string;// ----- NOT in OpenSearch
+ author: Array;// EQUAL
+ // author_sort: Array;// ----- NOT in OpenSearch
+ belongs_to_bibliography: boolean;// EQUAL
+ creating_corporation: string;// EQUAL
+ doctype: string;// EQUAL
+ geo_location: string;// EQUAL
+ id: number;// EQUAL
+ // identifier: Identifier;// OpenSearch: identifier: Array
+ identifier: Array// DIFF DATATYPE
+ language: string;// EQUAL
+ licence: string;// EQUAL
+ publisher_name: string;// EQUAL
+ // server_date_published: Array;// OpenSearch string!
+ server_date_published: string;// DIFF DATATYPE
+ // subject: Array;// OpenSearch: subjectS
+ subjects: Array;// DIFF DATATYPE
+ title_output: string;// EQUAL
+ year: number;// EQUAL
+ year_inverted: number;// EQUAL
+
+ title: string // Unique in OpenSearch
+ title_additional: Array // Unique in OpenSearch
+ bbox_xmin: string // Unique in OpenSearch
+ bbox_xmax: string // Unique in OpenSearch
+ bbox_ymin: string // Unique in OpenSearch
+ bbox_ymax: string // Unique in OpenSearch
+ reference: Array // Unique in OpenSearch
+ abstract_additional: Array;// Unique in OpenSearch
}
+
export class Suggestion {
constructor(
- public value: string,
- public type: SearchType,
+ public value: string, // Store the text value returned by OpenSearch
+ // Store the highlight: i.e. the text value with the emphasised term that generated that results by OpenSearch.
+ // In this way we can highlight the real term existing in the publication independently of how different was the inserted term used for the FUZZY search. e.g. "Vien" fuzzy matched with "Wien"
+ public highlight: string,
+ public type: SearchType, // Type of search element
) {}
// value!: string;
// type!: SearchType;
}
+// export class Suggestion {
+// constructor(
+// public value: string,
+// public type: SearchType,
+// ) {}
+// // value!: string;
+// // type!: SearchType;
+// }
+
export enum SearchType {
Title = "title",
Author = "author",
- Subject = "subject",
+ Subject = "subjects", // ** !! The field has this name in OpenSearch!!
+ Doctype = "doctype"
}
export class DbDataset {
- // public id!: number;
- // public url!: string;
- // public contributing_corporation!: string;
- // public creating_corporation!: string;
- // public publisher_name!: string;
- // public embargo_date!: string;
- // public publish_id!: number;
- // public project_id!: number;
- // public type!: string;
- // public language!: string;
- // public server_state!: string;
- // public belongs_to_bibliography!: boolean;
- // public created_at!: string;
- // public server_date_modified!: string;
- // public server_date_published!: string;
- // public account_id!: number;
- // public editor_id!: number;
- // public reviewer_id!: number;
- // public preferred_reviewer!: number;
- // public preferred_reviewer_email!: string;
- // public reject_editor_note!: string;
- // public reject_reviewer_note!: string;
- // public reviewer_note_visible!: string;
- // public titles!: Array;
- // public abstracts!: Array<Abstract>;
- // public authors!: Array<Author>;
- // public contributors!: Array<Author>;
- // public user!: Person;
- // public subjects!: Array<Subject>;
constructor(
public id: string,
@@ -215,17 +235,31 @@ export class DbDataset {
const yMax = this.coverage.y_max;
// const elevationAbsolut = this.coverage.elevation_absolut;
+ // let geoLocation =
+ // "- SOUTH-BOUND LATITUDE: " +
+ // yMin +
+ // "\n" +
+ // "- WEST-BOUND LONGITUDE: " +
+ // xMin +
+ // "\n" +
+ // "- NORTH-BOUND LATITUDE: " +
+ // yMax +
+ // "\n" +
+ // "- EAST-BOUND LONGITUDE: " +
+ // xMax;
+
let geoLocation =
- "* SOUTH-BOUND LATITUDE: " +
+ // "- SOUTH-BOUND LATITUDE: " +
+ "- South-bound Latitude: " +
yMin +
"\n" +
- "* WEST-BOUND LONGITUDE: " +
+ "- West-bound Longitude: " +
xMin +
"\n" +
- "* NORTH-BOUND LATITUDE: " +
+ "- North-bound Latitude: " +
yMax +
"\n" +
- "* EAST-BOUND LONGITUDE: " +
+ "- East-bound Longitude: " +
xMax;
// geoLocation += elevationAbsolut != null ? ` * ELEVATION ABSOLUT: ${elevationAbsolut}\n` : "";
@@ -234,36 +268,83 @@ export class DbDataset {
let elevation = "";
if (this.coverage.elevation_max != null && this.coverage.elevation_min != null) {
- elevation += "\n* ELEVATION MIN: " + this.coverage.elevation_min + " *\nELEVATION MAX: " + this.coverage.elevation_max;
+ // elevation += "\n- ELEVATION MIN: " + this.coverage.elevation_min + " \n- ELEVATION MAX: " + this.coverage.elevation_max;
+ elevation += "\n- Elevation Min.: " + this.coverage.elevation_min + " m\n- Elevation Max.: " + this.coverage.elevation_max + " m";
}
if (this.coverage.elevation_absolut != null) {
- elevation += "\n* ELEVATION ABSOLUT: " + this.coverage.elevation_absolut;
+ elevation += "\n- Elevation Absolut: " + this.coverage.elevation_absolut + " m";
}
- if (elevation != "") geoLocation += elevation;
+ // if (elevation != "") geoLocation += ("\n---" + elevation);
let depth = "";
if (this.coverage.depth_max != null && this.coverage.depth_min != null) {
- depth += "\n* DEPTH MIN: " + this.coverage.depth_min + "\n* DEPTH MAX: " + this.coverage.depth_max;
+ depth += "\n- Depth Min.: " + this.coverage.depth_min + " m\n- Depth Max.: " + this.coverage.depth_max + " m";
}
if (this.coverage.elevation_absolut != null) {
- depth += "\n* DEPTH ABSOLUT: " + this.coverage.depth_absolut;
+ depth += "\n- Depth Absolut: " + this.coverage.depth_absolut + " m";
}
- if (depth != "") geoLocation += depth;
+ // if (depth != "") geoLocation += depth;
let time = "";
if (this.coverage.time_max != null && this.coverage.time_min != null) {
- time += "\n* TIME MIN: " + this.coverage.time_min + "\n* TIME MAX: " + this.coverage.time_max;
+ time += "\n- Time Min.: " + this.coverage.time_min + "\n- Time Max.: " + this.coverage.time_max;
}
if (this.coverage.time_absolut != null) {
- time += "\n* TIME ABSOLUT: " + this.coverage.time_absolut;
+ time += "\n- Time Absolut: " + this.coverage.time_absolut;
}
- if (time != "") geoLocation += time;
+ // if (time != "") geoLocation += time;
- return geoLocation;
+ // let elevation = "";
+ // if (this.coverage.elevation_max != null && this.coverage.elevation_min != null) {
+ // elevation += "\n* ELEVATION MIN: " + this.coverage.elevation_min + " \n* ELEVATION MAX: " + this.coverage.elevation_max;
+ // }
+ // if (this.coverage.elevation_absolut != null) {
+ // elevation += "\n* ELEVATION ABSOLUT: " + this.coverage.elevation_absolut;
+ // }
+ // if (elevation != "") geoLocation += elevation;
+
+ // let depth = "";
+ // if (this.coverage.depth_max != null && this.coverage.depth_min != null) {
+ // depth += "\n* DEPTH MIN: " + this.coverage.depth_min + "\n* DEPTH MAX: " + this.coverage.depth_max;
+ // }
+ // if (this.coverage.elevation_absolut != null) {
+ // depth += "\n* DEPTH ABSOLUT: " + this.coverage.depth_absolut;
+ // }
+ // if (depth != "") geoLocation += depth;
+
+ // let time = "";
+ // if (this.coverage.time_max != null && this.coverage.time_min != null) {
+ // time += "\n* TIME MIN: " + this.coverage.time_min + "\n* TIME MAX: " + this.coverage.time_max;
+ // }
+ // if (this.coverage.time_absolut != null) {
+ // time += "\n* TIME ABSOLUT: " + this.coverage.time_absolut;
+ // }
+ // if (time != "") geoLocation += time;
+
+ if (elevation != "" || depth != "" || time != "" ) {
+ return geoLocation + "\n ---" + elevation + depth + time;
+ } else {
+ return geoLocation + elevation + depth + time;
+ }
+
+ // return geoLocation;
} else {
return "";
}
}
+
+ /* Provides the bounds of the publication for the Leaflet minimap */
+ public get Bounds(): L.LatLngBoundsLiteral | string {
+ if (this.coverage != undefined) {
+ return [
+ [Number(this.coverage.y_min), Number(this.coverage.x_min)], // Southwest corner
+ [Number(this.coverage.y_max), Number(this.coverage.x_max)] // Northeast corner
+ ];
+ } else {
+ return "";
+ }
+ }
+
}
type Nullable<T> = T | undefined;
diff --git a/src/models/headers.ts b/src/models/headers.ts
index d7cac90..82c5423 100644
--- a/src/models/headers.ts
+++ b/src/models/headers.ts
@@ -18,19 +18,6 @@ export interface ResponseHeaderParams {
rows?: number;
start?: number;
wt?: string;
-
- // 0:'fl=id,licence,server_date_published,abstract_output,identifier,title_output,title_additional,author,subject,doctype'
-
- // df:'title'
- // facet:'on'
- // indent:'on'
- // json.facet.language:'{ type: "terms", field: "language" }'
- // json.facet.subject:'{ type: "terms", field: "subject" }'
- // q:'title:Geodaten - Blatt 49 Wels (1:50.000)'
- // q.op:'and'
- // rows:'10'
- // start:'0'
- // wt:'json'
}
export interface ResponseContent {
@@ -39,36 +26,21 @@ export interface ResponseContent {
docs: Array<Dataset>;
}
-// export interface FacetCount {
-// facet_fields: FacetCategory<any>;
-// }
-
-// export class FacetCategory<T> {
-
-// [key: string]: {
-// values: T[];
-// };
-// }
-
+//Used
export class FacetResults {
- // language!: Array<FacetItem>;
- // subject!: Array<FacetItem>;
[key: string]: Array<FacetItem>;
}
-//#region solr response facets
export class FacetFields {
- // count: number;
language!: FacetInstance;
subject!: FacetInstance;
- // [key: string]: FacetInstance;
}
export interface FacetInstance {
[key: string]: Array<FacetItem>;
- // buckets: Array<FacetItem>;
}
+//Used
export class FacetItem {
val: string;
count: number;
@@ -83,3 +55,85 @@ export class FacetItem {
}
}
//#endregion
+
+// OPENSEARCH
+// ========================================================================
+export interface OpenSearchResponse {
+ took: number;
+ timed_out: boolean;
+ _shards: Shards;
+ hits: Hits; // Equivalent SOLR: response > docs
+ aggregations?: Aggregations; // Equivalent SOLR: facets
+}
+
+export interface Shards {
+ total: number;
+ successful: number;
+ skipped: number;
+ failed: number;
+}
+
+export interface Hits {
+ total: Total;
+ max_score: number;
+ hits: Array<Hit>;
+}
+
+export interface Total {
+ value: number; // Equivalent SOLR: response > numFound
+ relation: string;
+}
+
+export interface Hit {
+ _index: string;
+ _id: string;
+ _score: number;
+ _source: Dataset;
+ highlight: HitHighlight; // !! This name is to avoid collision with Typescript "Highlight" class
+}
+
+export interface HitHighlight {
+ subjects?: Array<string>;
+ title?: Array<string>;
+ author?: Array<string>;
+ doctype?: Array<string>;
+}
+
+export interface Aggregations { // Equivalent SOLR: FacetFields
+ subjects: Subjects;
+ language: Language;
+ doctype: Doctype;
+}
+
+export interface Subjects {
+ doc_count_error_upper_bound: number;
+ sum_other_doc_count: number;
+ buckets: Array<Bucket>;
+}
+
+export interface Language {
+ doc_count_error_upper_bound: number;
+ sum_other_doc_count: number;
+ buckets: Array<Bucket>;
+}
+
+export interface Doctype {
+ doc_count_error_upper_bound: number;
+ sum_other_doc_count: number;
+ buckets: Array<Bucket>;
+}
+
+export interface Bucket {
+ key: string;
+ doc_count: number;
+}
+// // Needed?
+// export interface Aggregations {
+// [key: string]: Aggregation;
+// }
+
+// export interface Aggregation {
+// buckets: Array<Bucket>;
+// }
+
+
diff --git a/src/models/solr.ts b/src/models/solr.ts
index 3e87ca2..d850e71 100644
--- a/src/models/solr.ts
+++ b/src/models/solr.ts
@@ -1,4 +1,9 @@
-export interface SolrSettings {
+// export interface SolrSettings {
+// core: string;
+// host: string;
+// }
+
+export interface OpenSettings {
core: string;
host: string;
}
diff --git a/src/search_page.html b/src/search_page.html
deleted file mode 100644
index 0941616..0000000
--- a/src/search_page.html
+++ /dev/null
@@ -1,698 +0,0 @@
-<div class="columns">
-
- <div class="column is-9 results_column" style="padding-top: 1.2rem; padding-right: 0.5rem">
- <div class="column" id="loading_bar" style="padding-top: 0px; display: none">
- <div class="column" style="padding-top: 0; padding-bottom: 0; margin-bottom: 0"></div>
- <div class="card" style="margin-bottom: 0px">
- <div class="card-content">
- <div class="content">
- <noscript>It appears that your Javascript is disabled. To view results on
- this page, you will need to enable it. You might want to visit our
- <a href="/lite/results">lite results</a>.
- </noscript>
- <progress class="progress is-large" max="100">60%</progress>
- </div>
- </div>
- </div>
- </div>
- <div id="results">
- <div class="column" style="padding-top: 0">
- <div class="card" style="margin-bottom: 0px">
- <div class="card-content">
- <div class="content">
- It looks like you're not logged in right now. you will need to
- <a href="/login" target="_self">login to Pro</a> or become a
- <a href="https://coil.com/?ref=InfinitySearch2229" target="_self">Coil Member</a>
- to access the results.
- <div class="block"></div>
- <div class="columns" style="text-align: center">
- <div class="column is-one-third">
- <a class="button" style="width: 100%" href="/login" target="_self">Login</a>
- </div>
- <div class="column is-one-third">
- <a class="button" style="width: 100%" href="/pro" target="_self">Learn more about
- Infinity Pro</a>
- </div>
- <div class="column is-one-third">
- <a class="button" style="width: 100%"
- href="https://coil.com/?ref=InfinitySearch2229" target="_self">Learn more about
- Coil</a>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div hidden="" id="id-custom-tab-page">
- <div class="columns" style="margin-top: 1rem">
- <div class="column is-one-quarter is-offset-2">
- <p class="heading">Current Tabs</p>
- <div id="id-current-tab-list">
- <nav class="level is-mobile" id="id-web-tab">
- <div class="level-item has-text-centered is-capitalized">web</div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-web" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-images-tab">
- <div class="level-item has-text-centered is-capitalized">
- images
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-images" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-videos-tab">
- <div class="level-item has-text-centered is-capitalized">
- videos
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-videos" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-homepages-tab">
- <div class="level-item has-text-centered is-capitalized">
- homepages
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-homepages" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-food-tab">
- <div class="level-item has-text-centered is-capitalized">
- food
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-food" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-books-tab">
- <div class="level-item has-text-centered is-capitalized">
- books
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-books" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- <nav class="level is-mobile" id="id-movies-tab">
- <div class="level-item has-text-centered is-capitalized">
- movies
- </div>
- <div class="level-item has-text-centered is-one-quarter">
- <div style="order: 2; margin-left: auto; margin-right: 0.5rem">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- <img class="handle trash" src="/static/images/fa/trash-alt.svg"
- id="id-remove-tab-icon-movies" style="
- cursor: pointer;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- margin-left: 0.5rem;
- " onclick="removeTab(this);" />
- </div>
- </div>
- </nav>
- </div>
- </div>
- <div class="column is-one-quarter is-offset-1">
- <p class="heading">Add New Tabs</p>
- <nav class="level">
- <div class="level-item">
- <div class="select">
- <select id="id-add-tab-selector" style="
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI',
- Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans',
- 'Droid Sans', 'Helvetica Neue', Helvetica, Arial,
- sans-serif;
- ">
- <option id="id-tab-selector-web" value="web" style="display: none">
- Web
- </option>
- <option id="id-tab-selector-images" value="images" style="display: none">
- Images
- </option>
- <option id="id-tab-selector-videos" value="videos" style="display: none">
- Videos
- </option>
- <option id="id-tab-selector-homepages" value="homepages" style="display: none">
- Homepages
- </option>
- <option id="id-tab-selector-general" value="general">
- General
- </option>
- <option id="id-tab-selector-food" value="food" style="display: none">
- Food
- </option>
- <option id="id-tab-selector-books" value="books" style="display: none">
- Books
- </option>
- <option id="id-tab-selector-movies" value="movies" style="display: none">
- Movies
- </option>
- <option id="id-tab-selector-music" value="music">
- Music
- </option>
- <option id="id-tab-selector-infinity" value="infinity">
- Infinity
- </option>
- <option id="id-tab-selector-edu" value="edu">Edu</option>
- <option id="id-tab-selector-pdf" value="pdf">Pdf</option>
- <option id="id-tab-selector-qa" value="qa">Qa</option>
- <option id="id-tab-selector-reddit" value="reddit">
- Reddit
- </option>
- <option id="id-tab-selector-fandom" value="fandom">
- Fandom
- </option>
- <option id="id-tab-selector-coil" value="coil">Coil</option>
- <option id="id-tab-selector-no_js" value="no_js">
- No Javascript
- </option>
- <option id="id-tab-selector-decentralized" value="decentralized">
- Decentralized
- </option>
- </select>
- </div>
- </div>
- <div class="level-item">
- <button class="button" id="id-add-tab-button" onclick="addTab();" style="
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI',
- Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- Add
- </button>
- </div>
- </nav>
- <br />
- <nav class="level">
- <div class="level-item">
- <button class="button" id="id-update-tabs-button" style="
- order: 2;
- margin-left: auto;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI',
- Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- " onclick="resetTabsToOriginal();">
- Reset
- </button>
- </div>
- </nav>
- <div id="id-custom-tabs-error"></div>
- </div>
- </div>
- </div>
- </div>
-
-
-
- <div id="id-side-bar" class="column is-3 sidebar_column" style="padding-top: 1.2rem; padding-right: 1.5rem">
- <div id="externals" class="">
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://en.wikipedia.org/w/index.php?search="
- href="https://en.wikipedia.org/w/index.php?search=test" name="external_link_0"
- style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/wikipedia.ico"
- name="external_icon_0'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_0"
- style="font-size: 0.95rem; display: inline">
- Wikipedia Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://duckduckgo.com/?q=" href="https://duckduckgo.com/?q=test" name="external_link_1"
- style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/duckduckgo.ico"
- name="external_icon_1'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_1"
- style="font-size: 0.95rem; display: inline">
- DuckDuckGo Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://www.google.com/search?q=" href="https://www.google.com/search?q=test"
- name="external_link_2" style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/google.ico"
- name="external_icon_2'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_2"
- style="font-size: 0.95rem; display: inline">
- Google Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://www.youtube.com/results?search_query="
- href="https://www.youtube.com/results?search_query=test" name="external_link_3"
- style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/youtube.svg"
- name="external_icon_3'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_3"
- style="font-size: 0.95rem; display: inline">
- Youtube Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://www.amazon.com/s?k=" href="https://www.amazon.com/s?k=test"
- name="external_link_4" style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/amazon.ico"
- name="external_icon_4'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_4"
- style="font-size: 0.95rem; display: inline">
- Amazon Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://twitter.com/search?q=" href="https://twitter.com/search?q=test"
- name="external_link_5" style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/twitter.png"
- name="external_icon_5'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_5"
- style="font-size: 0.95rem; display: inline">
- Twitter Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://www.reddit.com/search/?q=" href="https://www.reddit.com/search/?q=test"
- name="external_link_6" style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/reddit.ico"
- name="external_icon_6'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_6"
- style="font-size: 0.95rem; display: inline">
- Reddit Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://github.com/search?q=" href="https://github.com/search?q=test"
- name="external_link_7" style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/github.ico"
- name="external_icon_7'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_7"
- style="font-size: 0.95rem; display: inline">
- GitHub Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- <div class="card" name="external_card" style="margin-bottom: 0px">
- <header class="card-header">
- <p class="card-header-title" style="font-weight: normal; padding-right: 5px">
- <a id="https://www.reuters.com/search/news?blob="
- href="https://www.reuters.com/search/news?blob=test" name="external_link_8"
- style="display: block" rel="noreferrer noopener" target="_self">
- <img onerror="imgError(this)" src="/static/images/favicons/reuters.ico"
- name="external_icon_8'" class="external-icon" />
- <span hidden="" class="external-text" name="external_text_8"
- style="font-size: 0.95rem; display: inline">
- Reuters Results
- </span>
- </a>
- </p>
- <span class="clickableIcon" onclick="removeExternalClickable(this)" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 6px;
- min-width: 0.5em;
- ">
- <img class="handle fa-ellipsis-v" src="/static/images/fa/ellipsis-v.svg" style="
- cursor: pointer;
- display: block;
- margin: auto;
- margin-right: 12px;
- min-width: 0.5em;
- width: 16px;
- height: 16px;
- " />
- </span>
- </header>
- </div>
- </div>
- <div id="externals_menu">
- <div class="card is-fullwidth" id="plus-minus-info" style="
- margin-top: 0.5rem;
- margin-bottom: 0px;
- height: 2.5rem;
- padding: 0.7rem;
- ">
- <div class="columns is-vcentered is-mobile">
- <div class="column" style="text-align: center">
- <button class="button is-small" id="external_add" style="
- border-color: transparent;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI',
- Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- <img src="/static/images/fa/plus.svg" class="cl-external-link-img" />
- </button>
- </div>
- <div class="column is-narrow" style="text-align: center">|</div>
- <div class="column" style="text-align: center">
- <button class="button is-small" id="external_minus" style="
- border-color: transparent;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI',
- Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- <img src="/static/images/fa/minus.svg" class="cl-external-link-img" />
- </button>
- </div>
- <div class="column is-narrow" style="text-align: center">|</div>
- <div class="column" style="text-align: center">
- <div id="external-info-button" style="text-align: center">
- <div style="cursor: pointer" id="externals_layout_button"
- onclick="toggleExternalsLayout();">
- <img id="id-externals-layout-img" class="cl-external-link-img"
- src="/static/images/fa/list.svg" />
- </div>
- </div>
- </div>
- </div>
- </div>
- <div id="external_link_add_box" style="margin: 0.5rem" hidden="">
- <div class="box is-fullwidth is" style="margin: 0; padding: 0.5rem">
- <input class="input is-small" id="new_external_label" placeholder="Search Label" style="
- margin: 0.25rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- " />
- <input class="input is-small" id="new_external_link"
- placeholder="Search Link (https://is.com/results?q=)" style="
- margin: 0.25rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- " />
- <input class="input is-small" id="new_external_icon"
- placeholder="Icon Link (https://is.com/img.png)" style="
- margin: 0.25rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- " />
- </div>
- <button class="button is-small is-outlined" id="external_input_add" style="
- float: right;
- margin: 0.5rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- Add
- </button>
- <button class="button is-small is-outlined is-danger" id="external_input_cancel" style="
- float: right;
- margin-top: 0.5rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- Cancel
- </button>
- </div>
- <div id="external_input_defaults" hidden="">
- <button class="button is-small is-outlined is-danger" id="external_input_defaults_button" style="
- float: right;
- margin-top: 0.5rem;
- font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
- 'Helvetica Neue', Helvetica, Arial, sans-serif;
- ">
- Reset
- </button>
- </div>
- </div>
- <br />
- </div>
-
-
-</div>
\ No newline at end of file
diff --git a/src/services/dataset.service - Tests with OpenSearch b/src/services/dataset.service - Tests with OpenSearch
new file mode 100644
index 0000000..db453f0
--- /dev/null
+++ b/src/services/dataset.service - Tests with OpenSearch
@@ -0,0 +1,161 @@
+ // public facetedSearchOPEN(
+ // suggestion: Suggestion | string,
+ // activeFilterCategories: ActiveFilterCategories,
+ // openCore: string,
+ // openHost: string,
+ // start?: string, // Starting page
+ // ): Observable<OpenSearchResponse> {
+ // // OpenSearch endpoint
+ // const host = openHost;
+ // const path = "/" + openCore + "/_search";
+ // const base = host + path;
+
+ // // Constructing Filters Based on Active Filter Categories
+ // const filters = Object.entries(activeFilterCategories).map(([category, values]) => {
+ // if (category === "language" || category === "year") {
+ // return { terms: { [category]: values } };
+ // } else {
+ // return { terms: { [`${category}.keyword`]: values } };
+ // }
+ // });
+ // console.log("filters:", filters);
+
+ // // Determine search term and query fields based on the suggestion type
+ // let query;
+ // if (typeof suggestion === "string") { // If suggestion is a string, append a wildcard (*) for partial matches
+ // const lowercaseTerm = suggestion.toLowerCase()
+ // query = {
+ // bool: {
+ // should: [
+ // { match: { title: { query: suggestion, fuzziness: "AUTO", boost: 3 } } },
+ // { match: { author: { query: suggestion, fuzziness: "AUTO", boost: 2 } } },
+ // { match: { subjects: { query: suggestion, fuzziness: "AUTO", boost: 1 } } },
+ // { wildcard: { title: { value: `${lowercaseTerm}*`, boost: 3 } } },
+ // { wildcard: { author: { value: `${lowercaseTerm}*`, boost: 2 } } },
+ // { wildcard: { subjects: { value: `${lowercaseTerm}*`, boost: 1 } } }
+ // ],
+ // minimum_should_match: 1
+ // }
+ // };
+ // } else if (suggestion instanceof Suggestion) { // If suggestion is a Suggestion object, form a specific query
+ // query = {
+ // match: {
+ // [suggestion.type]: {
+ // query: suggestion.value,
+ // operator: 'and' // all the terms in the query must be present in the field e.g. if is a title, the complete title
+ // }
+ // }
+ // };
+ // }
+
+ // // Set default value for start if not provided
+ // const startValue = start ? parseInt(start) : 0;
+
+ // // console.log(activeFilterCategories);
+ // // console.log("mainQuery:", mainQuery);
+
+ // // Construct the body of the OpenSearch query
+ // const body = {
+
+ // query: {
+ // bool: {
+ // must: [
+ // mainQuery, // Ensure the main query must be satisfied
+ // ...filters // Ensure all filters must be satisfied
+ // ]
+ // }
+ // },
+
+ // // // WORKS // Expected: 12 results
+ // // query: {
+ // // bool: {
+ // // "must": [
+ // // { "term": { "language": "en" } },
+ // // { "term": { "subjects.keyword": "Lower Austria" } },
+ // // { "term": { "subjects.keyword": "counting data" } }
+ // // ],
+ // // }
+ // // },
+
+ // // // THIS WORKS: // Expected: 19 results
+ // // query: {
+ // // bool: {
+ // // must: [
+ // // { "match": { "title": "Blatt" } },
+ // // { "term": { "subjects": "bayern" } }
+ // // ],
+ // // }
+ // // },
+
+ // // // WORKS // Expected: 4 results
+ // // query: {
+ // // bool: {
+ // // "must": [
+ // // { "match": { "title": "blatt" } },
+ // // { "term": { "subjects": "bayern" } },
+ // // { "term": { "subjects": "salzburg" } }
+ // // ],
+ // // }
+ // // },
+
+ // // // WORKS // Expected: 2 results
+ // // query: {
+ // // bool: {
+ // // "must": [
+ // // { "match": { "title": "blatt" } },
+ // // { "term": { "subjects": "ungarn" } },
+ // // { "term": { "subjects": "steiermark" } }
+ // // ],
+ // // }
+ // // },
+
+ // // WORKS // Expected: 12 results
+ // query: {
+ // bool: {
+ // "must": [
+ // { "term": { "language": "en" } },
+ // { "term": { "subjects.keyword": "Lower Austria" } },
+ // { "term": { "subjects.keyword": "counting data" } }
+ // ],
+ // "should": [
+ // { match: { title: { query: "halger", fuzziness: "AUTO", boost: 3 } } },
+ // { match: { author: { query: "halger", fuzziness: "AUTO", boost: 2 } } },
+ // { match: { subjects: { query: "halger", fuzziness: "AUTO", boost: 1 } } },
+ // { wildcard: { title: { value: "halger", boost: 3 } } },
+ // { wildcard: { author: { value: "halger", boost: 2 } } },
+ // { wildcard: { subjects: { value: "halger", boost: 1 } } }
+ // ],
+ // minimum_should_match: 1
+ // }
+ // },
+
+ // size: 10,
+ // from: startValue,
+ // sort: [{ _score: { order: "desc" } }],
+ // track_scores: true,
+
+ // aggs: {
+ // subjects: { terms: { field: "subjects.keyword", size: 1000 } },
+ // language: { terms: { field: "language" } },
+ // author: { terms: { field: "author.keyword", size: 1000 } },
+ // year: { terms: { field: "year", size: 100 } }
+ // },
+
+ // highlight: {
+ // fields: {
+ // title: {},
+ // author: {},
+ // subjects: {}
+ // }
+ // }
+ // };
+
+ // console.log("mainQuery:", mainQuery);
+ // console.log("filters:", filters);
+ // console.log("body:", body);
+
+ // // Make API call to OpenSearch and return the result
+ // const stations = api.post<OpenSearchResponse>(base, body);
+
+ // return stations;
+ // }
diff --git a/src/services/dataset.service.ts b/src/services/dataset.service.ts
index 4643ea9..c897b29 100644
--- a/src/services/dataset.service.ts
+++ b/src/services/dataset.service.ts
@@ -1,361 +1,386 @@
import api from "../api/api";
-// import { Observable, of } from "rxjs";
import { Observable } from "rxjs";
-import { map } from "rxjs/operators";
+import { tap, map } from "rxjs/operators";
import { Dataset, DbDataset, Suggestion } from "@/models/dataset";
-import { SolrResponse } from "@/models/headers";
+import { HitHighlight, OpenSearchResponse, SolrResponse } from "@/models/headers";
import { ActiveFilterCategories } from "@/models/solr";
import { VUE_API } from "@/constants";
-// import { deserialize, instanceToInstance } from "class-transformer";
import { deserialize } from "class-transformer";
-// import { OAI_DATASETS } from "./mock-oai-datasets";
-// import { OaiDataset, OaiPerson } from "@/models/oai";
-// import xml2js from "xml2js";
class DatasetService {
- // for the autocomplete search
- public searchTerm(term: string, solrCore: string, solrHost: string): Observable<Dataset[]> {
- // solr endpoint
- // const host = 'http://voyagerdemo.com/';
- // const host = 'https://www.tethys.at/';''
- const host = "https://" + solrHost;
- const path = "/solr/" + solrCore + "/select?";
- // const base = "https://geomon.geologie.ac.at/52n-sos-webapp/api/features"; //host + path;
- const base = host + path;
+ /**
+ * Search datasets with OpenSearch API, allowing for fuzzy search and boosting relevance in title, author, and subject fields.
+ * @param {string} searchTerm - Search query term
+ * @param {string} openCore - The OpenSearch core to search in
+ * @param {string} openHost - The OpenSearch host URL
+ * @returns {Observable} - Observable emitting datasets and their highlights
+ */
+ public searchTerm(term: string, openCore: string, openHost: string): Observable<{ datasets: Dataset[], highlights: HitHighlight[] }> {
- //const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned
- const fields = [
- "id",
- "licence",
- "server_date_published",
- "abstract_output",
- "title_output",
- "title_additional",
- "author",
- "subject",
- "doctype",
- ].toString();
-
- //var dismaxFields = "title^3 abstract^2 subject^1";
- const qfFields = "title^3 author^2 subject^1";
- // let params = "fl=" + fields;
- // // if (term == "*%3A*") { // *:
- // // params += "&defType=edismax&wt=json&indent=on"; //edismax
- // // } else {
- // params += "&defType=edismax&qf=" + qfFields + "&wt=json&indent=on"; //dismax
- // // }
-
- // const query = "&q=" + term + "*";
- // const apiU = base + params + query;
-
- const q_params = {
- "0": "fl=" + fields,
- q: term + "*",
- defType: "edismax",
- qf: qfFields,
- indent: "on",
- wt: "json",
+ const host = openHost; // OpenSearch host URL
+ const path = "/" + openCore + "/_search"; // API endpoint for searching
+ const base = host + path; // Complete URL for the request
+ /**
+ * The match query used for title, author, and subjects fields is case-insensitive by default. The standard analyzer is typically used, which lowercases the terms.
+ * The wildcard query is case-sensitive by default. To make it case-insensitive, it is needed to use a lowercase filter */
+ const lowercaseTerm = term.toLowerCase(); // Lowercase the search term
+
+ // Request body defining search query logic
+ const body = {
+ query: {
+ bool: {
+ should: [
+ { match: { title: { query: term, fuzziness: "AUTO", boost: 3 } } },
+ { match: { author: { query: term, fuzziness: "AUTO", boost: 2 } } },
+ { match: { subjects: { query: term, fuzziness: "AUTO", boost: 1 } } }, // In SOLR is "subject"!
+ { match: { doctype: { query: term, fuzziness: "AUTO", boost: 1 } } }, // doctype
+ { wildcard: { title: { value: `${lowercaseTerm}*`, boost: 3 } } },
+ { wildcard: { author: { value: `${lowercaseTerm}*`, boost: 2 } } },
+ { wildcard: { subjects: { value: `${lowercaseTerm}*`, boost: 1 } } }, // In SOLR is "subject"!
+ { wildcard: { doctype: { value: `${lowercaseTerm}*`, boost: 1 } } } // doctype
+ ],
+ minimum_should_match: 1 // Require at least one match
+ }
+ },
+ size: 10, // Limit to 10 results
+ from: 0, // Pagination: start from the first result
+ sort: [{ _score: { order: "desc" } }], // Sort by relevance (_score)
+ // sort: [{ server_date_published: { order: "desc" } }],
+ track_scores: true, // This ensures "_score" is included even when sorting by other criteria. Otherwise the relevance score is not calculated
+ aggs: {
+ subjects: { terms: { field: "subjects.keyword", size: 1000 } }, // In SOLR is "subject"!
+ language: { terms: { field: "language" } }, // << ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ author: { terms: { field: "author.keyword", size: 1000 } },
+ year: { terms: { field: "year", size: 100 } }, // << ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ doctype: { terms: { field: "doctype", size: 50 } } // << ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ },
+ highlight: {
+ fields: {
+ title: {}, // Highlight matching terms in title
+ author: {}, // Highlight matching terms in author
+ subjects: {}, // Highlight matching terms in subjects
+ doctype: {} // Highlight matching terms in document type
+ }
+ }
};
- const stations = api.get<SolrResponse>(base, q_params).pipe(map((res: SolrResponse) => res.response.docs));
-
- return stations;
+ /**
+ * Make API call to OpenSearch and return the result
+ * When a POST request is made to the OpenSearch server using the api.post<OpenSearchResponse> method, the response received from OpenSearch is an object that includes various details about the search results.
+ * One of the key properties of this response object is _source, which is an array of documents (datasets) that match the search criteria.
+ * It is used the pipe method to chain RxJS operators to the Observable returned by api.get. The map operator is used to transform the emitted items of the Observable.
+ */
+ return api.post<OpenSearchResponse>(base, body).pipe(
+ map(response => ({
+ datasets: response.hits.hits.map(hit => hit._source),
+ highlights: response.hits.hits.map(hit => hit.highlight)
+ }))
+ );
}
+ // // For the autocomplete search. Method to perform a search based on a term
+ // public searchTermSOLR(term: string, solrCore: string, solrHost: string): Observable<Dataset[]> {
+ // // SOLR endpoint
+ // const host = "https://" + solrHost;
+ // const path = "/solr/" + solrCore + "/select?";
+ // const base = host + path;
+
+ // //const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned
+ // const fields = [
+ // "id",
+ // "licence",
+ // "server_date_published",
+ // "abstract_output",
+ // "title_output",
+ // "title_additional",
+ // "author",
+ // "subject",
+ // "doctype",
+ // ].toString();
+
+ // const qfFields = "title^3 author^2 subject^1";
+
+ // const q_params = {
+ // "0": "fl=" + fields,
+ // q: term + "*",
+ // defType: "edismax",
+ // qf: qfFields,
+ // indent: "on",
+ // wt: "json",
+ // };
+
+ // // Make API call to Solr and return the result
+ // /**
+ // * When a GET request is made to the Solr server using the api.get<SolrResponse> method, the response received from Solr is an object that includes various details about the search results.
+ // * One of the key properties of this response object is docs, which is an array of documents (datasets) that match the search criteria.
+ // * It is used the pipe method to chain RxJS operators to the Observable returned by api.get. The map operator is used to transform the emitted items of the Observable.
+ // */
+ // const stations = api.get<SolrResponse>(base, q_params).pipe(map((res: SolrResponse) => res.response.docs));
+
+ // return stations;
+ // }
+
+
+ /**
+ * Perform faceted search with OpenSearch API using filters and suggestions
+ * @param {Suggestion | string} suggestion - Search term or suggestion
+ * @param {ActiveFilterCategories} activeFilterCategories - Active filters to apply
+ * @param {string} openCore - The OpenSearch core to search in
+ * @param {string} openHost - The OpenSearch host URL
+ * @param {string} start - Optional: starting page
+ * @returns {Observable<OpenSearchResponse>} - Observable emitting search results
+ */
public facetedSearch(
suggestion: Suggestion | string,
activeFilterCategories: ActiveFilterCategories,
- solrCore: string,
- solrHost: string,
- start?: string,
- ): Observable<SolrResponse> {
- // solr endpoint
- // const host = 'http://voyagerdemo.com/';
- //const host = 'https://www.tethys.at/';
- //const host = 'https://' + solrHost;
- const host = "https://" + solrHost;
- const path = "/solr/" + solrCore + "/select?";
+ openCore: string,
+ openHost: string,
+ start?: string, // Starting page
+ ): Observable<OpenSearchResponse> {
+ const host = openHost;
+ const path = "/" + openCore + "/_search";
const base = host + path;
-
- //const fields = 'id,server_date_published,abstract_output,title_output,title_additional,author,subject'; // fields we want returned
- const fields = [
- "id",
- "licence",
- "server_date_published",
- "abstract_output",
- "identifier",
- "title_output",
- "title_additional",
- "author",
- "subject",
- "doctype",
- ].toString();
-
- // const qfFields = "title^3 author^2 subject^1";
- // let params = "fl=" + fields;
- // if (term == "*%3A*") {
- // params += "&defType=edismax&wt=json&indent=on"; //edismax
- // } else {
- // params += "&defType=dismax&qf=" + qfFields + "&wt=json&indent=on"; //dismax
- // }
-
- let term, queryOperator, qfFields;
- if (typeof suggestion === "string") {
- term = suggestion + "*";
- queryOperator = "or";
- qfFields = "title^3 author^2 subject^1";
- } else if (suggestion instanceof Suggestion) {
- term = suggestion.type + ':"' + suggestion.value + '"';
- queryOperator = "and";
- qfFields = undefined;
- }
-
- if (start === undefined) start = "0";
- // start = "&start=" + start;
-
- // const facetFields =
- // "&facet=on&facet.field=language&facet.field={!key=datatype}doctype&facet.field=subject"; //&fq=year:(2019)";//&facet.query=year:2018";
-
- const filterFields = new Array<string>();
- if (Object.keys(activeFilterCategories).length > 0) {
- // filterFields = '["';
- // const filterFields: string[] = [];
- // const facet_fields: FacetFields = res.facets;
- let prop: keyof typeof activeFilterCategories;
- for (prop in activeFilterCategories) {
- const filterItems = activeFilterCategories[prop];
- // const filterItems = facetCategory.values;
- // filterItems.forEach((filterItem) => {
- // console.log(`${key} ${valueArray}`);
- filterItems.forEach(function (value: string) {
- // filterFields += "&fq=" + key + ':("' + value + '")';
- filterFields.push(prop + ':("' + value + '")');
- // filterFields += prop + ":" + value;
- });
+
+ const lowercaseTerm = typeof suggestion === 'string' ? suggestion.toLowerCase() : suggestion.value;
+
+ /**
+ * The query construction depends on whether the suggestion is a string or a Suggestion object.
+ * */
+
+ // When suggestion is a string:
+ const mainQuery = typeof suggestion === 'string'
+ ? {
+ bool: {
+ should: [
+ { match: { title: { query: suggestion, fuzziness: "AUTO", boost: 3 } } },
+ { match: { author: { query: suggestion, fuzziness: "AUTO", boost: 2 } } },
+ { match: { subjects: { query: suggestion, fuzziness: "AUTO", boost: 1 } } },
+ { match: { doctype: { query: suggestion, fuzziness: "AUTO", boost: 1 } } },
+ { wildcard: { title: { value: `${lowercaseTerm}*`, boost: 3 } } },
+ { wildcard: { author: { value: `${lowercaseTerm}*`, boost: 2 } } },
+ { wildcard: { subjects: { value: `${lowercaseTerm}*`, boost: 1 } } },
+ { wildcard: { doctype: { value: `${lowercaseTerm}*`, boost: 1 } } }
+ ],
+ minimum_should_match: 1
+ }
+ }
+ // When suggestion is a suggestion object:
+ : {
+ match: {
+ [suggestion.type]: {
+ query: suggestion.value,
+ operator: 'and' // all the terms in the query must be present in the field
+ }
+ }
+ };
+
+ // Build filters based on the active filter categories
+ const filters = Object.entries(activeFilterCategories).map(([category, values]) => {
+ if (category === "language" || category === "year" || category === "doctype") {
+ return values.map(value => ({ term: { [category]: value } }));
+ } else {
+ return values.map(value => ({ term: { [`${category}.keyword`]: value } }));
}
- // filterFields += '"]';
- }
- // const query = "&sort=server_date_published desc" + "&q=" + term;
+ }).flat();
- // const api =
- // base + params + limit + start + query + filterFields + facetFields;
+ // Request body for the faceted search
+ const body = {
+ query: {
+ bool: {
+ must: [
+ mainQuery, // Ensure the main query must be satisfied
+ ...filters // Ensure all filters must be satisfied
+ ]
+ }
+ },
- // https://solr.apache.org/guide/8_4/json-request-api.html
- const q_params = {
- "0": "fl=" + fields,
- q: term,
- "q.op": queryOperator,
- defType: "edismax",
- qf: qfFields,
- // df: "title",
- indent: "on",
- wt: "json",
- rows: 10,
- // fq: ["subject:Steiermark", "language:de"],
- fq: filterFields,
- start: start,
- sort: "server_date_published desc",
- facet: "on",
- // "facet.field": "language",
- "json.facet.language": '{ type: "terms", field: "language" }',
- "json.facet.subject": '{ type: "terms", field: "subject", limit: -1 }',
- "json.facet.year": '{ type: "terms", field: "year" }',
- "json.facet.author": '{ type: "terms", field: "author_facet", limit: -1 }',
+ size: 10,
+ from: start ? parseInt(start) : 0,
+ sort: [{ server_date_published: { order: "desc" } }], // Sort by publication date
+ // sort: [{ _score: { order: "desc" } }], // Sort by _score in descending order
+ track_scores: true,
+ /**
+ * Defines aggregations for facets
+ * terms: Aggregation type that returns the most common terms in a field.
+ * !For a large number of terms setting an extremely large size might not be efficient
+ * If you genuinely need all unique terms and expect a large number of them, consider using a composite aggregation for more efficient pagination of terms.
+ */
+ aggs: {
+ subjects: { terms: { field: "subjects.keyword", size: 1000 } }, // In SOLR is "subject"!
+ language: { terms: { field: "language" } }, // ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ author: { terms: { field: "author.keyword", size: 1000 } },
+ year: { terms: { field: "year", size: 100 } }, // ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ doctype: { terms: { field: "doctype", size: 50 } } // ".keyword" HAS TO BE REMOVED. OTHERWISE BUCKETS ARE NOT OBTAINED FOR THIS
+ },
+ highlight: {
+ fields: {
+ title: {},
+ author: {},
+ subjects: {},
+ doctype: {}
+ }
+ }
};
-
- const stations = api.get<SolrResponse>(base, q_params);
- // .pipe(map((res) => res.response.docs));
-
+
+ // API call and return observable of search results
+ const stations = api.post<OpenSearchResponse>(base, body);
return stations;
}
+
+ // /**
+ // * This method performs a faceted search on a Solr core. Faceted search allows the user to filter search results based on various categories (facets)
+ // */
+ // public facetedSearchSOLR(
+ // suggestion: Suggestion | string,
+ // activeFilterCategories: ActiveFilterCategories,
+ // solrCore: string,
+ // solrHost: string,
+ // start?: string, // Starting page
+ // ): Observable<SolrResponse> {
+ // // console.log("face:", suggestion);
+ // // console.log(activeFilterCategories);
+ // // console.log(solrCore);
+ // // console.log(solrHost);
+ // // console.log(start);
+
+ // console.log("facetedsearchSOLR > suggestion entered:");
+ // console.log(suggestion);
+ // // Construct Solr query parameters
+ // const host = "https://" + solrHost;
+ // const path = "/solr/" + solrCore + "/select?";
+ // const base = host + path;
+
+ // const fields = [
+ // "id",
+ // "licence",
+ // "server_date_published",
+ // "abstract_output",
+ // "identifier",
+ // "title_output",
+ // "title_additional",
+ // "author",
+ // "subject",
+ // "doctype",
+ // ].toString();
+
+ // // Determine search term, query operator, and query fields based on the suggestion type. Depending on whether suggestion is a string or a Suggestion object, it constructs the search term and query fields differently.
+ // let term, queryOperator, qfFields;
+ // if (typeof suggestion === "string") { // f suggestion is a string, it appends a wildcard (*) for partial matches.
+ // term = suggestion + "*";
+ // queryOperator = "or";
+ // qfFields = "title^3 author^2 subject^1";
+ // } else if (suggestion instanceof Suggestion) { // If suggestion is a Suggestion object, it forms a more specific query based on the type and value of the suggestion.
+ // term = suggestion.type + ':"' + suggestion.value + '"';
+ // queryOperator = "and";
+ // qfFields = undefined;
+ // }
+
+ // // Set default value for start if not provided
+ // if (start === undefined) start = "0";
+
+ // // Construct filter fields based on active filter categories
+ // const filterFields = new Array<string>();
+ // if (Object.keys(activeFilterCategories).length > 0) {
+ // /* Declare variable prop with a type that is a key of the activeFilterCategories. The 'keyof typeof' activeFilterCategories type represents all possible keys
+ // that can exist on the activeFilterCategories --> prop can only be assigned a value that is a key of the activeFilterCategories object */
+ // let prop: keyof typeof activeFilterCategories;
+ // for (prop in activeFilterCategories) {
+ // const filterItems = activeFilterCategories[prop];
+ // filterItems.forEach(function (value: string) {
+ // filterFields.push(prop + ':("' + value + '")');
+ // // e.g. Array [ 'subject:("Vektordaten")', 'author:("GeoSphere Austria, ")' ]
+ // });
+ // }
+ // }
+
+ // // https://solr.apache.org/guide/8_4/json-request-api.html
+ // // Construct Solr query parameters
+ // const q_params = {
+ // "0": "fl=" + fields,
+ // q: term,
+ // "q.op": queryOperator,
+ // defType: "edismax",
+ // qf: qfFields,
+ // // df: "title",
+ // indent: "on",
+ // wt: "json",
+ // rows: 10,
+ // // fq: ["subject:Steiermark", "language:de"],
+ // fq: filterFields,
+ // start: start,
+ // sort: "server_date_published desc",
+ // facet: "on",
+ // // "facet.field": "language",
+ // "json.facet.language": '{ type: "terms", field: "language" }',
+ // "json.facet.subject": '{ type: "terms", field: "subject", limit: -1 }',
+ // "json.facet.year": '{ type: "terms", field: "year" }',
+ // "json.facet.author": '{ type: "terms", field: "author_facet", limit: -1 }',
+ // };
+ // /* E.g.
+ // {"0":"fl=id,licence,server_date_published,abstract_output,identifier,title_output,title_additional,author,subject,doctype","q":"*","q.op":"or","defType":"edismax",
+ // "qf":"title^3 author^2 subject^1",
+ // "indent":"on","wt":"json","rows":10,
+ // "fq":["subject:(\"Vektordaten\")","author:(\"GeoSphere Austria, \")"],
+ // "start":"0","sort":"server_date_published desc","facet":"on",
+ // "json.facet.language":"{ type: \"terms\", field: \"language\" }",
+ // "json.facet.subject":"{ type: \"terms\", field: \"subject\", limit: -1 }",
+ // "json.facet.year":"{ type: \"terms\", field: \"year\" }",
+ // "json.facet.author":"{ type: \"terms\", field: \"author_facet\", limit: -1 }"}
+ // */
+ // // console.log(JSON.stringify(q_params));
+
+ // // Make API call to Solr and return the result
+ // const stations = api.get<SolrResponse>(base, q_params);
+
+ // return stations;
+ // }
+
+ // Method to fetch years
public getYears(): Observable<string[]> {
- // const heroes = of(HEROES);
- // const host = "https:" + VUE_API;
const host = VUE_API;
const path = "/api/years";
const base = host + path;
const years = api.get<string[]>(base);
- // this.messageService.add('HeroService: fetched heroes');
return years;
}
+ // Method to fetch documents for a specific year
public getDocuments(year: string): Observable<Array<DbDataset>> {
- // const host = "https:" + VUE_API;
const host = VUE_API;
const path = "/api/sitelinks/" + year;
const base = host + path;
const documents: Observable<DbDataset[]> = api.get<Array<DbDataset>>(base);
- // this.messageService.add('HeroService: fetched heroes');
return documents;
}
+ // Method to fetch a dataset by its ID
public getDataset(id: number): Observable<DbDataset> {
- // const host = "https:" + VUE_API;
const host = VUE_API;
const path = "/api/dataset/" + id;
const apiUrl = host + path;
- const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res)));
- // const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res, apiUrl)));
- // this.messageService.add('HeroService: fetched heroes');
+ const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res)));
return dataset;
}
+ // Method to fetch a dataset by its DOI
public getDatasetByDoi(doi: string): Observable<DbDataset> {
- // const host = "https:" + VUE_API;
const host = VUE_API;
const path = "/api/dataset/10.24341/tethys." + doi;
const apiUrl = host + path;
- const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res)));
- // const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res, apiUrl)));
- // this.messageService.add('HeroService: fetched heroes');
+ const dataset = api.get<DbDataset>(apiUrl).pipe(map((res) => this.prepareDataset(res)));
return dataset;
}
- // public getOaiDatasets(): Observable<OaiDataset[]> {
- // const apiUrl = "https://data.tethys.at/oai?verb=ListRecords&metadataPrefix=oai_datacite";
- // const oaiDatasets = api.get<string>(apiUrl).pipe(
- // map(
- // (response: string) => {
- // // const parser = new DOMParser();
- // // const xmlDoc: XMLDocument = parser.parseFromString(response, "application/xml");
-
- // // const xslDoc = parser.parseFromString(this.xsl, "application/xml");
- // // const xsltProcessor = new XSLTProcessor();
- // // xsltProcessor.importStylesheet(xslDoc);
- // // console.log(xmlDoc);
- // // const xmlDom = xsltProcessor.transformToDocument(xmlDoc);
-
- // // const serializer = new XMLSerializer();
- // // const html = serializer.serializeToString(xmlDom.documentElement);
- // // console.log(html);
-
- // // const arrOai = new Array<OaiDataset>();
- // // return arrOai;
- // const arrOai = this.parseXML(response);
- // return arrOai;
- // // .then((data) => {
- // // return data;
- // // });
- // },
- // // (error: string) => this.errorHandler(error),
- // ),
- // );
- // // const oaiDatasets = of(OAI_DATASETS);
-
- // // this.messageService.add('HeroService: fetched heroes');
- // return oaiDatasets;
- // }
-
- // private parseXML(xmlStr: string): Array<OaiDataset> {
- // // let k = "";
- // const arr: OaiDataset[] = [];
- // const domParser = new DOMParser();
- // const doc = domParser.parseFromString(xmlStr, "application/xml");
- // const records = doc.getElementsByTagName("ListRecords")[0];
- // // // const rt = xmlNode.resumptionToken;
- // // for (let i = 0; i < records.length; i++) {
- // // console.log(records[i].getAttribute("name"));
- // // }
-
- // const parser: xml2js.Parser = new xml2js.Parser({
- // trim: true,
- // explicitArray: false,
- // ignoreAttrs: false,
- // // mergeAttrs: true,
- // });
- // parser.parseString(records.outerHTML, function (err: Error | null, result: any) {
- // const xmlNode = result.ListRecords;
- // // const rt = xmlNode.resumptionToken;
- // for (const rNode in xmlNode.record) {
- // const item = xmlNode.record[rNode];
-
- // const dc = item.metadata.resource;
- // const t = dc.titles.title;
- // const id = dc.identifier._;
-
- // const lang = "en"; //dc.titles.title.attributes("xml",True)->lang;
- // let title: string;
- // if (lang == "en" && t.length > 1) {
- // title = t[1]._;
- // } else {
- // title = t[0]._;
- // }
-
- // let creator = "";
- // if (dc.creators.creator instanceof Array) {
- // dc.creators.creator.forEach((person: OaiPerson) => {
- // creator += person.creatorName + "; ";
- // });
- // } else {
- // creator += dc.creators.creator.creatorName._;
- // }
-
- // let contributor = "";
- // if (dc.contributors) {
- // if (dc.contributors.contributor instanceof Array) {
- // dc.contributors.contributor.forEach((person: OaiPerson) => {
- // contributor += person.contributorName + "; ";
- // });
- // } else {
- // contributor += dc.contributors.contributor.contributorName;
- // }
- // }
-
- // // ?.map((u: any) => u.creatorName._).join("; ");
- // // foreach ($dc->creators->creator as $c) {
- // // foreach ($c->creatorName as $d) {
- // // if (count(explode(',',$d)) > 1) {
- // // $creator .= explode(',',$d)[0] . ', ' . substr(explode(',',$d)[1],1,1) . '; ';
- // // } else {
- // // $creator .= explode(',',$d)[0];
- // // }
-
- // // }
- // // }
-
- // const north = dc.geoLocations.geoLocation.geoLocationBox.northBoundLatitude;
- // const east = dc.geoLocations.geoLocation.geoLocationBox.eastBoundLongitude;
- // const south = dc.geoLocations.geoLocation.geoLocationBox.southBoundLatitude;
- // const west = dc.geoLocations.geoLocation.geoLocationBox.westBoundLongitude;
-
- // const subject = dc.subjects.subject.map((u: any) => u._).join(", ");
-
- // const oaiDataset = {
- // doi: id,
- // title: title,
- // creator: creator,
- // contributor: contributor,
- // subject: subject,
- // north: north,
- // south: south,
- // east: east,
- // west: west,
- // } as OaiDataset;
- // arr.push(oaiDataset);
- // }
- // // resolve(arr);
- // });
- // return arr;
- // }
-
- // private prepareOAI(xml: any) : Array<OaiDataset> {
- // //
- // }
-
- // private prepareDataset(datasetObj: DbDataset, apiUrl: string): DbDataset {
+ // Prepare dataset object by deserializing it and adding a URL
private prepareDataset(datasetObj: DbDataset): DbDataset {
+
const dataset = deserialize<DbDataset>(DbDataset, JSON.stringify(datasetObj));
dataset.url = document.documentURI;
- // this.internalDatasetId.generateInternalId(dataset);
- // if (dataset.seriesParameters) {
- // dataset.parameters = dataset.seriesParameters;
- // delete dataset.seriesParameters;
- // }
return dataset;
}
}
diff --git a/src/views/dataset-detail.component/dataset-detail.component.ts b/src/views/dataset-detail.component/dataset-detail.component.ts
index af8a4e9..a2dc7b6 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.ts
+++ b/src/views/dataset-detail.component/dataset-detail.component.ts
@@ -1,3 +1,4 @@
+// detail-dataset.component.ts
import { Component, Vue, Prop } from "vue-facing-decorator";
import { DbDataset } from "@/models/dataset";
import DatasetService from "../../services/dataset.service";
@@ -9,59 +10,72 @@ import { Suggestion } from "@/models/dataset";
import { VUE_API } from "@/constants";
// import DataMetricsBadge from "data-metrics-badge/dist/data-metrics-badge.js";
// import DataMetricsBadge from "@/components/datacite/DataMetricsBadge.vue";
+import Minimap from '@/components/minimap/Minimap.vue';
+import * as L from 'leaflet';
@Component({
name: "DatasetDetailComponent",
components: {
VsInput,
- // DataMetricsBadge,
+ Minimap
+ // DataMetricsBadge, // Commented out but prepared for future use
},
})
export default class DatasetDetailComponent extends Vue {
@Prop()
- datasetId!: string;
+ datasetId!: string; // datasetId is passed as a prop and is required.
- // @Prop()
- // identifier!: string;
+ searchTerm: string | Suggestion = ""; // Search term used in the search functionality.
+ private subscriptions: Array<Subscription> = []; // Subscriptions to RxJS observables to prevent memory leaks.
+ public dataset = {} as DbDataset; // Holds dataset details.
+ private error: string = ""; // Stores error messages, if any.
+ public loaded = false; // Indicates whether the dataset is fully loaded.
+ public openAccessLicences: Array<string> = ["CC-BY-4.0", "CC-BY-SA-4.0"]; // Available open-access licenses.
+ public portal = VUE_API + "/api/file/download/"; // Portal URL for file downloads.
- searchTerm: string | Suggestion = "";
-
- private subscriptions: Array<Subscription> = [];
- public dataset = {} as DbDataset;
- private error: string = "";
- public loaded = false;
- public openAccessLicences: Array<string> = ["CC-BY-4.0", "CC-BY-SA-4.0"];
- public portal = VUE_API + "/api/file/download/";
-
- public post = {
- views: 25,
- downloads: 1262,
- citations: 2424,
- };
+ // If needed for stats
+ // public post = {
+ // views: 25, // Number of views for the dataset
+ // downloads: 1262, // Number of downloads
+ // citations: 2424, // Number of citations
+ // };
+ /**
+ * Lifecycle hook: Called when the component is created.
+ * Extends dayjs with advanced format plugin and determines whether to
+ * fetch dataset by ID or by DOI.
+ */
created(): void {
- dayjs.extend(advancedFormat);
+ dayjs.extend(advancedFormat); // Adds advanced date formatting options to dayjs.
if (!this.datasetId.includes(".")) {
- // get datset by publish_id
+ // Fetch dataset by publish_id (numeric ID)
this.getDataset(Number(this.datasetId));
} else {
- // get datset by doi_value
+ // Fetch dataset by DOI (alphanumeric ID)
this.getDatasetByIdentifier(this.datasetId);
}
}
+ /**
+ * Lifecycle hook: Called before the component is unmounted.
+ * Unsubscribes from all subscriptions to prevent memory leaks.
+ */
beforeUnmount(): void {
- //unsunscribe to ensure no memory leaks
- // this.subscription.unsubscribe();
for (const subs of this.subscriptions) {
subs.unsubscribe();
}
}
- onSearch(suggestion: Suggestion | string): void {
+ /**
+ * Handles search functionality based on user input or suggestion selection.
+ * Opens a new window or navigates internally based on the host's domain.
+ * @param suggestion - The suggestion or search term entered by the user.
+ */
+ onSearch(suggestion: Suggestion | string): void {
const host = window.location.host;
const parts = host.split(".");
if (parts[0] === "doi") {
+ // If in DOI subdomain, open external search in a new window
let term;
if (typeof suggestion === "string") {
term = suggestion;
@@ -72,6 +86,7 @@ export default class DatasetDetailComponent extends Vue {
window.open("https://tethys.at/search/" + term + "/" + type, "_self");
}
} else {
+ // Otherwise, route internally to search page
let term;
if (typeof suggestion === "string") {
term = suggestion;
@@ -81,79 +96,125 @@ export default class DatasetDetailComponent extends Vue {
this.$router.push({ name: "Search", params: { display: term, type: suggestion.type } });
}
}
-
- // this.searchTerm = suggestion;
- // this.$router.push({ name: "Search", params: { display: term, suggestion instanceof Suggestion ? ty} });
}
+ /**
+ * Fetches the dataset details by ID from the service and updates the component state.
+ * @param id - The dataset's numeric ID.
+ */
private getDataset(id: number): void {
const newSub = DatasetService.getDataset(id).subscribe({
next: (res: DbDataset) => {
- this.dataset = res;
- this.loaded = true;
+ this.dataset = res; // Store dataset in component state.
+ this.loaded = true; // Mark as loaded.
},
- // error: (error: string) => this.errorHandler(error),
error: (error: string) => {
- this.error = error;
+ this.error = error; // Capture any errors during fetch.
},
});
- this.subscriptions.push(newSub);
+ this.subscriptions.push(newSub); // Add subscription to array to manage unsubscribing later.
}
+ /**
+ * Fetches the dataset details by DOI from the service and updates the component state.
+ * @param id - The dataset's DOI (Digital Object Identifier).
+ */
private getDatasetByIdentifier(id: string): void {
const newSub = DatasetService.getDatasetByDoi(id).subscribe({
next: (res: DbDataset) => {
- this.dataset = res;
- this.loaded = true;
+ this.dataset = res; // Store dataset in component state.
+ this.loaded = true; // Mark as loaded.
},
error: (error: string) => this.errorHandler(error),
});
- this.subscriptions.push(newSub);
+ this.subscriptions.push(newSub); // Add subscription to array.
}
+ /**
+ * Handles errors and updates the error message in the component.
+ * @param err - Error message.
+ */
private errorHandler(err: string): void {
- this.error = err;
- // this.loading = false;
+ this.error = err; // Update error message.
}
+ /**
+ * Navigates back by one page in the router history, similar to browser back.
+ */
public goBack(): void {
- // go back by one record, the same as history.back()
- // router.go(-1);
- this.$router.go(-1);
+ this.$router.go(-1); // Go back one step in the browser history.
}
+ /**
+ * Extracts the file extension from a given filename.
+ * @param filename - The name of the file.
+ * @returns The file extension as a string.
+ */
public getExtension(filename: string): string {
return filename.substring(filename.lastIndexOf(".") + 1, filename.length) || filename;
}
+ /**
+ * Formats the file size into a human-readable string with appropriate units.
+ * @param file_size - The size of the file in bytes.
+ * @returns The formatted file size string.
+ */
public formatSize(file_size: number): string {
let size = file_size;
- const unit = ["Byte", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"];
+ const unit = ["Byte", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]; // Units for size.
let i;
for (i = 0; size >= 1024 && i < unit.length - 1; i++) {
- size = size / 1024;
+ size = size / 1024; // Convert size to appropriate unit.
}
- // return Math.round((size * precision) / precision) + " " + unit[i];
return Math.round((size + Number.EPSILON) * 100) / 100 + " " + unit[i];
}
+ /**
+ * Formats a given date into a human-readable string with the full day, month, and year.
+ * @param date - The date string to format.
+ * @returns The formatted date string.
+ */
public getPublishedDate(date: string): string {
- // return moment(date).format("ddd, MMMM Do, YYYY h:mm a");
return dayjs(date).format("ddd, MMMM Do, YYYY h:mm a");
}
+ /**
+ * Formats a given date into a simpler "DD.MM.YYYY HH:mm" format.
+ * @param date - The date string to format.
+ * @returns The formatted date string.
+ */
public getHumanDate(date: string): string {
- // return moment(date).format("DD.MM.YYYY HH:mm");
return dayjs(date).format("DD.MM.YYYY HH:mm");
}
+ /**
+ * Extracts the year from a given date string.
+ * @param date - The date string to extract the year from.
+ * @returns The year as a string.
+ */
public getYear(date: string): string {
return dayjs(date).format("YYYY");
- // return moment(date).format("YYYY");
}
+ /**
+ * Returns the human-readable language string based on the language code.
+ * @param language - The language code (e.g., "de" for German).
+ * @returns The language name as a string.
+ */
+ public getLanguage(language: string): string {
+ if (language === "de") {
+ return "Deutsch";
+ } else {
+ return "English";
+ }
+ }
+
+ /**
+ * Generates a citation string for the dataset based on its authors and publication details.
+ * @returns The citation as a string.
+ */
public getCitation(): string {
let citation = this.dataset.authors
.map((u) => {
@@ -162,14 +223,27 @@ export default class DatasetDetailComponent extends Vue {
name += ", " + u.first_name?.substring(0, 1).toUpperCase() + ".";
}
return name;
- // u.last_name + ", " + u.first_name?.substring(0, 1).toUpperCase() + "."
})
.join(", ");
citation += " (" + dayjs(this.dataset.server_date_published).format("YYYY") + "): ";
citation += this.dataset.MainTitle?.value;
- citation += "." + this.dataset.creating_corporation + ", ";
+ citation += ". " + this.dataset.creating_corporation + ", ";
citation += this.dataset.publisher_name;
citation += ", Wien";
return citation;
}
+
+ accessNotFromDoi(): boolean {
+ const host = window.location.host;
+ const parts = host.split(".");
+ if (parts[0] === "doi") {
+ console.log("From DOI");
+ // If in DOI subdomain, open external search in a new window
+ return false;
+ } else {
+ console.log("Not From DOI");
+ return true;
+ }
+ }
+
}
diff --git a/src/views/dataset-detail.component/dataset-detail.component.vue b/src/views/dataset-detail.component/dataset-detail.component.vue
index 0a94183..ac55a61 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.vue
+++ b/src/views/dataset-detail.component/dataset-detail.component.vue
@@ -1,81 +1,55 @@
+<!-- detail-dataset.component.vue -->
<template v-if="datasetId">
- <!-- <div class="container">
- <section class="section" v-if="dataset != undefined">
- <h2 v-if="dataset.hasOwnProperty('titles')">{{ dataset.titles[0].value }} details!</h2>
- <div v-if="dataset" class="dataset__blog-meta">published: {{ getHumanDate(dataset.server_date_published) }}</div>
- <p v-if="dataset.hasOwnProperty('abstracts')" class="dataset__abstract">{{ dataset.abstracts[0].value }}</p>
- <div><label>id: </label>{{ dataset.id }}</div>
- <button v-on:click="goBack">Back</button>
- </section>
- </div> -->
+
<div class="container-fluid banner mz-5">
- <!-- <div class="column is-two-thirds-tablet is-half-desktop is-one-third-widescreen mx-auto">
- <div class="search-box mx-auto">
- <div class="field has-addons main-search-from-bg">
- <div class="control is-expanded">
- <input
- v-on:input="searchChanged"
- id="search_query"
- class="input is-medium"
- type="text"
- name="q"
- autocomplete="off"
- v-model="display"
- v-bind:placeholder="placeholder"
- v-on:keydown.down="onArrowDown"
- v-on:keydown.up="onArrowUp"
- v-on:keydown.enter="onEnter"
- @keydown.tab="close"
- v-on:focus="focus"
- />
- </div>
- <div class="control">
- <button class="button input is-medium search-button-icon" @click="search()">
- <i class="fas fa-search text-white"></i>
- </button>
- </div>
- </div>
- </div>
- </div> -->
- <!-- <simple-search-component></simple-search-component> -->
+ <!-- Search input component -->
+ <!-- Placeholder text for search input, and triggers onSearch method when the search term changes -->
<vs-input v-bind:placeholder="'Enter your search term...'" @search-change="onSearch"></vs-input>
</div>
+
+ <!-- Section that shows the dataset details once the data is loaded -->
<section v-if="loaded" class="section">
<div class="container">
- <!-- <span class="is-size-5"> Basic Table </span>
- <br /> -->
<div class="columns">
+ <!-- Main content area displaying dataset details -->
<div class="column is-8 results_column" style="padding-top: 1.2rem; padding-right: 1rem; padding-left: 1rem">
+ <!-- Card displaying the publication date -->
<div class="card">
<div class="column dataset__blog-meta">
<h2 class="label uppercase">published: {{ getPublishedDate(dataset.server_date_published) }}</h2>
</div>
</div>
+ <!-- Card displaying the dataset citation -->
<div class="card">
<div class="column">
<label class="label">
{{ getCitation() }}
+ <!-- Link to the dataset's DOI if available -->
<a v-if="dataset.identifier" target="_blank" class="link-label" v-bind:href="'https://doi.org/' + dataset.identifier.value"
>({{ "https://doi.org/" + dataset.identifier.value }})</a
>
</label>
</div>
+ <!-- Section showing references related to the dataset -->
<div v-for="reference in dataset.references" v-bind:key="reference.id" class="columns">
<div class="column is-3-desktop is-4-tablet label">{{ reference.relation }}</div>
<div class="column is-9-desktop is-8-tablet">
{{ reference.type }}:
+ <!-- Link to the reference if it's a DOI -->
<a v-if="reference.type === 'DOI'" target="_blank" class="link-label" v-bind:href="reference.value">
{{ reference.value }}
</a>
</div>
</div>
+
+ <!-- Section showing newer versions of the dataset -->
<div v-for="reference in dataset.referenced_by" v-bind:key="reference.id" class="columns">
<div class="column is-3-desktop is-4-tablet label">has newer version:</div>
<div class="column is-9-desktop is-8-tablet">
- <!-- {{ "https://doi.org/" + reference.value }} -->
{{ reference.type }}:
+ <!-- Link to the newer version's DOI -->
<a
v-if="reference.type === 'DOI'"
target="_blank"
@@ -88,10 +62,11 @@
</div>
</div>
+ <!-- Card displaying dataset titles -->
<div class="card record-elem">
+ <!-- Section for Main and Translated Titles -->
<div v-if="dataset.hasOwnProperty('titles')" class="columns">
<div class="column is-3-desktop is-4-tablet label">Title/<br />title:</div>
- <!-- <div class="column is-9-desktop is-8-tablet">{{ dataset.titles[0].value }}</div> -->
<div class="column is-9-desktop is-8-tablet">
<p>{{ dataset.MainTitle?.value }}</p>
<br />
@@ -100,6 +75,8 @@
</p>
</div>
</div>
+
+ <!-- Section for dataset abstracts -->
<div v-if="dataset.hasOwnProperty('abstracts')" class="columns">
<div class="column is-3-desktop is-4-tablet label">
Zusammenfassung/<br />
@@ -113,6 +90,7 @@
</p>
</div>
</div>
+ <!-- Section for series information -->
<div v-if="dataset.hasOwnProperty('abstracts')" class="columns">
<div class="column is-3-desktop is-4-tablet label">Serieninformation/<br />series information:</div>
<div v-if="dataset.hasSeriesInformationAbstract()" class="column is-9-desktop is-8-tablet">
@@ -124,6 +102,8 @@
</div>
<div v-else class="column is-9-desktop is-8-tablet">-</div>
</div>
+
+ <!-- Section for method description -->
<div v-if="dataset.hasOwnProperty('abstracts')" class="columns">
<div class="column is-3-desktop is-4-tablet label">Methodik/<br />method:</div>
<div v-if="dataset.hasMethodsAbstract()" class="column is-9-desktop is-8-tablet">
@@ -132,9 +112,11 @@
<div v-else class="column is-9-desktop is-8-tablet">-</div>
</div>
+ <!-- Section for dataset files and their details -->
<div class="columns">
<div class="column is-3-desktop is-4-tablet label">Downloads/<br />downloads:</div>
<div v-if="dataset.files.length > 0" class="column is-9-desktop is-8-tablet">
+ <!-- Table showing file details if the embargo has passed -->
<table v-if="dataset.hasEmbargoPassed()" id="items" class="table is-bordered is-striped">
<thead>
<tr>
@@ -148,7 +130,6 @@
<td>
<a class="link-label" target="_blank" v-bind:href="portal + file.id"> {{ file.label }} </a>
<br />
- <!-- <span>md5: {{ file.hashvalues.find((e) => e.type === "md5")?.value }}</span> -->
</td>
<td>
<span>{{ getExtension(file.path_name) }}</span>
@@ -164,6 +145,7 @@
</div>
</div>
+ <!-- Section for technical metadata of the dataset -->
<div class="columns">
<div class="column is-3-desktop is-4-tablet label">Technische Metadaten/<br />technical metadata:</div>
<div class="column is-9-desktop is-8-tablet">
@@ -177,7 +159,10 @@
</div>
</div>
+ <!-- Sidebar displaying additional dataset details -->
<div id="id-side-bar" class="column is-4 sidebar_column" style="padding-top: 1.2rem; padding-right: 1rem; padding-left: 1rem">
+
+ <!-- Sidebar card for dataset details like creation year, coverage, language, etc. -->
<div class="card">
<div class="column">
<h2 class="label uppercase">Details</h2>
@@ -188,22 +173,38 @@
</div>
<div class="card">
<div class="column">
- <h3 class="label uppercase">Beitragende/Contributor</h3>
- <p v-if="dataset.hasContributors()">
- {{ dataset.contributors.map((u) => u.full_name).join(", ") }}
- </p>
- <p v-else>-</p>
+ <!-- <h3 class="label uppercase">MAP</h3> -->
+ <Minimap :bounds="dataset.Bounds"></Minimap>
</div>
</div>
+ <!-- Sidebar card showing dataset keywords -->
<div class="card">
<div class="column">
<h3 class="label uppercase">Schlüsselwörter/Keywords</h3>
<p v-if="dataset.hasOwnProperty('subjects')">
- {{ dataset.subjects.map((u) => u.value).join(", ") }}
+ <!-- Iterate through subjects and display them as router links -->
+ <span v-if="accessNotFromDoi()">
+ <span v-for="(subject, index) in dataset.subjects" :key="subject.value">
+ <router-link
+ :to="{ name: 'Search', params: { display: subject.value, type: 'subjects' } }"
+ class="link-label"
+ >
+ {{ subject.value }}
+ </router-link>
+ <!-- Add a comma and space after each keyword except the last one -->
+ <span v-if="index < dataset.subjects.length - 1">, </span>
+ </span>
+ </span>
+
+ <span v-else>
+ {{ dataset.subjects.map((u) => u.value).join(", ") }}
+ </span>
</p>
<p v-else>-</p>
</div>
</div>
+
+ <!-- Sidebar cards displaying year, coverage, language, object type, and other dataset details -->
<div class="card">
<div class="column">
<h3 class="label uppercase">Erstellungsjahr/Year</h3>
@@ -224,7 +225,7 @@
<div class="column">
<h3 class="label uppercase">Sprache/Language</h3>
<p>
- {{ dataset.language }}
+ {{ getLanguage(dataset.language) }}
</p>
</div>
</div>
@@ -236,14 +237,22 @@
</p>
</div>
</div>
+ <!-- Sidebar card showing dataset licenses -->
<div class="card">
<div class="column">
<h3 class="label uppercase">Lizenz/License</h3>
<p v-if="dataset.hasLicenses()">
<label v-for="license in dataset.licenses" v-bind:key="license.id">
+ <!-- Link to the appropriate Creative Commons license -->
<span class="normal label">
- {{ license.name }}
+ <a v-if="license.name=='CC-BY-4.0'" target="_blank" class="link-label" v-bind:href="'https://creativecommons.org/licenses/by/4.0/'"
+ ><i class="fa-brands fa-creative-commons"></i> {{ license.name }}</a
+ >
+ <a v-else target="_blank" class="link-label" v-bind:href="'https://creativecommons.org/licenses/by-sa/4.0/'"
+ ><i class="fa-brands fa-creative-commons"></i> {{ license.name }}</a
+ >
</span>
+ <!-- Display Open Access label if the license allows it -->
<span v-if="openAccessLicences.includes(license.name)" class="normal label uppercase"
><i class="fas fa-lock-open"></i> Open Access</span
>
@@ -260,11 +269,14 @@
<p v-else>-</p>
</div>
</div>
+
+ <!-- Sidebar card showing references -->
<div class="card">
<div class="column">
<h3 class="label uppercase">Referenzen/References</h3>
<ul v-if="dataset.references.length > 0">
<li v-for="(reference, i) in dataset.references" v-bind:key="reference.id">
+ <!-- Link to reference if it's a DOI or URL -->
<a
v-if="reference.type == 'DOI' || reference.type == 'URL'"
target="_blank"
@@ -277,14 +289,12 @@
{{ `${reference.relation} (${reference.type}): ${reference.value}` }}
</span>
<span v-if="dataset.references.length > 0 && i < dataset.references.length - 1" class="normal label">--</span>
- <!-- <span v-if="openAccessLicences.includes(license.name)" class="normal label uppercase"
- ><i class="fas fa-lock-open"></i> Open Access</span
- > -->
</li>
</ul>
<p v-else>-</p>
</div>
</div>
+ <!-- Sidebar card for showing embargo details -->
<div class="card">
<div class="column">
<h3 class="label uppercase">Embargo</h3>
@@ -294,27 +304,51 @@
<p v-else>-</p>
</div>
</div>
+
+ <!-- Sidebar card for displaying dataset contributors -->
+ <div class="card">
+ <div class="column">
+ <h3 class="label uppercase">Beitragende/Contributor</h3>
+ <p v-if="dataset.hasContributors()">
+ {{ dataset.contributors.map((u) => u.full_name).join(", ") }}
+ </p>
+ <p v-else>-</p>
+ </div>
+ </div>
+
</div>
</div>
</div>
+ <!-- Footer section with partner logos -->
<div class="container-fluid" style="padding-top: 3.8em">
- <div class="columns is-mobile partner-logos">
- <div class="column col-sm text-center">
- <a target="_blank" href="https://www.re3data.org/repository/r3d100013400"
- ><img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo"
- /></a>
+ <div class="columns">
+ <div class="column col-sm">
+ <div class="card mx-auto" style="width: 18rem; box-shadow: none; border: 0rem">
+ <div class="card-body">
+ <a target="_blank" href="https://www.re3data.org/repository/r3d100013400">
+ <img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo" />
+ </a>
+ </div>
+ </div>
</div>
- <div class="column col-sm text-center">
- <a target="_blank" href="http://www.geosphere.at/">
- <img src="@/assets/site/img/geosphere-austria-logo.jpg" class="pb-3" alt="logo geosphere austria" />
- <!-- <img src="@/assets/site/img/gbaLogoRGB_web.png" alt="GeoSphere Austria logo" /> -->
- </a>
+ <div class="column col-sm">
+ <div class="card mx-auto" style="width: 28rem; box-shadow: none; border: 0rem">
+ <div class="card-body">
+ <a target="_blank" href="http://www.geosphere.at/">
+ <img src="@/assets/site/img/geosphere-austria-logo.jpg" alt="logo geosphere austria" />
+ </a>
+ </div>
+ </div>
</div>
- <div class="column col-sm text-center">
- <a target="_blank" href="https://www.base-search.net/Search/Results?q=coll:fttethysrdr&refid=dctablede">
- <img src="@/assets/site/img/base-logo.gif" alt="logo base" />
- </a>
+ <div class="column col-sm">
+ <div class="card mx-auto" style="width: 18rem; box-shadow: none; border: 0rem">
+ <div class="card-body">
+ <a target="_blank" href="https://www.base-search.net/Search/Results?q=coll:fttethysrdr&refid=dctablede">
+ <img src="@/assets/site/img/base_logo.png" alt="logo base" />
+ </a>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -322,35 +356,43 @@
</template>
<script lang="ts">
+import Minimap from "@/components/Minimap.vue";
import DatasetDetailComponent from "./dataset-detail.component";
export default DatasetDetailComponent;
</script>
<style scoped lang="scss">
+// @import 'leaflet/dist/leaflet.css';
.section {
font-size: 0.8rem;
padding: 0;
}
+
.card {
border-radius: 0;
- /* rempve box-shadow */
+ /* Remove box-shadow for a flat design */
box-shadow: none;
}
+
.link-label {
color: #33cccc;
}
+
.label {
/* color: #363636; */
display: block;
font-size: 0.8rem;
font-weight: 700;
}
+
.label.uppercase {
text-transform: uppercase;
}
+
.normal.label {
font-weight: 400;
}
+
.column p span i {
color: #336699;
}
@@ -361,27 +403,4 @@ export default DatasetDetailComponent;
font-weight: 700;
background-color: #ccddf1;
}
-// input {
-// height: 2em;
-// font-size: 1em;
-// padding-left: 0.4em;
-// }
-// button {
-// margin-top: 20px;
-// font-family: Arial;
-// background-color: #eee;
-// border: none;
-// padding: 5px 10px;
-// border-radius: 4px;
-// cursor: pointer;
-// cursor: hand;
-// }
-// button:hover {
-// background-color: #cfd8dc;
-// }
-// button:disabled {
-// background-color: #eee;
-// color: #ccc;
-// cursor: auto;
-// }
</style>
diff --git a/src/views/home-view/home-view-component.ts b/src/views/home-view/home-view-component.ts
index e8fe76a..eca6844 100644
--- a/src/views/home-view/home-view-component.ts
+++ b/src/views/home-view/home-view-component.ts
@@ -11,6 +11,9 @@ import { Suggestion } from "@/models/dataset";
export default class HomeViewComponent extends Vue {
public display = "";
+ /* This method is called when a search suggestion is selected. It takes a parameter suggestion which can be either a Suggestion object or a string.
+ If it's a string, the method extracts the term and navigates to the "Search" route with the term as a parameter. If it's a Suggestion object, it extracts
+ the value and type from the suggestion and navigates to the "Search" route with both parameters.*/
onSearch(suggestion: Suggestion | string): void {
let term;
if (typeof suggestion === "string") {
@@ -22,6 +25,7 @@ export default class HomeViewComponent extends Vue {
}
}
+ /* This method is called when the user initiates a search. It navigates to the "Search" route with the display property as a parameter. */
search(): void {
this.$router.push({ name: "Search", params: { display: this.display } });
}
diff --git a/src/views/home-view/home-view-component.vue b/src/views/home-view/home-view-component.vue
index e7eebe2..ebd6c58 100644
--- a/src/views/home-view/home-view-component.vue
+++ b/src/views/home-view/home-view-component.vue
@@ -18,13 +18,6 @@
</a>
</div> -->
- <!-- <div class="column">
- <div class="col text-center py-3">
- <h1>Tethys Research Data Repository</h1>
- <p class="lead">Data Publisher for Geoscience Austria</p>
- <hr class="center-line" />
- </div>
- </div> -->
<div class="column">
<div class="col text-center py-3">
<h1>Tethys Research Data Repository</h1>
@@ -193,8 +186,8 @@
<div class="columns is-mobile partner-logos">
<div class="column col-sm text-center">
<a target="_blank" href="https://www.re3data.org/repository/r3d100013400"
- ><img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo"
- /></a>
+ ><img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo"/>
+ </a>
</div>
<div class="column col-sm text-center">
<a target="_blank" href="http://www.geosphere.at/">
diff --git a/src/views/search-view/search-view-component.ts b/src/views/search-view/search-view-component.ts
index 44b72dd..55db805 100644
--- a/src/views/search-view/search-view-component.ts
+++ b/src/views/search-view/search-view-component.ts
@@ -1,18 +1,26 @@
+// Import necessary modules, components, and models from Vue and the project
import { Component, Vue, Prop } from "vue-facing-decorator";
import VsInput from "@/components/vs-input/vs-input.vue";
import VsResult from "@/components/vs-result/vs-result.vue";
import FacetCategory from "@/components/face-category/facet-category.vue";
import ActiveFacetCategory from "@/components/active-facet-category/active-facet-category.vue";
-import { SolrSettings } from "@/models/solr";
-// import { DatasetService } from "@/services/dataset.service";
+
+// Import models and services
+// import { SolrSettings } from "@/models/solr";
+import { OpenSettings } from "@/models/solr";
import DatasetService from "../../services/dataset.service";
import { Suggestion, Dataset, SearchType } from "@/models/dataset";
-import { SolrResponse, FacetFields, FacetItem, FacetResults, FacetInstance } from "@/models/headers";
+// import { SolrResponse, FacetFields, FacetItem, FacetResults, FacetInstance } from "@/models/headers";
+// import { SolrResponse, FacetFields, FacetItem, FacetResults, FacetInstance, OpenSearchResponse, HitHighlight } from "@/models/headers";
+import { FacetItem, FacetResults, OpenSearchResponse } from "@/models/headers";
import { ActiveFilterCategories } from "@/models/solr";
-import { SOLR_HOST, SOLR_CORE } from "@/constants";
+// import { SOLR_HOST, SOLR_CORE } from "@/constants";
import { IPagination } from "@/models/pagination";
import PaginationComponent from "@/components/PaginationComponent.vue";
+import { OPEN_HOST, OPEN_CORE } from "@/constants";
+
+// Define the Vue component, its name, and child components
@Component({
name: "SearchViewComponent",
components: {
@@ -23,48 +31,76 @@ import PaginationComponent from "@/components/PaginationComponent.vue";
PaginationComponent,
},
})
+
+// Export the default class for the component
export default class SearchViewComponent extends Vue {
- @Prop()
- display!: string;
-
- @Prop()
- type!: string;
-
- results: Array<Dataset> = [];
-
- // facets: FacetFields = new FacetFields();
- facets: FacetResults = new FacetResults();
- searchTerm: string | Suggestion = "";
- // activeFilterCategories: Object = {};
- activeFilterCategories: ActiveFilterCategories = new ActiveFilterCategories(); // = new Array<ActiveFilterCategory>();
- pagination: IPagination = {
+ // Define props passed from the parent component
+ @Prop()
+ display!: string; // Search display string
+ @Prop()
+ type!: string; // Search type
+
+ // Declare variables used in the component
+ results: Array<Dataset> = []; // Array to hold search results
+ facets: FacetResults = new FacetResults(); // Object to hold facet results
+ searchTerm: string | Suggestion = ""; // The search term input
+ activeFilterCategories: ActiveFilterCategories = new ActiveFilterCategories(); // Active filter categories for search
+ pagination: IPagination = { // Pagination data for the results
total: 0,
perPage: 10,
currentPage: 1,
- // lastPage: 0,
data: [],
};
- loaded = false;
- numFound!: number;
- private solr: SolrSettings = {
- core: SOLR_CORE, //"rdr_data", // SOLR.core;
- host: SOLR_HOST, //"tethys.at",
- // core: "test_data", // SOLR.core;
- // host: "repository.geologie.ac.at",
+ loaded = false; // Boolean to track whether data has been loaded
+ numFound!: number; // Number of results found
+
+ // private solr: SolrSettings = {
+ // core: SOLR_CORE, //"rdr_data", // SOLR.core;
+ // host: SOLR_HOST, //"tethys.at",
+ // };
+
+ // Define settings for the OpenSearch API (core and host information)
+ private open: OpenSettings = {
+ core: OPEN_CORE,
+ host: OPEN_HOST, //"https://catalog.geosphere.at",
};
- // private rdrAPI!: DatasetService;
+
private error = "";
+ // Computed property to get search term as string
get stringSearchTerm(): string {
+ // If searchTerm is a string, return it directly
if (typeof this.searchTerm === "string") {
return this.searchTerm;
+ // If searchTerm is a Suggestion, return its value and type alias
} else if (this.searchTerm instanceof Suggestion) {
- return this.searchTerm.value + " (" + this.searchTerm.type + ")";
+ return this.searchTerm.value + " (" + this.getTypeAlias(this.searchTerm.type) + ")";
+ // return this.searchTerm.value + " (" + this.searchTerm.type + ")";
+ // Default to empty string
} else {
return "";
}
}
+ /**
+ * The alias for the search term type will be set depending on the name of the type.
+ * This will allow to display the customised terms instead of the values currently used in the OpenSearch index.
+ * TODO: This should be corrected directly in the index
+ */
+ getTypeAlias(type: string): string {
+ switch (type) {
+ case "author":
+ return "creator";
+ case "subjects":
+ return "keyword";
+ case "doctype":
+ return "data type";
+ default:
+ return type;
+ }
+ }
+
+ // Method to check if a search term is present
hasSearchTerm(): boolean {
if (typeof this.searchTerm === "string" && this.searchTerm !== "") {
return true;
@@ -74,21 +110,22 @@ export default class SearchViewComponent extends Vue {
return false;
}
}
- // getKeyName(value: string) {
- // return Object.entries(Suggestion).find(([key, val]) => val === value)?.[0];
- // }
+
+ // Method to get enum key by enum value
getEnumKeyByEnumValue<T extends { [index: string]: string }>(myEnum: T, enumValue: string): keyof T | null {
const keys = Object.keys(myEnum).filter((x) => myEnum[x] == enumValue);
return keys.length > 0 ? keys[0] : null;
// return keys[0];
}
+ // Lifecycle hook: executed before the component is mounted
beforeMount(): void {
- // this.rdrAPI = new DatasetService();
+ // Trigger search based on provided display and type props
if (this.display != "" && this.type != undefined) {
- const enumKey: "Title" | "Author" | "Subject" | null = this.getEnumKeyByEnumValue(SearchType, this.type);
+ const enumKey: "Title" | "Author" | "Subject" | "Doctype" | null = this.getEnumKeyByEnumValue(SearchType, this.type);
if (enumKey) {
- const suggestion = new Suggestion(this.display, SearchType[enumKey]);
+ const suggestion = new Suggestion(this.display, "NO-IDEA", SearchType[enumKey]);
+ // const suggestion = new Suggestion(this.display, "" , SearchType[enumKey]);
this.onSearch(suggestion);
} else {
this.onSearch(this.display);
@@ -100,216 +137,294 @@ export default class SearchViewComponent extends Vue {
}
}
- // onSearch(term: string): void {
+ // Method to trigger a search
onSearch(suggestion: Suggestion | string): void {
- // let queryOperator;
- // if (typeof suggestion === "string") {
- // suggestion = suggestion + "*";
- // queryOperator = "or";
- // } else if (suggestion instanceof Suggestion) {
- // // term = suggestion.value;
- // queryOperator = "and";
- // }
-
- // if (term) {
- // term = term.trim();
- // } else {
- // term = "*%3A*";
- // }
-
+ // console.log("ONSEARCH");
+
+ // Reset active filter categories and facet results
this.activeFilterCategories = new ActiveFilterCategories();
this.facets = new FacetResults();
-
- // this.facets = {};
this.searchTerm = suggestion;
- DatasetService.facetedSearch(suggestion, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe({
- next: (res: SolrResponse) => this.dataHandler(res),
+
+ // /* Perform faceted search. The method returns an Observable, and the code subscribes to this Observable to handle the response. If the response is successful, it calls the dataHandler method
+ // with the Solr response as a parameter. If there is an error, it calls the errorHandler method with the error message as a parameter */
+ // DatasetService.facetedSearchSOLR(suggestion, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe({
+ // next: (res: SolrResponse) => this.dataHandler(res),
+ // error: (error: string) => this.errorHandler(error),
+ // });
+
+ DatasetService.facetedSearch(suggestion, this.activeFilterCategories, this.open.core, this.open.host, undefined).subscribe({
+ next: (res: OpenSearchResponse) => this.dataHandler(res),
error: (error: string) => this.errorHandler(error),
});
+
}
- private dataHandler(res: SolrResponse, filterItem?: FacetItem): void {
- // this.results = datasets;
- this.results = res.response.docs;
- this.numFound = res.response.numFound;
-
- // pagination
- this.pagination["total"] = res.response.numFound;
- this.pagination["perPage"] = res.responseHeader.params.rows as number;
- // this.pagination["currentPage"] = 1;
- this.pagination["data"] = res.response.docs;
+ // Handle the search results
+ private dataHandler(res: OpenSearchResponse, filterItem?: FacetItem): void {
+ this.results = res.hits.hits.map(hit => hit._source);
+ this.numFound = res.hits.total.value;
+ this.pagination.total = res.hits.total.value;
+ this.pagination.perPage = 10;
+ this.pagination.data = this.results;
this.pagination.lastPage = Math.ceil(this.pagination.total / this.pagination.perPage);
- // facets
- // const facet_fields = res.facet_counts.facet_fields;
- // for (const prop in facet_fields) {
- // const facetCategory: FacetCategory<any> = facet_fields[prop];
- // const facetValues = facetCategory.key.values.map((facet_value: any, i: number) => {
- // if (i % 2 === 0 && typeof facet_value == "string") {
- // //var rObj = { value: facet, count: facet_fields[prop][i + 1] };
- // // FiletrItem with value and count
- // const rObj = new FilterItem(facet_value, facetCategory.key.values[i + 1]);
- // return rObj;
- // }
- // });
- // .filter(function (el: FilterItem) {
- // return el != null && el.count > 0;
- // });
- // //this.facets.push({ filterName: prop, values: facetValues });
- // this.facets[prop] = facetValues;
- // }
-
- const facet_fields: FacetFields = res.facets;
- let prop: keyof typeof facet_fields;
- for (prop in facet_fields) {
- const facetCategory = facet_fields[prop];
- if (facetCategory.buckets) {
- const facetItems: Array<FacetItem> = facetCategory.buckets;
-
- let facetValues = facetItems.map((facetItem) => {
- let rObj: FacetItem;
- if (filterItem?.val == facetItem.val) {
- rObj = filterItem;
- } else if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
- // console.log(facetValue + " is included")
- const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
- // console.log(indexOfFacetValue);
- rObj = this.facets[prop][indexOfFacetValue];
- rObj.count = facetItem.count;
- // rObj = new FacetItem(val, count);
- } else {
- rObj = new FacetItem(facetItem.val, facetItem.count);
- }
- return rObj;
- });
-
- facetValues = facetValues.filter(function (el) {
- return el != null && el.count > 0;
- });
- // this.facets[prop] = facetCategory;
- this.facets[prop] = facetValues;
+ if (res.aggregations) {
+ const facet_fields = res.aggregations;
+
+ let prop: keyof typeof facet_fields;
+
+ // Iterate through facet fields
+ for (prop in facet_fields) {
+ const facetCategory = facet_fields[prop];
+ if (facetCategory.buckets) {
+ const facetItems = facetCategory.buckets.map(bucket => new FacetItem(bucket.key, bucket.doc_count));
+
+ let facetValues = facetItems.map((facetItem) => {
+ let rObj: FacetItem;
+ // Check if current facet item matches filter item
+ if (filterItem?.val == facetItem.val) {
+ rObj = filterItem;
+ } else if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
+ const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
+ rObj = this.facets[prop][indexOfFacetValue];
+ rObj.count = facetItem.count;
+ } else {
+ // Create new facet item
+ rObj = new FacetItem(facetItem.val, facetItem.count);
+ }
+ return rObj;
+ });
+
+ // Filter out null values and values with count <= 0
+ facetValues = facetValues.filter(el => el.count > 0);
+ this.facets[prop] = facetValues;
+ }
}
}
}
+ // // Method to handle search response
+ // private dataHandlerSOLR(res: SolrResponse, filterItem?: FacetItem): void {
+ // // console.log("dataHandlerSOLR (docs, numFound):");
+ // // console.log(res.response.docs);
+ // // console.log(res.response.numFound);
+
+ // // Update results
+ // this.results = res.response.docs;
+ // this.numFound = res.response.numFound;
+
+ // // Update pagination
+ // this.pagination["total"] = res.response.numFound;
+ // this.pagination["perPage"] = res.responseHeader.params.rows as number;
+ // this.pagination["data"] = res.response.docs;
+ // this.pagination.lastPage = Math.ceil(this.pagination.total / this.pagination.perPage);
+
+ // const facet_fields: FacetFields = res.facets;
+
+ // /* This code declares a variable prop with a type of keys of the facet_fields object. The keyof typeof facet_fields type represents the keys of the facet_fields object.
+ // This means that prop can only hold values that are keys of the facet_fields object. */
+ // let prop: keyof typeof facet_fields;
+
+ // // Iterate through facet fields
+ // for (prop in facet_fields) {
+ // const facetCategory = facet_fields[prop];
+ // if (facetCategory.buckets) {
+ // const facetItems: Array<FacetItem> = facetCategory.buckets;
+
+ // let facetValues = facetItems.map((facetItem) => {
+ // let rObj: FacetItem;
+ // // Check if current facet item matches filter item
+ // if (filterItem?.val == facetItem.val) {
+ // rObj = filterItem;
+ // } else if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
+ // // console.log(facetValue + " is included")
+ // // Update existing facet item with new count
+ // const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
+ // // console.log(indexOfFacetValue);
+ // rObj = this.facets[prop][indexOfFacetValue];
+ // rObj.count = facetItem.count;
+ // // rObj = new FacetItem(val, count);
+ // } else {
+ // // Create new facet item
+ // rObj = new FacetItem(facetItem.val, facetItem.count);
+ // }
+ // return rObj;
+ // });
+
+ // // Filter out null values and values with count <= 0
+ // facetValues = facetValues.filter(function (el) {
+ // return el != null && el.count > 0;
+ // });
+ // // this.facets[prop] = facetCategory;
+ // // Update facet values
+ // this.facets[prop] = facetValues;
+ // }
+ // }
+ // }
+
+ // Method to handle search errors
private errorHandler(err: string): void {
this.error = err;
- // this.loading = false;
}
+ // Method to handle pagination
onMenuClick(page: number) {
- // const test = page;
- // console.log(test);
+ console.log("onMenuClick");
+
this.pagination.currentPage = page;
const start = page * this.pagination.perPage - this.pagination.perPage;
- DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, start.toString()).subscribe(
- (res: SolrResponse) => this.dataHandler(res),
- (error: string) => this.errorHandler(error),
- );
+ // // Trigger new search with updated pagination parameters
+ // DatasetService.facetedSearchSOLR(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, start.toString()).subscribe(
+ // (res: SolrResponse) => this.dataHandler(res),
+ // (error: string) => this.errorHandler(error),
+ // );
+
+ DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.open.core, this.open.host, start.toString()).subscribe({
+ next: (res: OpenSearchResponse) => this.dataHandler(res),
+ error: (error: string) => this.errorHandler(error),
+ });
}
+ // Method to handle facet filtering
onFilter(facetItem: FacetItem): void {
+ console.log("onFilter");
+
+ // Reset current page
this.pagination.currentPage = 1;
- // console.log(facetItem.val);
- // if (!this.activeFilterCategories.hasOwnProperty(facetItem.category)) {
+
+ // Check if filter item already exists
if (!Object.prototype.hasOwnProperty.call(this.activeFilterCategories, facetItem.category)) {
this.activeFilterCategories[facetItem.category] = new Array<string>();
}
- // if (!this.activeFilterCategories[facetItem.category].some((e) => e === facetItem.val)) {
+
+ // Check if filter item is not already applied
if (!this.activeFilterCategories[facetItem.category].some((e) => e === facetItem.val)) {
+ // Add filter item to active filter categories
this.activeFilterCategories[facetItem.category].push(facetItem.val);
- DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe(
- (res: SolrResponse) => this.dataHandler(res, facetItem),
- (error: string) => this.errorHandler(error),
- );
- // alert(this.activeFilterCategories[filter.Category]);
- // var res = await rdrApi.search(this.searchTerm, this.activeFilterCategories, this.solrCore, this.solrHost);
- // this.results = res.response.docs;
- // this.numFound = res.response.numFound;
+ // DatasetService.facetedSearchSOLR(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe(
+ // (res: SolrResponse) => this.dataHandler(res, facetItem),
+ // (error: string) => this.errorHandler(error),
+ // );
- // // pagination
- // this.pagination['total'] = res.response.numFound;
- // this.pagination['per_page'] = res.responseHeader.params.rows;
- // this.pagination['current_page'] = 1;
- // this.pagination['data'] = res.response.docs;
-
- // var facet_fields = res.facet_counts.facet_fields;
- // for (var prop in facet_fields) {
- // var facetValues = facet_fields[prop].map((facetValue, i) => {
- // if (i % 2 === 0) {
- // // var rObj = { value: facetValue, count: facet_fields[prop][i + 1] };
- // var rObj;
- // if (filter.value == facetValue) {
- // rObj = filter;
- // } else if (this.facets[prop].some(e => e.value === facetValue)) {
- // // console.log(facetValue + " is included")
- // var indexOfFacetValue = this.facets[prop].findIndex(i => i.value === facetValue);
- // // console.log(indexOfFacetValue);
- // rObj = this.facets[prop][indexOfFacetValue];
- // rObj.count = facet_fields[prop][i + 1];
- // } else {
- // rObj = new FilterItem(facetValue, facet_fields[prop][i + 1]);
- // }
- // return rObj;
- // }
- // }).filter(function (el) {
- // return el != null && el.count > 0;
- // });
- // // this.facets.push({ filterName: prop, values: facetValues });
- // this.facets[prop] = facetValues;
+ // Trigger new search with updated filter
+ DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.open.core, this.open.host, undefined).subscribe({
+ next: (res: OpenSearchResponse) => this.dataHandler(res, facetItem),
+ error: (error: string) => this.errorHandler(error),
+ });
}
}
+ // // // Method to clear facet category filter
+ // onClearFacetCategorySOLR(categoryName: string): void {
+ // console.log("onClearFacetCategory");
+
+ // delete this.activeFilterCategories[categoryName];
+
+ // // Trigger new search with updated filter
+ // DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe({
+ // next: (res: SolrResponse) => {
+ // this.results = res.response.docs;
+ // this.numFound = res.response.numFound;
+
+ // // pagination
+ // this.pagination["total"] = res.response.numFound;
+ // this.pagination["perPage"] = res.responseHeader.params.rows as number;
+ // this.pagination["currentPage"] = 1;
+ // this.pagination["data"] = res.response.docs;
+
+ // const facet_fields: FacetFields = res.facets;
+ // let prop: keyof typeof facet_fields;
+ // for (prop in facet_fields) {
+ // const facetCategory: FacetInstance = facet_fields[prop];
+ // if (facetCategory.buckets) {
+ // const facetItems: Array<FacetItem> = facetCategory.buckets;
+
+ // const facetValues = facetItems.map((facetItem) => {
+ // let rObj: FacetItem;
+ // if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
+ // // console.log(facetValue + " is included")
+ // // Update existing facet item with new count
+ // const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
+ // // console.log(indexOfFacetValue);
+ // rObj = this.facets[prop][indexOfFacetValue];
+ // rObj.count = facetItem.count;
+ // // rObj = new FacetItem(val, count);
+ // // if facet ccategory is reactivated category, deactivate all filter items
+ // if (prop == categoryName) {
+ // rObj.active = false;
+ // }
+ // } else {
+ // // Create new facet item
+ // rObj = new FacetItem(facetItem.val, facetItem.count);
+ // }
+ // return rObj;
+ // });
+ // this.facets[prop] = facetValues;
+ // }
+ // }
+ // },
+ // error: (error: string) => this.errorHandler(error),
+ // complete: () => console.log("clear facet category completed"),
+ // });
+ // }
+
+ // Method to clear facet category filter
onClearFacetCategory(categoryName: string): void {
- // alert(categoryName);
+ // console.log("onClearFacetCategory");
delete this.activeFilterCategories[categoryName];
- DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.solr.core, this.solr.host, undefined).subscribe({
- next: (res: SolrResponse) => {
- this.results = res.response.docs;
- this.numFound = res.response.numFound;
-
- // pagination
- this.pagination["total"] = res.response.numFound;
- this.pagination["perPage"] = res.responseHeader.params.rows as number;
- this.pagination["currentPage"] = 1;
- this.pagination["data"] = res.response.docs;
-
- const facet_fields: FacetFields = res.facets;
- let prop: keyof typeof facet_fields;
- for (prop in facet_fields) {
- const facetCategory: FacetInstance = facet_fields[prop];
- if (facetCategory.buckets) {
- const facetItems: Array<FacetItem> = facetCategory.buckets;
-
- const facetValues = facetItems.map((facetItem) => {
- let rObj: FacetItem;
- if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
- // console.log(facetValue + " is included")
- const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
- // console.log(indexOfFacetValue);
- rObj = this.facets[prop][indexOfFacetValue];
- rObj.count = facetItem.count;
- // rObj = new FacetItem(val, count);
- //if facet ccategory is reactivated category, deactivate all filter items
- if (prop == categoryName) {
- rObj.active = false;
+ // Trigger new search with updated filter
+ DatasetService.facetedSearch(this.searchTerm, this.activeFilterCategories, this.open.core, this.open.host, undefined).subscribe({
+ next: (res: OpenSearchResponse) => {
+ this.results = res.hits.hits.map(hit => hit._source);
+ this.numFound = res.hits.total.value;
+
+ // Update pagination
+ this.pagination.total = res.hits.total.value;
+ this.pagination.perPage = 10;
+ this.pagination.currentPage = 1;
+ this.pagination.data = this.results;
+ this.pagination.lastPage = Math.ceil(this.pagination.total / this.pagination.perPage);
+
+ if (res.aggregations) {
+ const facet_fields = res.aggregations;
+
+ let prop: keyof typeof facet_fields;
+
+ for (prop in facet_fields) {
+ const facetCategory = facet_fields[prop];
+ if (facetCategory.buckets) {
+ const facetItems = facetCategory.buckets.map(bucket => new FacetItem(bucket.key, bucket.doc_count));
+
+ const facetValues = facetItems.map((facetItem) => {
+ let rObj: FacetItem;
+ if (this.facets[prop]?.some((e) => e.val === facetItem.val)) {
+ // Update existing facet item with new count
+ const indexOfFacetValue = this.facets[prop].findIndex((i) => i.val === facetItem.val);
+ rObj = this.facets[prop][indexOfFacetValue];
+ rObj.count = facetItem.count;
+ // if facet category is reactivated category, deactivate all filter items
+ if (prop === categoryName) {
+ rObj.active = false;
+ }
+ } else {
+ // Create new facet item
+ rObj = new FacetItem(facetItem.val, facetItem.count);
}
- } else {
- rObj = new FacetItem(facetItem.val, facetItem.count);
- }
- return rObj;
- });
- this.facets[prop] = facetValues;
+ return rObj;
+ }).filter(el => el.count > 0); // Filter out items with count <= 0
+
+ this.facets[prop] = facetValues;
+ }
}
}
},
error: (error: string) => this.errorHandler(error),
- complete: () => console.log("clear facet category completed"),
+ complete: () => console.log("Clear facet category completed"),
});
}
- // onPaging(page: number): void {}
}
diff --git a/src/views/search-view/search-view-component.vue b/src/views/search-view/search-view-component.vue
index 5afc7d1..4fa064f 100644
--- a/src/views/search-view/search-view-component.vue
+++ b/src/views/search-view/search-view-component.vue
@@ -1,46 +1,39 @@
<template>
<div id="page_style" class="rows site-content page__style page__description" autocomplete="off">
+
+ <!-- Search input section -->
<div class="container-fluid banner mz-5">
<vs-input v-bind:propDisplay="searchTerm" v-bind:placeholder="'Enter your search term...'" @search-change="onSearch"></vs-input>
</div>
- <div class="column is-half is-offset-one-quarter" style="padding-top: 0; margin-top: 0">
- <!-- <div class="tabs is-centered">
- <ul id="id-results-tabs">
- <li class="search_tab is-active">
- <a target="_self">Web</a>
- </li>
- <li class="search_tab">
- <a target="_self">Images</a>
- </li>
- <li class="search_tab">
- <a target="_self">Videos</a>
- </li>
- <li class="search_tab">
- <a target="_self">Homepages</a>
- </li>
- <li class="search_tab">
- <a target="_self">Food</a>
- </li>
- <li class="search_tab">
- <a target="_self">Books</a>
- </li>
- </ul>
- </div> -->
- <div v-if="results.length > 0" class="result-list-info">
- <div v-if="hasSearchTerm()" class="resultheader">
- Your search term {{ "'" + stringSearchTerm + "'" }} yielded <strong>{{ numFound }}</strong> results:
- </div>
+
+ <!-- Results area on top of the list of publications -->
+ <div class="columns">
+ <!-- Left sidebar section. Empty, just to keep simetry -->
+ <div id="id-side-bar" class="column is-4 sidebar_column" style="padding-top: 0rem; padding-right: 1.5rem; padding-left: 1.5rem">
</div>
- <div v-else-if="results.length == 0">
- <div class="resultheader">
- Your search yielded
- <strong> 0</strong> results:
+
+ <!-- Results section -->
+ <div class="col col-8 column is-8 results_column" style="padding-top: 0.5rem; padding-right: 1rem; padding-left: 1rem; padding-bottom: 0rem;">
+ <!-- Display results if any -->
+ <div v-if="results.length > 0" class="result-list-info">
+ <div v-if="hasSearchTerm()" class="p-1 mb-0 text-sm bg-[#d8f4f7] rounded-lg" role="alert">
+ <span class="font-medium pl-5">Your search term</span> <span class="font-semibold">{{ "'" + stringSearchTerm + "'" }}</span> yielded <strong>{{ numFound }}</strong> results:
+ </div>
+ </div>
+ <!-- Display message if no results found -->
+ <div v-else-if="results.length == 0">
+ <div class="p-1 mb-0 text-sm bg-[#d8f4f7] rounded-lg" role="alert">
+ <!-- <span class="font-medium pl-5">Your search yielded <strong> 0</strong> results.</span> -->
+ <span class="font-medium pl-5">Your search term</span> <span class="font-semibold">{{ "'" + stringSearchTerm + "'" }}</span> yielded <strong>0</strong> results:
+ </div>
</div>
</div>
</div>
+ <!-- Area with the list of facets (left) and list of publications (right) -->
<div class="columns">
- <div id="id-side-bar" class="column is-4 sidebar_column" style="padding-top: 1.2rem; padding-right: 1.5rem; padding-left: 1.5rem">
+ <!-- Sidebar with facets -->
+ <div id="id-side-bar" class="column is-4 sidebar_column" style="padding-top: 0.5rem; padding-right: 1.5rem; padding-left: 1.5rem">
<div id="externals" class="">
<div v-for="(facetItems, key, index) in facets" v-bind:key="index" name="external_card" style="margin-bottom: 0px">
<facet-category v-bind:facetItems="facetItems" v-bind:filterName="key" @filter="onFilter"></facet-category>
@@ -48,9 +41,11 @@
</div>
</div>
- <div class="col col-8 column is-8 results_column" style="padding-top: 1.2rem; padding-right: 1rem; padding-left: 1rem">
+ <!-- Main results section with pagination and active filters -->
+ <div class="col col-8 column is-8 results_column" style="padding-top: 0.5rem; padding-right: 1rem; padding-left: 1rem">
<div v-if="activeFilterCategories && Object.keys(activeFilterCategories).length > 0" class="column">
<span v-for="(values, key, index) in activeFilterCategories" v-bind:key="index" class="active-filter-items">
+ <!-- Active filter categories -->
<active-facet-category
v-bind:filterItems="values"
v-bind:categoryName="key"
@@ -59,38 +54,17 @@
</span>
</div>
<div class="results">
- <!-- pagination before search results -->
+ <!-- Pagination before search results -->
<PaginationComponent class="mb-5" v-bind:data="pagination" @menu-click="onMenuClick"></PaginationComponent>
<!-- Results section -->
<vs-result v-bind:datasets="results"></vs-result>
- <!-- pagination after serach results -->
+ <!-- Pagination after search results -->
<PaginationComponent class="mt-5" v-bind:data="pagination" @menu-click="onMenuClick"></PaginationComponent>
</div>
</div>
-
- <!-- <PaginationComponent v-bind:data="pagination"></PaginationComponent> -->
</div>
- <!-- <div class="container-fluid" style="padding-top: 3.8em">
- <div class="columns is-mobile partner-logos">
- <div class="column col-sm text-center">
- <a target="_blank" href="https://www.re3data.org/repository/r3d100013400"
- ><img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo"
- /></a>
- </div>
- <div class="column col-sm text-center">
- <a target="_blank" href="http://www.geosphere.at/">
- <img src="@/assets/site/img/geosphere-austria-logo.jpg" alt="logo geosphere austria" />
- </a>
- </div>
- <div class="column col-sm text-center">
- <a target="_blank" href="https://www.base-search.net/Search/Results?q=coll:fttethysrdr&refid=dctablede">
- <img src="@/assets/site/img/base-logo.gif" alt="logo base" />
- </a>
- </div>
- </div>
- </div> -->
-
+ <!-- Partner logos section -->
<div class="container-fluid">
<!-- <div class="columns is-mobile partner-logos"> -->
<div class="columns">
@@ -134,4 +108,4 @@ export default SearchViewComponent;
import "@/index.css";
</script>
-<style scoped></style>
+<style scoped></style>
\ No newline at end of file
diff --git a/vue.config.cjs b/vue.config.cjs
index 539ff81..4fc1199 100644
--- a/vue.config.cjs
+++ b/vue.config.cjs
@@ -5,6 +5,7 @@ const webpack = require("webpack");
const { VueLoaderPlugin } = require("vue-loader");
module.exports = {
+ lintOnSave: false,
publicPath: "/",
chainWebpack: (config) => {
const vueRule = config.module.rule("vue");
@@ -88,8 +89,11 @@ module.exports = {
__VUE_PROD_HYDRATION_MISMATCH_DETAILS__: "false",
APP_URL: JSON.stringify(process.env.APP_URL),
VUE_API: JSON.stringify(process.env.VUE_API),
- SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
- SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),
+ // SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
+ // SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),
+ // OPENSEARCH
+ OPEN_HOST: JSON.stringify(process.env.OPEN_HOST),
+ OPEN_CORE: JSON.stringify(process.env.OPEN_CORE),
}),
// new NodePolyfillPlugin(),
],