Skip to content

Commit 23bd5f6

Browse files
committed
support range meta option
1 parent 369d247 commit 23bd5f6

File tree

4 files changed

+32
-17
lines changed

4 files changed

+32
-17
lines changed

db/tables.sql

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ create table if not exists `hlc_range`(
3636
`end` varchar(255),
3737
`endOffset` integer,
3838
`text` varchar(1024),
39+
`option` varchar(1024) default '',
3940
`page` integer not null,
4041
`author` integer not null,
4142
`ctime` timestamp default current_timestamp,

hlcmsg/range_meta.pb.go

+21-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hlcproto

storage/storage_impl.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ func (s *SqliteStorage) QueryPagenote(uid uint32, pid uint32) (PagenoteDict, err
120120
return PagenoteDict{}, errors.New("uid and url cannot both be 0")
121121
}
122122
var queryBuilder bytes.Buffer
123-
queryBuilder.WriteString(`select id, anchor, start, startOffset, end, endOffset, page, author from hlc_range where 1=1 `)
123+
queryBuilder.WriteString(
124+
`select id, anchor, start, startOffset, end, endOffset, page, author, option from hlc_range where 1=1 `)
124125
var parameters = []interface{}{}
125126
if uid > 0 {
126127
queryBuilder.WriteString(" and author = ?")
@@ -134,8 +135,8 @@ func (s *SqliteStorage) QueryPagenote(uid uint32, pid uint32) (PagenoteDict, err
134135
result := PagenoteDict{}
135136
err := util.QueryDb(s.DB, query, parameters, func(rowno int, rows *sql.Rows) error {
136137
var id, startOffset, endOffset, page, author uint32
137-
var anchor, start, end string
138-
err := rows.Scan(&id, &anchor, &start, &startOffset, &end, &endOffset, &page, &author)
138+
var anchor, start, end, option string
139+
err := rows.Scan(&id, &anchor, &start, &startOffset, &end, &endOffset, &page, &author, &option)
139140
if err != nil {
140141
return err
141142
}
@@ -151,6 +152,7 @@ func (s *SqliteStorage) QueryPagenote(uid uint32, pid uint32) (PagenoteDict, err
151152
End: end,
152153
EndOffset: endOffset,
153154
Text: "",
155+
Option: option,
154156
}
155157
note.Highlights = append(note.Highlights, meta)
156158
return nil
@@ -159,7 +161,10 @@ func (s *SqliteStorage) QueryPagenote(uid uint32, pid uint32) (PagenoteDict, err
159161
}
160162

161163
func (s *SqliteStorage) NewRangeMeta(uid uint32, pid uint32, m *hlcmsg.RangeMeta) (uint32, error) {
162-
r, err := s.DB.Exec(`insert into hlc_range(anchor, start, startOffset, end, endOffset, text, page, author) values(?, ?, ?, ?, ?, ?, ?, ?)`, m.Anchor, m.Start, m.StartOffset, m.End, m.EndOffset, m.Text, pid, uid)
164+
r, err := s.DB.Exec(
165+
`insert into hlc_range(anchor, start, startOffset, end, endOffset, text, page, author, option)
166+
values (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
167+
m.Anchor, m.Start, m.StartOffset, m.End, m.EndOffset, m.Text, pid, uid, m.Option)
163168
if err != nil {
164169
return 0, err
165170
}

0 commit comments

Comments
 (0)