fix local bug

liao961120 · May 3, 2020 · 2d46921 · 2d46921
1 parent 2a7bf9e
commit 2d46921
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/2020_Budai_Rukai.log b/2020_Budai_Rukai.log
@@ -0,0 +1,5 @@
+`Lavakaw/20200325.docx` #4 :  invalid GLOSS formatting
+`Lavakaw/20200325.docx` #11:  invalid GLOSS formatting
+`Lavakaw/20200415.docx` #3 :  invalid GLOSS formatting
+`Lavakaw/20200318.docx` #__:  invalid DOCX  formatting
+`Balenge/20200422.docx` #9 :  invalid GLOSS formatting
diff --git a/GlossProcessor.py b/GlossProcessor.py
@@ -137,6 +137,7 @@ def search_free(self, tokens: str, regex=False):
                     matched_glosses.append({
                         'file': doc_id,
                         'num': gloss[0],
+                        'ori': gloss[1]['ori'],
                         'gloss': gloss[1]['gloss'],
                         'free': gloss[1]['free'],
                     })

diff --git a/server.py b/server.py
@@ -52,7 +52,7 @@ def on_get(self, req, resp):
         if params['type'] == 'gloss':
             results = C.search_gloss(tokens=params['query'], regex=params['regex'])
         else:
-            results = C.search_free(tokens=params['query'])
+            results = C.search_free(tokens=params['query'], regex=params['regex'])
 
         ############ DEBUGGING ##############
         logging.debug("Sending response...")