From c6e0d491efad207de1f497f5be734304a52c86be Mon Sep 17 00:00:00 2001 From: Chanjin Park Date: Fri, 1 Nov 2024 21:03:44 +0900 Subject: [PATCH] json upload fix --- src/backend/gs_index/src/components/Corpus.vue | 2 +- src/backend/gs_index/src/components/CorpusesView.vue | 5 +++-- src/backend/gs_index/src/components/UploadView.vue | 8 +++++--- src/backend/gs_index/src/corpusStorage.js | 2 ++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/backend/gs_index/src/components/Corpus.vue b/src/backend/gs_index/src/components/Corpus.vue index 4a14cce..ae1c53b 100644 --- a/src/backend/gs_index/src/components/Corpus.vue +++ b/src/backend/gs_index/src/components/Corpus.vue @@ -91,7 +91,7 @@ let a = document.createElement("a"); //dummy a let file = new Blob([json], {type: "text/plain"}); - a.download = this.corpus_id + ".corpus.json"; + a.download = this.corpus.id + ".corpus.json"; a.href = URL.createObjectURL(file); a.click(); }, diff --git a/src/backend/gs_index/src/components/CorpusesView.vue b/src/backend/gs_index/src/components/CorpusesView.vue index b16eebf..f0bee8a 100644 --- a/src/backend/gs_index/src/components/CorpusesView.vue +++ b/src/backend/gs_index/src/components/CorpusesView.vue @@ -38,6 +38,7 @@ /* Local */ async addLocalCorpus(corpus) { + console.log("addLocalCorpus", corpus.id); this.corpusStorage.create(corpus); }, updateCorpusIds() { @@ -52,7 +53,7 @@ }, }, async created() { - EventBus.on("updateCorpusIds", this.updateCorpusIds); // Listen for the error event + EventBus.on("updateCorpusIds", this.updateCorpusIds); EventBus.on("addLocalCorpus", this.addLocalCorpus); // From UploadView this.getRemoteSamples(); @@ -62,7 +63,7 @@ this.updateCorpusIds(); }, beforeDestroy() { - EventBus.off("updateCorpuses", this.updateCorpuses); // Clean up the event listener + EventBus.off("updateCorpusIds", this.updateCorpusIds); EventBus.off("addLocalCorpus", this.addLocalCorpus); // From UploadView }, } diff --git a/src/backend/gs_index/src/components/UploadView.vue b/src/backend/gs_index/src/components/UploadView.vue index ff5ce23..7840329 100644 --- a/src/backend/gs_index/src/components/UploadView.vue +++ b/src/backend/gs_index/src/components/UploadView.vue @@ -12,8 +12,7 @@ methods: { async onUploadButtonClicked() { const corpus = Corpus.init_with_txt(this.originalText); - const corpus_id = this.makeTitle(this.originalText); - corpus.id = corpus_id; + corpus.id = this.makeTitle(this.originalText); EventBus.emit("addLocalCorpus", corpus); }, async onJsonFileInput(event) { @@ -21,10 +20,13 @@ const content = await file.text(); const corpus = JSON.parse(content); - const corpus_id = this.makeTitle(corpus.original_text); + corpus.id = "JSON Corpus"; EventBus.emit("addLocalCorpus", corpus); }, makeTitle(str, maxlen=16) { + if (!str) + return "Corpus"; + return str.substring(0, maxlen); } } diff --git a/src/backend/gs_index/src/corpusStorage.js b/src/backend/gs_index/src/corpusStorage.js index 41cfd94..f29c858 100644 --- a/src/backend/gs_index/src/corpusStorage.js +++ b/src/backend/gs_index/src/corpusStorage.js @@ -37,6 +37,8 @@ class CorpusStorageInner { getRequest.onerror = (event) => reject(event.target.error); }; + if (!content.id) + content.id = "id"; checkAndAdd(content, content.id); }); }