Make --import work

XRPLF · Nov 23, 2013 · 54e504d · 54e504d
1 parent b632a6b
commit 54e504d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -325,6 +325,7 @@ class Config
             <key>'='<value>['|'<key>'='value]
         @see parseDelimitedKeyValueString
     */
+    bool doImport;
     StringPairArray importNodeDatabase;
 
     //