--- trunk/mdtools/interface_implementation/MakeStamps.cpp	2002/11/05 22:04:46	164
+++ trunk/mdtools/interface_implementation/MakeStamps.cpp	2002/11/18 21:24:02	178
@@ -4,7 +4,9 @@
 #include "MakeStamps.hpp"
 #include "MoleculeStamp.hpp"
 #include "simError.h"
+#ifdef IS_MPI
 #include "mpiBASS.h"
+#endif // is_mpi
 
 LinkedMolStamp::~LinkedMolStamp(){ 
   if( mol_stamp != NULL ) delete mol_stamp;
@@ -111,17 +113,17 @@ int MakeStamps::moleculeAssign( event* the_event ){
   switch( the_event->evt.asmt.asmt_type ){
     
   case STRING:
-    return current_mol->assignString( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignString( the_event->evt.asmt.lhs,
 				      the_event->evt.asmt.rhs.sval );
     break;
 
   case DOUBLE:
-    return current_mol->assignDouble( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignDouble( the_event->evt.asmt.lhs,
 				      the_event->evt.asmt.rhs.dval );
     break;
     
   case INT:
-    return current_mol->assignInt( the_event->evt.asmt.lhs,
+    the_event->err_msg = current_mol->assignInt( the_event->evt.asmt.lhs,
 				   the_event->evt.asmt.rhs.ival );
     break;
 
@@ -131,7 +133,8 @@ int MakeStamps::moleculeAssign( event* the_event ){
     return 0;
     break;
   }
-  return 0;
+  if( the_event->err_msg != NULL ) return 0;
+  return 1;
 }
 
 int MakeStamps::moleculeEnd( event* the_event ){
@@ -151,7 +154,6 @@ int MakeStamps::newAtom( event* the_event ){
   the_event->err_msg = current_mol->addAtom( current_atom,
 					     the_event->evt.blk_index );
   if( the_event->err_msg != NULL ) return 0;
-
   return 1;
 }
 
@@ -177,20 +179,26 @@ int MakeStamps::atomAssign( event* the_event ){
   switch( the_event->evt.asmt.asmt_type ){
     
   case STRING:
-    current_atom->assignString( the_event->evt.asmt.lhs,
-			       the_event->evt.asmt.rhs.sval );
+    the_event->err_msg = 
+      current_atom->assignString( the_event->evt.asmt.lhs,
+				  the_event->evt.asmt.rhs.sval );
+    if( the_event->err_msg != NULL ) return 0;
     return 1;
     break;
 
   case DOUBLE:
-    current_atom->assignDouble( the_event->evt.asmt.lhs,
-			       the_event->evt.asmt.rhs.dval );
-    return 1;
+    the_event->err_msg = 
+      current_atom->assignDouble( the_event->evt.asmt.lhs,
+				  the_event->evt.asmt.rhs.dval );
+    if( the_event->err_msg != NULL ) return 0;
+    return 1;    
     break;
 
   case INT:
-    current_atom->assignInt( the_event->evt.asmt.lhs,
-			    the_event->evt.asmt.rhs.ival );
+    the_event->err_msg = 
+      current_atom->assignInt( the_event->evt.asmt.lhs,
+			       the_event->evt.asmt.rhs.ival );
+    if( the_event->err_msg != NULL ) return 0;
     return 1;
     break;