Make searches more inclusive.

[quanweb.git] / main / db.go

diff --git a/main/db.go b/main/db.go
index 0f7bf2b9379386611ed6cc6feec81175025eff45..53c0a2c37b0959cf9ca522067e1bc463ea6a1671 100644 (file)
--- a/main/db.go
+++ b/main/db.go
@@ -4,6 +4,7 @@ import (
   "database/sql"
   "fmt"
   _ "github.com/lib/pq"
+  "strings"
   "strconv"
   "sync"
 )
@@ -15,6 +16,7 @@ type Book struct {
   AuthorGrouping string  // unique rendering of the author's name, used for internal grouping 
   AuthorReading  string         // reading order of author's name, e.g. "Charles Dickens"
   AuthorSort     string  // sort order of author's name, e.g. "Dickens, Charles"
+  CoverId        int     // index into EFS table for cover, if there is one
   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)
@@ -63,6 +65,13 @@ func getDb() (*sql.DB) {
   return g_db
 }
 
+func niVal(ni sql.NullInt64) int {
+  if ni.Valid {
+    return int(ni.Int64)
+  }
+  return 0
+}
+
 func nsVal(ns sql.NullString) string {
   if ns.Valid {
     return ns.String
@@ -88,7 +97,7 @@ func openDb(user, pass, dbName string) (*sql.DB) {
 }
 
 func queryBooksByIds(ids []int) []Book {
-  query := `SELECT s.age,a.grouping,a.reading,a.sort,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,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
@@ -120,8 +129,9 @@ func queryBooksByIds(ids []int) []Book {
     row := ps.QueryRow(id)
 
     var age, grouping, reading, sort, ddc, description, genre, lcc, name, title, volume sql.NullString
+    var cover sql.NullInt64
 
-    err = row.Scan(&age, &grouping, &reading, &sort, &ddc, &description, &genre, &lcc, &name, &title, &volume)
+    err = row.Scan(&age, &grouping, &reading, &sort, &cover, &ddc, &description, &genre, &lcc, &name, &title, &volume)
     if err != nil {
       report("Error:  Failed to read book:" + strconv.Itoa(id) + ":", err)
     } else {
@@ -131,6 +141,7 @@ func queryBooksByIds(ids []int) []Book {
       b.AuthorGrouping = nsVal(grouping)
       b.AuthorReading = nsVal(reading)
       b.AuthorSort = nsVal(sort)
+      b.CoverId = niVal(cover)
       b.DDC = nsVal(ddc)
       b.Description = nsVal(description)
       b.Genre = nsVal(genre)
@@ -151,10 +162,31 @@ func queryBooksByIds(ids []int) []Book {
   return res
 }
 
+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))
 
@@ -164,20 +196,26 @@ func queryIds(criteria []SearchTerm) []int {
     } 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 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 b.path"
+
   res := []int{}
 
   ps, err := getDb().Prepare(query)
@@ -195,7 +233,7 @@ func queryIds(criteria []SearchTerm) []int {
   }
   defer rows.Close()
 
-  for rows.Next(); rows.Next(); {
+  for rows.Next() {
     var id int
     rows.Scan(&id)
     res = append(res, id)
@@ -204,6 +242,27 @@ func queryIds(criteria []SearchTerm) []int {
   return res
 }
 
+func queryMimeTypeByEfsId(efsId int) string {
+  const query = "SELECT mimeType FROM Efs WHERE id=$1"
+
+  ps, err := getDb().Prepare(query)
+  if nil != err {
+    report("Failed to Prepare query:  " + query, err)
+    return ""
+  }
+  defer ps.Close()
+
+  row := ps.QueryRow(efsId)
+  var mimeType sql.NullString
+  err = row.Scan(&mimeType)
+  if nil != err {
+    report(fmt.Sprintf("Failed to retrieve mimeType for id %v: ", efsId), err)
+    return ""
+  }
+  
+  return nsVal(mimeType)
+}
+
 func report(msg string, err error) {
   fmt.Println("Error:  " + msg, err)
 }