summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comment.go9
-rw-r--r--comment_test.go1
2 files changed, 9 insertions, 1 deletions
diff --git a/comment.go b/comment.go
index 3c48d61..705b957 100644
--- a/comment.go
+++ b/comment.go
@@ -39,7 +39,14 @@ func parseFormatCommentsSet(formatSet string) (*formatComment, error) {
func (f *File) GetComments() (comments map[string][]Comment) {
comments = map[string][]Comment{}
for n, path := range f.sheetMap {
- if d := f.commentsReader("xl" + strings.TrimPrefix(f.getSheetComments(filepath.Base(path)), "..")); d != nil {
+ target := f.getSheetComments(filepath.Base(path))
+ if target == "" {
+ continue
+ }
+ if !filepath.IsAbs(target) {
+ target = "xl" + strings.TrimPrefix(target, "..")
+ }
+ if d := f.commentsReader(strings.TrimPrefix(target, "/")); d != nil {
sheetComments := []Comment{}
for _, comment := range d.CommentList.Comment {
sheetComment := Comment{}
diff --git a/comment_test.go b/comment_test.go
index ee8b826..19b705f 100644
--- a/comment_test.go
+++ b/comment_test.go
@@ -40,6 +40,7 @@ func TestAddComments(t *testing.T) {
comments := f.GetComments()
assert.EqualValues(t, 2, len(comments["Sheet1"]))
assert.EqualValues(t, 1, len(comments["Sheet2"]))
+ assert.EqualValues(t, len(NewFile().GetComments()), 0)
}
func TestDecodeVMLDrawingReader(t *testing.T) {