removed a bug

saenuma · Jul 17, 2020 · f319b48 · f319b48
1 parent 6d6e9bb
commit f319b48
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 28 deletions.
diff --git a/flaarum_shared/lib.go b/flaarum_shared/lib.go
@@ -18,11 +18,6 @@ import (
 )
 
 
-var (
-  STOP_WORDS []string
-)
-
-
 const (
   BROWSER_DATE_FORMAT = "2006-01-02"
   BROWSER_DATETIME_FORMAT = "2006-01-02T15:04"
@@ -32,22 +27,6 @@ const (
 )
 
 
-func init() {
-  // load stop words once
-  stopWordsJsonPath := G("english-stopwords.json")
-  jsonBytes, err := ioutil.ReadFile(stopWordsJsonPath)
-  if err != nil {
-    panic(err)
-  }
-  stopWordsList := make([]string, 0)
-  err = json.Unmarshal(jsonBytes, &stopWordsList)
-  if err != nil {
-    panic(err)
-  }
-  STOP_WORDS = stopWordsList
-}
-
-
 func DoesPathExists(p string) bool {
 	if _, err := os.Stat(p); os.IsNotExist(err) {
 		return false

diff --git a/store/main.go b/store/main.go
@@ -16,6 +16,7 @@ import (
 
 var projsMutex *sync.RWMutex // for projects and tables (table data uses different mutexes) creation, editing, deletion
 var tablesMutexes map[string]*sync.RWMutex
+var STOP_WORDS []string
 
 func init() {
 	dataPath, err := GetDataPath()
@@ -58,6 +59,19 @@ func init() {
       panic(err)
     }
   }
+
+  // load stop words once
+  stopWordsJsonPath := flaarum_shared.G("english-stopwords.json")
+  jsonBytes, err := ioutil.ReadFile(stopWordsJsonPath)
+  if err != nil {
+    panic(err)
+  }
+  stopWordsList := make([]string, 0)
+  err = json.Unmarshal(jsonBytes, &stopWordsList)
+  if err != nil {
+    panic(err)
+  }
+  STOP_WORDS = stopWordsList
 }
 
 

diff --git a/store/searches.go b/store/searches.go
@@ -959,7 +959,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
 
@@ -1003,7 +1003,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
             dirFIs, err := ioutil.ReadDir(filepath.Join(otherTablePath, "tindexes", otherFieldName, word))
@@ -1040,7 +1040,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
             dirFIs, err := ioutil.ReadDir(filepath.Join(otherTablePath, "tindexes", otherFieldName, word))
@@ -1090,7 +1090,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
 
@@ -1134,7 +1134,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
             dirFIs, err := ioutil.ReadDir(filepath.Join(tablePath, "tindexes", whereStruct.FieldName, word))
@@ -1171,7 +1171,7 @@ func innerSearch(projName, stmt string) (*[]map[string]string, error) {
             if word == "" {
               continue
             }
-            if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+            if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
               continue
             }
             dirFIs, err := ioutil.ReadDir(filepath.Join(tablePath, "tindexes", whereStruct.FieldName, word))

diff --git a/tindexer/main.go b/tindexer/main.go
@@ -14,13 +14,16 @@ import (
 	"os"
 	"sync"
 	"github.com/microcosm-cc/bluemonday"
+	"encoding/json"
 )
 
 var (
 	mutexesMap map[string]*sync.Mutex
 	debugMode bool
+	STOP_WORDS []string
 )
 
+
 func init() {
 	mutexesMap = make(map[string]*sync.Mutex)
 
@@ -31,6 +34,20 @@ func init() {
 	if debug == "true" || debug == "t" {
 		debugMode = true
 	}
+
+  // load stop words once
+  stopWordsJsonPath := flaarum_shared.G("english-stopwords.json")
+  jsonBytes, err := ioutil.ReadFile(stopWordsJsonPath)
+  if err != nil {
+    panic(err)
+  }
+  stopWordsList := make([]string, 0)
+  err = json.Unmarshal(jsonBytes, &stopWordsList)
+  if err != nil {
+    panic(err)
+  }
+  STOP_WORDS = stopWordsList
+
 }
 
 
@@ -144,7 +161,7 @@ func doIndex(textPath string) {
 		if word == "" {
 			continue
 		}
-		if flaarum_shared.FindIn(flaarum_shared.STOP_WORDS, word) != -1 {
+		if flaarum_shared.FindIn(STOP_WORDS, word) != -1 {
 			continue
 		}