src/components/vs-input/vs-input.ts

@@ -2,12 +2,12 @@
 // import debounce from 'lodash/debounce';
 // import { DatasetService } from "../../services/dataset.service";
 import DatasetService from "../../services/dataset.service";
-//import { SolrSettings } from "@/models/solr";
+import { SolrSettings } from "@/models/solr";
 // import { ref } from "vue";
 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";
 
 @Component({
     name: "VsInput",
@@ -30,12 +30,12 @@ export default class VsInput extends Vue {
     private loading = false;
     private selectedIndex = -1;
     // private selectedDisplay = "";
-    /*private solr: SolrSettings = {
+    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",
-    };*/
+    };
     // private rdrAPI!: DatasetService;
     itemRefs!: Array<Element>;
     emits = ["filter"];
@@ -153,26 +153,13 @@ export default class VsInput extends Vue {
     }
 
     private request(): void {
-        const searchUrl = 'https://tethysbackend/opensearch.xml'; //i would guess ?
+        DatasetService.searchTerm(this.display, this.solr.core, this.solr.host).subscribe({
-        const searchTerms = this.display;
+            next: (res: Dataset[]) => this.dataHandler(res),
-        const searchQuery = searchUrl.replace('{searchTerms}', searchTerms);
+            error: (error: string) => this.errorHandler(error),
-    
+            complete: () => (this.loading = false),
-        fetch(searchQuery)
-            .then((response) => response.text())
-            .then((xml) => {
-                // need XML parser library
-                const data = parseResponse(xml); 
-                this.dataHandler(data);
-            })
-            .catch((error) => {
-                this.errorHandler(error);
-            })
-            .finally(() => {
-                this.loading = false;
         });
     }
 
-
     private dataHandler(datasets: Dataset[]): void {
         this.results = datasets;
         // this.$emit("search", this.display);

src/constants.ts

@@ -2,16 +2,19 @@
 // declare const EDGE_URL: string;
 declare const APP_URL: string;
 declare const VUE_APP_PORTAL: string;
-
+declare const SOLR_HOST: string;
+declare const SOLR_CORE: string;
 
 // const _EDGE_URL = EDGE_URL;
 // const _POINT_URL = POINT_URL;
 const _APP_URL = APP_URL;
 const _VUE_APP_PORTAL = VUE_APP_PORTAL;
-
+const _SOLR_HOST = SOLR_HOST;
+const _SOLR_CORE = SOLR_CORE;
 
 // export { _EDGE_URL as EDGE_URL };
 // export { _POINT_URL as POINT_URL };
 export { _APP_URL as APP_URL };
 export { _VUE_APP_PORTAL as VUE_APP_PORTAL };
-
+export { _SOLR_HOST as SOLR_HOST };
+export { _SOLR_CORE as SOLR_CORE };

src/models/solr.ts

@@ -1,3 +1,8 @@
+export interface SolrSettings {
+    core: string;
+    host: string;
+}
+
 export class ActiveFilterCategories {
     // count: number;
     // language!: Array<string>;

vue.config.js

@@ -85,8 +85,8 @@ module.exports = {
             new webpack.DefinePlugin({
                 APP_URL: JSON.stringify(process.env.APP_URL),
                 VUE_APP_PORTAL: JSON.stringify(process.env.VUE_APP_PORTAL),
-                //SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
+                SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
-                //SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),
+                SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),
             }),
             new NodePolyfillPlugin(),
         ],