Changeset 2430 for trunk

Timestamp:

03/14/12 11:45:49 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed a bug that MOLECULES table has only one row even if input data
has multiple rest frequency settings.

File:

• trunk/src/FillerBase.cpp (modified) (2 diffs)

trunk/src/FillerBase.cpp

@@ -121 +121 @@
   Int idx = -1 ;
   for ( uInt i = 0 ; i < nEntry ; i++ ) {
-    if ( restfreq.conform( mEntry_[i] ) ) {
-      if ( allEQ( restfreq, mEntry_[i] ) ) {
-        idx = i ;
-        break ;
-      }
+    if ( restfreq.conform( mEntry_[i] ) && 
+         allEQ( restfreq, mEntry_[i] ) ) {
+      idx = i ;
+      break ;
     }
   }
@@ -134 +133 @@
     Vector<String> tmp ;
     id = table_->molecules().addEntry(restfreq,tmp,tmp) ;
-    mEntry_.push_back( restfreq ) ;
+    mEntry_.push_back( restfreq.copy() ) ;
     mIdx_.push_back( id ) ;
   }