From 9dbda3d32bc4bcd3e4adcf42dd8ac93dc10d0ef5 Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Wed, 12 Jan 2022 13:43:24 +0100
Subject: [PATCH] fix dict in similar
---
src/components/DictionaryView.vue | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue
index ea2b96cd..fac1dab8 100644
--- a/src/components/DictionaryView.vue
+++ b/src/components/DictionaryView.vue
@@ -194,8 +194,7 @@ function navigate_to_query(self, word) {
// Get inflections
if (!/[_*%|]/.test(q)) {
- console.log("ARTICLE INFO", self.article_info)
- let params = {q, dict: self.lang, include: "i", meta: 'n', wc: self.pos_selected}
+ let params = {q, dict: self.lang, dform: 'int', include: "i", meta: 'n', wc: self.pos_selected}
api.get('suggest?', {params})
.then((response) => {
self.inflection_suggestions = response.data.a.inflect
@@ -218,35 +217,24 @@ function navigate_to_query(self, word) {
let bm_length = response.data.articles.bm ? response.data.articles.bm.length : 0
let nn_length = response.data.articles.nn ? response.data.articles.nn.length : 0
-
- if (self.lang == 'bm,nn' && (bm_length == 0 || nn_length == 0)) {
- let missing_lang = bm_length == 0? 1 : 2
- let similar = (self.event && query.similar) || []
- self.similar = similar.filter((item, index) => {
- return item[1] == missing_lang || item[1] == 3
- })
- }
- else {
- self.similar = []
- }
-
+ let total_length = bm_length + nn_length
// Similar
if (bm_length == 0 || nn_length == 0) {
if (!/[_*%|]/.test(q)) {
- console.log("ARTICLE INFO", self.article_info)
let dict = self.lang
- if (dict == 'bm,nn') {
+ if (dict == 'bm,nn' && total_length > 0) {
dict = bm_length == 0? 'bm' : 'nn'
}
- let params = {q, dict, include: "s", wc: self.pos_selected}
+ let params = {q, dict, dform: 'int', include: "s", wc: self.pos_selected}
api.get('suggest?', {params})
- .then((response) => { self.similar = response.data.a.similar})
+ .then((response) => {
+ self.similar = response.data.a.similar
+ console.log("SIMILAR", response)})
}
}
- if (bm_length + nn_length == 0) {
- self.similar = (self.event && query.similar) || []
+ if (total_length == 0) {
self.waiting_for_articles = false
self.no_results = true
self.replace_history() // fixes routing bug when going back from suggested search
--
GitLab