[lmi-commits] [4979] Eliminate gratuitous redundancy

[Greg Chicares]

Revision: 4979
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4979
Author:   chicares
Date:     2010-06-08 17:08:42 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
Eliminate gratuitous redundancy

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/dbvalue.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-06-08 12:42:31 UTC (rev 4978)
+++ lmi/trunk/ChangeLog 2010-06-08 17:08:42 UTC (rev 4979)
@@ -25974,3 +25974,8 @@
   fund_data.cpp
 Require '.funds' extension.
 
+20100608T1708Z <address@hidden> [704]
+
+  dbvalue.cpp
+Eliminate gratuitous redundancy.
+

Modified: lmi/trunk/dbvalue.cpp
===================================================================
--- lmi/trunk/dbvalue.cpp       2010-06-08 12:42:31 UTC (rev 4978)
+++ lmi/trunk/dbvalue.cpp       2010-06-08 17:08:42 UTC (rev 4979)
@@ -428,9 +428,7 @@
 
 void database_entity::read(xml::element const& e)
 {
-    std::string short_name;
-    xml_serialize::get_element(e, "key"         , short_name   );
-    key_ = db_key_from_name(short_name);
+    key_ = db_key_from_name(e.get_name());
     xml_serialize::get_element(e, "axis_lengths", axis_lengths_);
     xml_serialize::get_element(e, "data_values" , data_values_ );
     xml_serialize::get_element(e, "gloss"       , gloss_       );
@@ -442,7 +440,6 @@
 {
     assert_invariants();
 
-    xml_serialize::set_element(e, "key"         , db_name_from_key(key_));
     xml_serialize::set_element(e, "axis_lengths", axis_lengths_);
     xml_serialize::set_element(e, "data_values" , data_values_ );
     xml_serialize::set_element(e, "gloss"       , gloss_       );