p21read shouldn't quit for errors

src/clstepcore/sdaiApplication_instance.cc

@@ -550,11 +550,23 @@ Severity SDAI_Application_instance::STEPread( int id,  int idIncr,
             while( i < n - 1 ) {
                 i++; // check if following attributes are redefined
                 if( !( attributes[i].aDesc->AttrType() == AttrType_Redefining ) ) {
-                    PrependEntityErrMsg();
-                    _error.AppendToDetailMsg( "Missing attribute value[s].\n" );
-                    // recoverable error
-                    _error.GreaterSeverity( SEVERITY_WARNING );
-                    return _error.severity();
+
+                    //The attribute is missing. If it's a string, use ''.
+                    if( ( !strict ) && ( attributes[i].aDesc->NonRefType() == STRING_TYPE ) ) {
+                        attributes[i].StrToVal("''", instance_set, idIncr);
+                        _error.AppendToDetailMsg("Missing required non-redefined attribute of type string added as null string.\n" );
+                        _error.GreaterSeverity( SEVERITY_INCOMPLETE );
+                        std::ostringstream oss;
+                        oss << "/* Entity #" << id <<", attribute #" << i;
+                        oss << ": a missing, required, non-redefined string; added as null string. */\n";
+                        p21Comment.append( oss.str() );
+                    } else {
+                        PrependEntityErrMsg();
+                        _error.AppendToDetailMsg( "Missing attribute value[s].\n" );
+                        // recoverable error
+                        _error.GreaterSeverity( SEVERITY_WARNING );
+                        return _error.severity();
+                    }
                 }
                 i++;
             }

src/test/p21read/p21read.cc

@@ -152,8 +152,8 @@ int main( int argc, char * argv[] ) {
     sfile.ReadExchangeFile( flnm );
     sfile.Error().PrintContents( cout );
 
-    if ( sfile.Error().severity() <= SEVERITY_INCOMPLETE )
-        exit(1);
+    if ( sfile.Error().severity() < SEVERITY_INCOMPLETE )
+        exit( EXIT_FAILURE );
 
     checkSchemaName( registry, sfile, ignoreErr );
 
@@ -169,7 +169,7 @@ int main( int argc, char * argv[] ) {
     sfile.Error().PrintContents( cout );
     cout << flnm << " written"  << endl;
 
-    if( ( sfile.Error().severity() <= SEVERITY_INCOMPLETE ) || ( readSev <= SEVERITY_INCOMPLETE ) ) { //lower is worse
-        exit( 1 );
+    if( sfile.Error().severity() < SEVERITY_INCOMPLETE ) { //lower is worse
+        exit( EXIT_FAILURE );
     }
 }