go routines for Db query

TCPClient.go

@@ -150,10 +150,10 @@ func (c *TCPClient) ReadLine() {
 			c.Log.Info("Start receiving spots")
 		}
 
-		// start := time.Now()
+		start := time.Now()
-		go ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
+		ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
-		// elapsed := time.Since(start)
+		elapsed := time.Since(start)
-		// Log.Infof("Total time for processing spot: %s", elapsed)
+		Log.Infof("Total time for processing spot: %s", elapsed)
 
 		// Send the spot message to TCP server
 		if len(c.TCPServer.Clients) > 0 {

database.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"sync"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -94,114 +95,112 @@ func NewFlexDXDatabase(filePath string) *FlexDXClusterRepository {
 	}
 }
 
-func (r *Log4OMContactsRepository) ListByCountry(countryID string) ([]*Contact, error) {
+func (r *Log4OMContactsRepository) ListByCountry(countryID string, contactsChan chan []Contact, wg *sync.WaitGroup) {
+	defer wg.Done()
 	rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ?", countryID)
 	if err != nil {
 		log.Error("could not query database", err)
-		return nil, err
 	}
 
 	defer rows.Close()
 
-	contacts := []*Contact{}
+	contacts := []Contact{}
 	for rows.Next() {
 		c := Contact{}
 		if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
 			log.Error("could not query database", err)
-			return nil, err
 		}
-		contacts = append(contacts, &c)
+		contacts = append(contacts, c)
 	}
-	return contacts, nil
+	contactsChan <- contacts
 }
 
-func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string) ([]*Contact, error) {
+func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string, contactsModeChan chan []Contact, wg *sync.WaitGroup) {
+	defer wg.Done()
 
 	if mode == "USB" || mode == "LSB" {
 
 		rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND (mode = ? OR mode = ?)", countryID, "USB", "LSB")
 		if err != nil {
 			log.Error("could not query database", err)
-			return nil, err
 		}
 
 		defer rows.Close()
 
-		contacts := []*Contact{}
+		contacts := []Contact{}
 		for rows.Next() {
 			c := Contact{}
 			if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
 				log.Error("could not query database", err)
-				return nil, err
+
 			}
-			contacts = append(contacts, &c)
+			contacts = append(contacts, c)
 		}
-		return contacts, nil
+		contactsModeChan <- contacts
 
 	} else {
 
 		rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND mode = ?", countryID, mode)
 		if err != nil {
 			log.Error("could not query the database", err)
-			return nil, err
 		}
 
 		defer rows.Close()
 
-		contacts := []*Contact{}
+		contacts := []Contact{}
 		for rows.Next() {
 			c := Contact{}
 			if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
 				fmt.Println(err)
-				return nil, err
+
 			}
-			contacts = append(contacts, &c)
+			contacts = append(contacts, c)
 		}
-		return contacts, nil
+		contactsModeChan <- contacts
 
 	}
 }
 
-func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string) ([]*Contact, error) {
+func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string, contactsBandChan chan []Contact, wg *sync.WaitGroup) {
+	defer wg.Done()
 	rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND band = ?", countryID, band)
 	if err != nil {
 		fmt.Println(err)
-		return nil, err
 	}
 
 	defer rows.Close()
 
-	contacts := []*Contact{}
+	contacts := []Contact{}
 	for rows.Next() {
 		c := Contact{}
 		if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
 			fmt.Println(err)
-			return nil, err
+
 		}
-		contacts = append(contacts, &c)
+		contacts = append(contacts, c)
 	}
-	return contacts, nil
+	contactsBandChan <- contacts
 }
 
-func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string) ([]*Contact, error) {
+func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string, contactsCallChan chan []Contact, wg *sync.WaitGroup) {
+	defer wg.Done()
 	rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE callsign = ? AND band = ? AND mode = ?", callSign, band, mode)
 	if err != nil {
 		fmt.Println(err)
-		return nil, err
 	}
 
 	defer rows.Close()
 
-	contacts := []*Contact{}
+	contacts := []Contact{}
 	for rows.Next() {
 		c := Contact{}
 		if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil {
 			fmt.Println(err)
-			return nil, err
+
 		}
-		contacts = append(contacts, &c)
+		contacts = append(contacts, c)
 	}
-	return contacts, nil
+	contactsCallChan <- contacts
 }
 
 func (r *FlexDXClusterRepository) GetAllSpots(limit string) []FlexSpot {

spot.go

@@ -4,6 +4,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 
 	_ "github.com/mattn/go-sqlite3"
 )
@@ -49,20 +50,30 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te
 		contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath)
 		defer contactRepo.db.Close()
 
-		contacts, _ := contactRepo.ListByCountry(spot.DXCC)
+		contactsChan := make(chan []Contact)
-		contactsMode, _ := contactRepo.ListByCountryMode(spot.DXCC, spot.Mode)
+		contactsModeChan := make(chan []Contact)
-		contactsBand, _ := contactRepo.ListByCountryBand(spot.DXCC, spot.Band)
+		contactsBandChan := make(chan []Contact)
-		contactsCall, _ := contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode)
+		contactsCallChan := make(chan []Contact)
+
+		wg := new(sync.WaitGroup)
+		wg.Add(4)
+
+		go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg)
+		contacts := <-contactsChan
+
+		go contactRepo.ListByCountryMode(spot.DXCC, spot.Mode, contactsModeChan, wg)
+		contactsMode := <-contactsModeChan
+
+		go contactRepo.ListByCountryBand(spot.DXCC, spot.Band, contactsBandChan, wg)
+		contactsBand := <-contactsBandChan
+
+		go contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode, contactsCallChan, wg)
+		contactsCall := <-contactsCallChan
+
+		wg.Wait()
 
 		if len(contacts) == 0 {
-			switch spot.DXCC {
+			spot.NewDXCC = true
-			case "997":
-				spot.NewDXCC = false
-			case "1000":
-				spot.NewDXCC = false
-			default:
-				spot.NewDXCC = true
-			}
 		}
 
 		if len(contactsMode) == 0 {

xml.go

@@ -66,13 +66,13 @@ func LoadCountryFile() Countries {
 
 func GetDXCC(dxCall string, Countries Countries) string {
 	for i := 0; i < len(Countries.Countries); i++ {
-		for j := 0; j < len(Countries.Countries[i].CountryPrefixList.CountryPrefixList); j++ {
+		// for j := 0; j < len(Countries.Countries[i].CountryPrefixList.CountryPrefixList); j++ {
-			regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[j].PrefixList)
+		regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].PrefixList)
-			match := regExp.FindStringSubmatch(dxCall)
+		match := regExp.FindStringSubmatch(dxCall)
-			if len(match) != 0 {
+		if len(match) != 0 {
-				return Countries.Countries[i].Dxcc
+			return Countries.Countries[i].Dxcc
-			}
 		}
+		// }
 	}
 	return ""
 }