Merge branch 'feat-10-offset-limiy-get-recently-learnt-words' into master

Author: subins2000

c-shared.go

@@ -419,13 +419,13 @@ func varnam_search_symbol_table(varnamHandleID C.int, id C.int, searchCriteria C
 }
 
 //export varnam_get_recently_learned_words
-func varnam_get_recently_learned_words(varnamHandleID C.int, id C.int, limit C.int, resultPointer **C.varray) C.int {
+func varnam_get_recently_learned_words(varnamHandleID C.int, id C.int, offset C.int, limit C.int, resultPointer **C.varray) C.int {
 	ctx, cancel := makeContext(id)
 	defer cancel()
 
 	handle := getVarnamHandle(varnamHandleID)
 
-	result, err := handle.varnam.GetRecentlyLearntWords(ctx, int(limit))
+	result, err := handle.varnam.GetRecentlyLearntWords(ctx, int(offset), int(limit))
 
 	if err != nil {
 		handle.err = err

govarnam/dictionary.go

@@ -369,14 +369,14 @@ func (varnam *Varnam) getFromPatternDictionary(ctx context.Context, pattern stri
 }
 
 // GetRecentlyLearntWords get recently learnt words
-func (varnam *Varnam) GetRecentlyLearntWords(ctx context.Context, limit int) ([]Suggestion, error) {
+func (varnam *Varnam) GetRecentlyLearntWords(ctx context.Context, offset int, limit int) ([]Suggestion, error) {
 	var result []Suggestion
 
 	select {
 	case <-ctx.Done():
 		return result, nil
 	default:
-		rows, err := varnam.dictConn.QueryContext(ctx, "SELECT word, weight, learned_on FROM words ORDER BY learned_on DESC, id DESC LIMIT "+fmt.Sprint(limit))
+		rows, err := varnam.dictConn.QueryContext(ctx, "SELECT word, weight, learned_on FROM words ORDER BY learned_on DESC, id DESC LIMIT "+fmt.Sprint(offset)+", "+fmt.Sprint(limit))
 
 		if err != nil {
 			return result, err

govarnam/govarnam_ml_test.go

@@ -406,12 +406,15 @@ func TestRecentlyLearnedWords(t *testing.T) {
 		varnam.Learn(word, 0)
 	}
 
-	result, err := varnam.GetRecentlyLearntWords(context.Background(), len(words))
+	result, err := varnam.GetRecentlyLearntWords(context.Background(), 0, len(words))
 	checkError(err)
 
 	assertEqual(t, len(result), len(words))
 	log.Println(result, words)
 	for i, sug := range result {
 		assertEqual(t, sug.Word, words[len(words)-i-1])
 	}
+
+	result, err = varnam.GetRecentlyLearntWords(context.Background(), 4, len(words))
+	assertEqual(t, result[0].Word, "ആലപ്പുഴ")
 }

govarnamgo/govarnamgo.go

@@ -21,12 +21,12 @@ import (
 
 // Config  config values
 type Config struct {
-	IndicDigits                bool
-	DictionaryMatchExact       bool
-	DictionarySuggestionsLimit int
+	IndicDigits                       bool
+	DictionaryMatchExact              bool
+	DictionarySuggestionsLimit        int
 	PatternDictionarySuggestionsLimit int
-	TokenizerSuggestionsLimit  int
-	TokenizerSuggestionsAlways bool
+	TokenizerSuggestionsLimit         int
+	TokenizerSuggestionsAlways        bool
 }
 
 // VarnamHandle for making things easier
@@ -481,7 +481,7 @@ func (handle *VarnamHandle) Import(filePath string) error {
 }
 
 // GetRecentlyLearntWords get recently learn words
-func (handle *VarnamHandle) GetRecentlyLearntWords(ctx context.Context, limit int) ([]Suggestion, error) {
+func (handle *VarnamHandle) GetRecentlyLearntWords(ctx context.Context, offset int, limit int) ([]Suggestion, error) {
 	var result []Suggestion
 
 	operationID := makeContextOperation()
@@ -493,7 +493,7 @@ func (handle *VarnamHandle) GetRecentlyLearntWords(ctx context.Context, limit in
 	default:
 		var resultPointer *C.varray
 
-		code := C.varnam_get_recently_learned_words(handle.connectionID, operationID, C.int(limit), &resultPointer)
+		code := C.varnam_get_recently_learned_words(handle.connectionID, operationID, C.int(offset), C.int(limit), &resultPointer)
 		if code != C.VARNAM_SUCCESS {
 			return result, &VarnamError{
 				ErrorCode: int(code),

govarnamgo/govarnamgo_ml_test.go

@@ -79,7 +79,7 @@ func TestRecentlyLearnedWords(t *testing.T) {
 		varnam.Learn(word, 0)
 	}
 
-	result, err := varnam.GetRecentlyLearntWords(context.Background(), len(words))
+	result, err := varnam.GetRecentlyLearntWords(context.Background(), 0, len(words))
 	checkError(err)
 
 	assertEqual(t, len(result), len(words))