Merge branch 'master' of https://github.com/woanware/lookuper

woanware · Oct 31, 2016 · 1d3e596 · 1d3e596
2 parents d4e2fbd + 1d0da74
commit 1d3e596
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/source/src/woanware/lookuper/main.go b/source/src/woanware/lookuper/main.go
@@ -29,7 +29,11 @@ var (
 // ##### Constants ############################################################
 
 const APP_NAME string = "lookuper"
+<<<<<<< HEAD
 const APP_VERSION string = "0.0.5"
+=======
+const APP_VERSION string = "0.0.4"
+>>>>>>> 1d0da74eb00a9757f1c98adcb821d7fdb525d886
 const DB_FILE_NAME string = "./lookuper.db"
 const CONFIG_FILE_NAME string = "./lookuper.config"
 

diff --git a/source/src/woanware/lookuper/worker.go b/source/src/woanware/lookuper/worker.go
@@ -51,8 +51,6 @@ func (w *Worker) Run(
 	apiKeys []string,
 	privateApiKeys bool) {
 
-	log.Printf("Data type: %s", dataTypes[dataType])
-
 	count, err := w.getWorkTableRecordCount()
 	if err != nil {
 		log.Printf("Error checking for existing work: %v", err)
@@ -258,11 +256,16 @@ func (w *Worker) process(apiKey string) int8 {
 
 	var responseCode int8
 	var batchData BatchData
-
+	var percent float64
 	for  {
 		batchData = w.loadBatch(batchSize)
 		if len(batchData.Items) == 0 {
-			break
+			break	
+		}
+
+		if w.numberComplete % 5 == 0 {		
+		 	percent = float64(w.numberComplete) * float64(100)  / float64(w.numberTotal) 
+		 	log.Printf("Percent Complete: %d", int(percent))
 		}
 
 		responseCode =  w.processBatch(apiKey, batchData)