Merge pull request #93 from devlights/add-range-find

Add Range.Find(), Range.FindNext(), Range.FindPrevious()

Author: devlights

constants/xlFindLookIn.go

@@ -12,7 +12,8 @@ type (
 //
 // noinspection GoUnusedConst
 const (
-	XlComments XlFindLookIn = -4144 //コメント
-	XlFormulas XlFindLookIn = -4123 //数式
-	XlValues   XlFindLookIn = -4163 //値
+	XlFindLookInComments         XlFindLookIn = -4144 //コメント
+	XlFindLookInFormulas         XlFindLookIn = -4123 //数式
+	XlFindLookInValues           XlFindLookIn = -4163 //値
+	XlFindLookInCommentsThreaded XlFindLookIn = -4184 //スレッド化されたコメント
 )

constants/xlLookAt.go

@@ -12,6 +12,6 @@ type (
 //
 // noinspection GoUnusedConst
 const (
-	XlPart  XlLookAt = 2 //検索テキストの一部を検索します。
-	XlWhole XlLookAt = 1 //検索テキスト全体を検索します。
+	XlLookAtPart  XlLookAt = 2 //検索テキストの一部を検索します。
+	XlLookAtWhole XlLookAt = 1 //検索テキスト全体を検索します。
 )

constants/xlSearchDirection.go

@@ -12,6 +12,6 @@ type (
 //
 // noinspection GoUnusedConst
 const (
-	XlNext     XlSearchDirection = 1 //範囲内で、一致する次の値を検索します。
-	XlPrevious XlSearchDirection = 2 //範囲内で、一致する前の値を検索します。
+	XlSearchDirectionNext     XlSearchDirection = 1 //範囲内で、一致する次の値を検索します。
+	XlSearchDirectionPrevious XlSearchDirection = 2 //範囲内で、一致する前の値を検索します。
 )

constants/xlSearchOrder.go

@@ -12,6 +12,6 @@ type (
 //
 // noinspection GoUnusedConst
 const (
-	XlByColumns XlSearchOrder = 2 //列を下方向に検索してから、次の列に移動します。
-	XlByRows    XlSearchOrder = 1 //行を横方向に検索してから、次の行に移動します。
+	XlSearchOrderByColumns XlSearchOrder = 2 //列を下方向に検索してから、次の列に移動します。
+	XlSearchOrderByRows    XlSearchOrder = 1 //行を横方向に検索してから、次の行に移動します。
 )

range.go

@@ -308,3 +308,56 @@ func (r *XlRange) Walk(walkFn func(r *XlRange, c *Cell, row, col int) error) (*C
 
 	return nil, nil
 }
+
+func (r *XlRange) Find(what string, after *Cell) (*XlRange, bool, error) {
+	var (
+		lookIn          = constants.XlFindLookInValues
+		lookAt          = constants.XlLookAtPart
+		searchOrder     = constants.XlSearchOrderByRows
+		searchDirection = constants.XlSearchDirectionNext
+		matchCase       = false
+		matchByte       = true
+	)
+	result, err := oleutil.CallMethod(r.ComObject(), "Find", what, after.ComObject(), int32(lookIn), int32(lookAt), int32(searchOrder), int32(searchDirection), matchCase, matchByte)
+	if err != nil {
+		return nil, false, err
+	}
+
+	dispatch := result.ToIDispatch()
+	if dispatch == nil {
+		return nil, false, nil
+	}
+
+	newR := NewRangeFromRange(r, dispatch)
+	return newR, true, nil
+}
+
+func (r *XlRange) FindNext(after *Cell) (*XlRange, bool, error) {
+	result, err := oleutil.CallMethod(r.ComObject(), "FindNext", after.ComObject())
+	if err != nil {
+		return nil, false, err
+	}
+
+	dispatch := result.ToIDispatch()
+	if dispatch == nil {
+		return nil, false, nil
+	}
+
+	newR := NewRangeFromRange(r, dispatch)
+	return newR, true, nil
+}
+
+func (r *XlRange) FindPrevious(before *Cell) (*XlRange, bool, error) {
+	result, err := oleutil.CallMethod(r.ComObject(), "FindPrevious", before.ComObject())
+	if err != nil {
+		return nil, false, err
+	}
+
+	dispatch := result.ToIDispatch()
+	if dispatch == nil {
+		return nil, false, nil
+	}
+
+	newR := NewRangeFromRange(r, dispatch)
+	return newR, true, nil
+}

range_test.go

@@ -7,6 +7,90 @@ import (
 	"testing"
 )
 
+func TestXlRange_Find(t *testing.T) {
+	quit := MustInitGoxcel()
+	defer quit()
+
+	excel, release := MustNewGoxcel()
+	defer release()
+
+	wbs := excel.MustWorkbooks()
+	wb, wbr := wbs.MustAdd()
+	defer wbr()
+
+	ws := wb.MustSheets(1)
+
+	rows := []int{1, 2, 3, 4, 5}
+	for _, row := range rows {
+		cols := []int{1, 2, 3, 4, 5}
+		for _, col := range cols {
+			c, _ := ws.Cells(row, col)
+			c.MustSetValue(fmt.Sprintf("%v,%v", row, col))
+		}
+	}
+
+	//
+	// Range.Find
+	//
+	rng, _ := ws.UsedRange()
+	after, _ := rng.Cells(1, 1)
+	foundRange, found, err := rng.Find("1,", after)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !found {
+		t.Fatalf("expected range to be found, got nothing")
+	}
+
+	value, err := foundRange.Value()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(value)
+
+	//
+	// Range.FindNext
+	//
+	after, _ = foundRange.Cells(1, 1)
+	foundRange, found, err = rng.FindNext(after)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !found {
+		t.Fatalf("expected range to be found, got nothing 2")
+	}
+
+	value, err = foundRange.Value()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(value)
+
+	//
+	// Range.FindPrevious
+	//
+	before, _ := foundRange.Cells(1, 1)
+	foundRange, found, err = rng.FindPrevious(before)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !found {
+		t.Fatalf("expected range to be found, got nothing 3")
+	}
+
+	value, err = foundRange.Value()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(value)
+}
+
 func TestXlRange_CopyPicture(t *testing.T) {
 	quit := MustInitGoxcel()
 	defer quit()