passing test

2 files changed, 17 insertions, 5 deletions

diff --git a/reader/reader.go b/reader/reader.go
index 46c7144..95ef193 100644
--- a/reader/reader.go
+++ b/reader/reader.go
@@ -17,17 +17,26 @@ type DatamapLine struct {
 	Cellref string
 }
 
+type fileError struct {
+	file string
+	msg  string
+}
+
+func (e *fileError) Error() string {
+	return fmt.Sprintf("%s", e.msg)
+}
+
 //Keylens returns the length of a key
 func Keylens(dml DatamapLine) (int, int) {
 	return len(dml.Key), len(dml.Sheet)
 }
 
 //ReadDML returns a pointer to a slice of DatamapLine structs
-func ReadDML(path string) *[]DatamapLine {
+func ReadDML(path string) (*[]DatamapLine, error) {
 	var s []DatamapLine
 	data, err := ioutil.ReadFile(path)
 	if err != nil {
-		fmt.Printf("Error! Cannot open file %s", err)
+		return &s, &fileError{path, "Cannot open."}
 	}
 	r := csv.NewReader(strings.NewReader(string(data)))
 	for {
@@ -49,7 +58,7 @@ func ReadDML(path string) *[]DatamapLine {
 		// fmt.Printf("Key length: %d\n", klen)
 		// fmt.Printf("Sheet length: %d\n\n", slen)
 	}
-	return &s
+	return &s, nil
 }
 
 //ReadXLSX reads an XLSX file
diff --git a/reader/reader_test.go b/reader/reader_test.go
index 1c249b5..44c2a56 100644
--- a/reader/reader_test.go
+++ b/reader/reader_test.go
@@ -1,9 +1,12 @@
 package reader
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestReadDML(t *testing.T) {
-	dmlData := *ReadDML("/home/lemon/Documents/datamaps/input/datamap.csv")
+	d, _ := ReadDML("/home/lemon/Documents/datamaps/input/datamap.csv")
+	dmlData := *d
 	if dmlData[0].Key != "Project/Programme Name" {
 		t.Errorf("dmlData[0].key = %s; want Project/Programme Name", dmlData[0].Key)
 	}