From 54e504dd5a76b1741e9f90433bc57ea994de3fff Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 22 Nov 2013 16:42:25 -0800
Subject: [PATCH] Make --import work

---
 src/ripple_app/main/Application.cpp   | 2 +-
 src/ripple_app/main/RippleMain.cpp    | 4 +---
 src/ripple_core/functional/Config.cpp | 1 +
 src/ripple_core/functional/Config.h   | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ripple_app/main/Application.cpp b/src/ripple_app/main/Application.cpp
index 974d3cf2c..6b27f5047 100644
--- a/src/ripple_app/main/Application.cpp
+++ b/src/ripple_app/main/Application.cpp
@@ -1225,7 +1225,7 @@ void ApplicationImp::updateTables ()
         exit (1);
     }
 
-    if (getConfig ().importNodeDatabase.size () > 0)
+    if (getConfig ().doImport)
     {
         NodeStore::DummyScheduler scheduler;
         ScopedPointer <NodeStore::Database> source (NodeStore::Database::New (
diff --git a/src/ripple_app/main/RippleMain.cpp b/src/ripple_app/main/RippleMain.cpp
index 66ed1b19b..cff95bf78 100644
--- a/src/ripple_app/main/RippleMain.cpp
+++ b/src/ripple_app/main/RippleMain.cpp
@@ -407,9 +407,7 @@ int RippleMain::run (int argc, char const* const* argv)
     //
     if (vm.count ("import"))
     {
-        String const optionString (vm ["import"].as <std::string> ());
-
-        getConfig ().importNodeDatabase = parseDelimitedKeyValueString (optionString);
+        getConfig ().doImport = true;
     }
 
     if (vm.count ("ledger"))
diff --git a/src/ripple_core/functional/Config.cpp b/src/ripple_core/functional/Config.cpp
index 94576f153..d04e24a12 100644
--- a/src/ripple_core/functional/Config.cpp
+++ b/src/ripple_core/functional/Config.cpp
@@ -108,6 +108,7 @@ Config::Config ()
 
     ELB_SUPPORT             = false;
     RUN_STANDALONE          = false;
+    doImport                = false;
     START_UP                = NORMAL;
 }
 
diff --git a/src/ripple_core/functional/Config.h b/src/ripple_core/functional/Config.h
index 7c303e6c3..4d581a239 100644
--- a/src/ripple_core/functional/Config.h
+++ b/src/ripple_core/functional/Config.h
@@ -325,6 +325,7 @@ public:
             <key>'='<value>['|'<key>'='value]
         @see parseDelimitedKeyValueString
     */
+    bool doImport;
     StringPairArray importNodeDatabase;
 
     //