forked from jason/cpolis
Instead of having entire articles in the RSS feed, items now contain just a link
This commit is contained in:
@ -13,6 +13,7 @@ type Article struct {
|
||||
Created time.Time
|
||||
Description string
|
||||
Content string
|
||||
Link string
|
||||
Published bool
|
||||
Rejected bool
|
||||
ID int64
|
||||
@ -26,8 +27,8 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
|
||||
selectQuery := "SELECT id FROM issues WHERE published = false"
|
||||
insertQuery := `
|
||||
INSERT INTO articles
|
||||
(title, description, content, published, rejected, author_id, issue_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
(title, description, content, link, published, rejected, author_id, issue_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||
`
|
||||
|
||||
for i := 0; i < TxMaxRetries; i++ {
|
||||
@ -45,7 +46,7 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
|
||||
}
|
||||
|
||||
result, err := tx.Exec(insertQuery, a.Title, a.Description,
|
||||
a.Content, a.Published, a.Rejected, a.AuthorID, id)
|
||||
a.Content, a.Link, a.Published, a.Rejected, a.AuthorID, id)
|
||||
if err != nil {
|
||||
if rollbackErr := tx.Rollback(); rollbackErr != nil {
|
||||
log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
|
||||
@ -79,7 +80,7 @@ func (db *DB) AddArticle(a *Article) (int64, error) {
|
||||
|
||||
func (db *DB) GetArticle(id int64) (*Article, error) {
|
||||
query := `
|
||||
SELECT title, created, description, content, published, author_id
|
||||
SELECT title, created, description, content, link, published, author_id
|
||||
FROM articles
|
||||
WHERE id = ?
|
||||
`
|
||||
@ -90,7 +91,7 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
|
||||
var err error
|
||||
|
||||
if err := row.Scan(&article.Title, &created, &article.Description,
|
||||
&article.Content, &article.Published, &article.AuthorID); err != nil {
|
||||
&article.Content, &article.Link, &article.Published, &article.AuthorID); err != nil {
|
||||
return nil, fmt.Errorf("error scanning article row: %v", err)
|
||||
}
|
||||
|
||||
@ -105,7 +106,7 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
|
||||
|
||||
func (db *DB) GetCertainArticles(published, rejected bool) ([]*Article, error) {
|
||||
query := `
|
||||
SELECT id, title, created, description, content, author_id, issue_id
|
||||
SELECT id, title, created, description, content, link, author_id, issue_id
|
||||
FROM articles
|
||||
WHERE published = ?
|
||||
AND rejected = ?
|
||||
@ -121,8 +122,8 @@ func (db *DB) GetCertainArticles(published, rejected bool) ([]*Article, error) {
|
||||
var created []byte
|
||||
|
||||
if err = rows.Scan(&article.ID, &article.Title, &created,
|
||||
&article.Description, &article.Content, &article.AuthorID,
|
||||
&article.IssueID); err != nil {
|
||||
&article.Description, &article.Content, &article.Link,
|
||||
&article.AuthorID, &article.IssueID); err != nil {
|
||||
return nil, fmt.Errorf("error scanning article row: %v", err)
|
||||
}
|
||||
|
||||
@ -143,7 +144,7 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
|
||||
txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
|
||||
issueQuery := "SELECT id FROM issues WHERE published = false"
|
||||
articlesQuery := `
|
||||
SELECT id, title, created, description, content, author_id
|
||||
SELECT id, title, created, description, content, link, author_id
|
||||
FROM articles
|
||||
WHERE issue_id = ? AND published = true
|
||||
`
|
||||
@ -177,7 +178,7 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
|
||||
var created []byte
|
||||
|
||||
if err = rows.Scan(&article.ID, &article.Title, &created,
|
||||
&article.Description, &article.Content, &article.AuthorID); err != nil {
|
||||
&article.Description, &article.Content, &article.Link, &article.AuthorID); err != nil {
|
||||
if rollbackErr := tx.Rollback(); rollbackErr != nil {
|
||||
log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
|
||||
}
|
||||
|
Reference in New Issue
Block a user