builds and runs again

1 files changed, 12 insertions, 11 deletions

diff --git a/newsort.go b/newsort.go
index 43188cb..8a4925b 100644
--- a/newsort.go
+++ b/newsort.go
@@ -1,27 +1,27 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"strings"
-
-	"go.wit.com/log"
 )
 
-func (pb *Files) makeNewSortfile(pf *File) {
+func (pb *Files) makeNewSortfile(pf *File) error {
 	f, _ := os.OpenFile(pf.Filebase+".newsort.pb.go", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 
 	header(f, pf)
 
 	pf.syncLock(f)
-	if pf.Bases != nil {
-		log.Info("THIS IS WHAT BASES?", pf.Bases.Name, pf.Bases)
+	if pf.Bases == nil {
+		return fmt.Errorf("Base was nil. 'message %s {` did not exist", pf.Filebase)
 	}
-	if pf.Base != nil {
-		log.Info("THIS IS WHAT BASE?", pf.Base.Name, pf.Base)
-		pf.Base.iterTop(f)
-		pf.Base.iterNext(f)
+	if pf.Base == nil {
+		return fmt.Errorf("Base was nil. 'message %s {` did not exist", pf.Filebase)
 	}
 
+	pf.Base.iterTop(f)
+	pf.Base.iterNext(f)
+
 	/*
 		for _, msg := range pf.MsgNames {
 			if msg.DoMutex {
@@ -35,8 +35,8 @@ func (pb *Files) makeNewSortfile(pf *File) {
 		}
 	*/
 
-	// pf.appendUnique(f, msg, sortmap) // Append() enforce no unique keys
-	return
+	pf.appendUnique(f, nil, sortmap) // Append() enforce no unique keys
+	return nil
 	// iterSortAll(f, sortmap)
 
 	if argv.Append != "" {
@@ -74,4 +74,5 @@ func (pb *Files) makeNewSortfile(pf *File) {
 		iterFind(f, sortmap)
 	}
 	iterEnd(f, sortmap)
+	return nil
 }