Merge branch 'master' of git.iamfabulous.de:alkobote.de

1 files changed, 4 insertions, 5 deletions

diff --git a/crawler/database.go b/crawler/database.go
index 41ef4f0..cf8989a 100644
--- a/crawler/database.go
+++ b/crawler/database.go
@@ -4,8 +4,6 @@ import (
 	"database/sql"
 	"fmt"
 	"strings"
-
-	log "github.com/Sirupsen/logrus"
 )
 
 func (app *App) createTables() error {
@@ -99,10 +97,11 @@ func (app *App) save_offer(W []Angebot) error {
 			continue
 		}
 
-		err := app.DB.QueryRow("SELECT 1 FROM all_view WHERE shop_id = ? AND name = ? AND long_url = ? AND original_price = ? AND discounted_price = ? AND spirit_type = ?", o.Shop, o.Name, o.Url, o.Original_price, o.Discounted_price, o.Spirit_type).Scan(&found)
+		// resembles UNIQUE constraint
+		detect_duplicate_query := `SELECT 1 FROM all_view WHERE name = ? AND shop_id = ? AND 
+		volume = ? AND abv = ? AND original_price = ? AND discounted_price = ? AND valid_until = ?`
 
-		/*
-		 */
+		err := app.DB.QueryRow(detect_duplicate_query, o.Name, o.Shop, o.Volume, o.Abv, o.Original_price, o.Discounted_price, o.Valid_until).Scan(&found)
 
 		if err == sql.ErrNoRows {