From d743de6b87cd74b7bcef092c37a7f337868bab31 Mon Sep 17 00:00:00 2001
From: kortschak <dan.kortschak@adelaide.edu.au>
Date: Mon, 26 Jan 2015 16:36:31 +1030
Subject: [PATCH] Add call to loadFn hook

Also add error return.
---
 cayley.go      | 4 ++++
 cayley_test.go | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cayley.go b/cayley.go
index e81c002..4d2bfdc 100644
--- a/cayley.go
+++ b/cayley.go
@@ -305,6 +305,10 @@ func decompressAndLoad(qw graph.QuadWriter, cfg *config.Config, path, typ string
 		return fmt.Errorf("unknown quad format %q", typ)
 	}
 
+	if loadFn != nil {
+		return loadFn(qw, cfg, dec)
+	}
+
 	return db.Load(qw, cfg, dec)
 }
 
diff --git a/cayley_test.go b/cayley_test.go
index df3043b..1f2685c 100644
--- a/cayley_test.go
+++ b/cayley_test.go
@@ -454,7 +454,10 @@ func remove(qw graph.QuadWriter, cfg *config.Config, dec quad.Unmarshaler) error
 			}
 			return err
 		}
-		qw.RemoveQuad(t)
+		err = qw.RemoveQuad(t)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }