Make data_set non-side-effect-y unless you call one of its functions,…

… and adjust load_data.{sh,bat} accordingly
4clojure · May 19, 2011 · 0402c22 · 0402c22
1 parent fd92533
commit 0402c22
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/load-data.bat b/load-data.bat
@@ -1,3 +1,3 @@
 @echo off
 for /f %%a in ('lein classpath') do @set project_classpath=%%a
-java -cp %project_classpath% clojure.main .\src\foreclojure\data_set.clj
+java -cp %project_classpath% clojure.main -i .\src\foreclojure\mongo.clj -e "(use 'foreclojure.mongo) (prepare-mongo) (shutdown-agents)"
diff --git a/load-data.sh b/load-data.sh
@@ -1,3 +1,3 @@
 project_classpath=`lein classpath`
 echo $project_classpath
-java -cp $project_classpath  clojure.main ./src/foreclojure/data_set.clj
+java -cp $project_classpath  clojure.main -i ./src/foreclojure/mongo.clj -e "(use 'foreclojure.mongo) (prepare-mongo) (shutdown-agents)"
diff --git a/src/foreclojure/data_set.clj b/src/foreclojure/data_set.clj
@@ -3,12 +3,9 @@
 
 (defn load-problems []
   (do
-    (mongo! :db :mydb)
-
     (insert! :seqs
              {:_id "problems"
               :seq 87})
-
     (insert! :problems
              {:_id 1
               :title "Nothing but the Truth"
@@ -1014,5 +1011,3 @@ number of prime numbers."
 		   "(= (__ 1 2 10 100 1300) '(= (* (+ 1 2 10) 100) 1300)"]})
 
       ))
-
-(load-problems)