commit 8cd35eab1b92e13908f0873cefb58fa7da8e6123
author Jiewen Tan <alanwake.tan@gmail.com> Fri Mar 20 00:44:23 2015 -0700
committer Jiewen Tan <alanwake.tan@gmail.com> Sat Mar 21 19:57:17 2015 -0700
tree 1b902e3408a10cae18fedd1589d9eb89ec8eec6b
parent d2d21822112130c6b1e8d218f7afa479b18e17ca

mgmt: ndns-add-rr-from-file update RR to the latest version

Change-Id: Ia6812e5961bdc885e92cd49fafe2298390667040
Refs: #2259

src/mgmt/management-tool.cpp

diff --git a/src/mgmt/management-tool.cpp b/src/mgmt/management-tool.cpp
index 9925aca..c6fc51e 100644
--- a/src/mgmt/management-tool.cpp
+++ b/src/mgmt/management-tool.cpp
@@ -288,11 +288,8 @@
   rrset.setVersion(re.getVersion());
   rrset.setData(data->wireEncode());
 
-  if (m_dbMgr.find(rrset)) {
-    throw Error("Duplicate " + boost::lexical_cast<std::string>(rrset));
-  }
+  checkRrsetVersion(rrset);
   NDNS_LOG_INFO("Added " << rrset);
-
   m_dbMgr.insert(rrset);
 }
 
@@ -388,9 +385,7 @@
   rrset.setVersion(re.getVersion());
   rrset.setData(data->wireEncode());
 
-  if (m_dbMgr.find(rrset)) {
-    throw Error("Duplicate " + boost::lexical_cast<std::string>(rrset));
-  }
+  checkRrsetVersion(rrset);
   NDNS_LOG_INFO("Added " << rrset);
   m_dbMgr.insert(rrset);
 }
@@ -636,5 +631,22 @@
   return true;
 }
 
+void
+ManagementTool::checkRrsetVersion(const Rrset& rrset)
+{
+  Rrset originalRrset(rrset);
+  if (m_dbMgr.find(originalRrset)) {
+    // update only if rrset has a newer version
+    if (originalRrset.getVersion() == rrset.getVersion()) {
+      throw Error("Duplicate: " + boost::lexical_cast<std::string>(originalRrset));
+    }
+    else if (originalRrset.getVersion() > rrset.getVersion()) {
+      throw Error("Newer version exists: " + boost::lexical_cast<std::string>(originalRrset));
+    }
+
+    m_dbMgr.remove(originalRrset);
+  }
+}
+
 } // namespace ndns
 } // namespace ndn