"database/sql"
"fmt"
_ "github.com/lib/pq"
+ "strings"
"strconv"
"sync"
)
DDC string // Dewey Decimal Classification
Description string // Back cover / inside flap blurb, describing the book
Genre string // e.g. "adventure", "historical", "mystery", "romance", "sf" (Science Fiction)
+ Language string
LCC string // Library of Congress Classification
SeriesName string
Title string
// ---------------------------------------------------------------------------
type Field string
const (
- Author, Series, Title Field = "aut", "ser", "tit"
+ Author, Language, Series, Title Field = "aut", "lan", "ser", "tit"
)
func (f Field) String() string {
g_mutex.Lock()
defer g_mutex.Unlock()
if nil == g_db {
- config := getConfig()
+ config := GetConfig()
g_db = openDb(config.user, config.pass, config.dbName)
}
}
}
func queryBooksByIds(ids []int) []Book {
- query := `SELECT s.age,a.grouping,a.reading,a.sort,b.cover,c.ddc,b.description,s.genre,c.lcc,s.descr,b.title,b.volume
+ query := `SELECT s.age,a.grouping,a.reading,a.sort,b.cover,c.ddc,b.description,s.genre,b.language,c.lcc,s.descr,b.title,b.volume
FROM Authors a
INNER JOIN Books b ON a.id=b.author
LEFT OUTER JOIN Classifications c ON c.id=b.classification
row := ps.QueryRow(id)
- var age, grouping, reading, sort, ddc, description, genre, lcc, name, title, volume sql.NullString
+ var age, grouping, reading, sort, ddc, description, genre, language, lcc, name, title, volume sql.NullString
var cover sql.NullInt64
- err = row.Scan(&age, &grouping, &reading, &sort, &cover, &ddc, &description, &genre, &lcc, &name, &title, &volume)
+ err = row.Scan(&age, &grouping, &reading, &sort, &cover, &ddc, &description, &genre, &language, &lcc, &name, &title, &volume)
if err != nil {
report("Error: Failed to read book:" + strconv.Itoa(id) + ":", err)
} else {
b.DDC = nsVal(ddc)
b.Description = nsVal(description)
b.Genre = nsVal(genre)
+ b.Language = nsVal(language)
b.LCC = nsVal(lcc)
b.SeriesName = nsVal(name)
b.Title = nsVal(title)
return res
}
-func queryIds(criteria []SearchTerm) []int {
- fmt.Println("queryIds():", criteria)
+func queryBookPathById(id int) (string) {
+ query := "SELECT b.path FROM Books b WHERE b.id=$1"
+
+ ps, err := getDb().Prepare(query)
+ if nil != err {
+ report("Failed to Prepare query: " + query, err)
+ return ""
+ }
+ defer ps.Close()
+
+ row := ps.QueryRow(id)
+ var path sql.NullString
+ err = row.Scan(&path)
+ if nil != err {
+ report(fmt.Sprintf("Failed to retrieve path for book id %v: ", id), err)
+ return ""
+ }
+
+ return nsVal(path)
+}
+func queryIds(criteria []SearchTerm) []int {
query := "SELECT b.id FROM Books b" +
" INNER JOIN Authors a ON a.id=b.author" +
- " LEFT OUTER JOIN Series s ON s.id=b.series"
+ " LEFT OUTER JOIN Series s ON s.id=b.series"
args := make([]interface{}, len(criteria))
} else {
query += " AND "
}
+
+ text := criterion.Text
+
switch criterion.Attribute {
case Author:
- query += " a.grouping LIKE $" + strconv.Itoa(i + 1)
+ query += " UPPER(a.grouping) LIKE UPPER($" + strconv.Itoa(i + 1) + ")"
+ text = strings.Replace(text, " ", "", -1) // Remove spaces
+ case Language:
+ query += " UPPER(b.language) LIKE UPPER($" + strconv.Itoa(i + 1) + ")"
case Series:
- query += " s.descr LIKE $" + strconv.Itoa(i + 1)
+ query += " UPPER(s.descr) LIKE UPPER($" + strconv.Itoa(i + 1) + ")"
case Title:
- query += " b.title LIKE $" + strconv.Itoa(i + 1)
+ query += " UPPER(b.title) LIKE UPPER($" + strconv.Itoa(i + 1) + ")"
default:
report("Error: unrecognized search field in queryIds(): " + criterion.Attribute.String(), nil)
return nil
}
- args[i] = criterion.Text
+ args[i] = text
}
+ query += " ORDER BY a.grouping,s.descr,b.volume,b.title,b.path"
+
res := []int{}
ps, err := getDb().Prepare(query)
}
defer rows.Close()
- for rows.Next(); rows.Next(); {
+ for rows.Next() {
var id int
rows.Scan(&id)
res = append(res, id)