0027532: Errors on reading stp-file

The cause of errors is a non alphabetical order of complex entity, which do not affect export.
Move messages to debug mode.
Replace fail by warning.

Correction of test case bugs/vis/bug23153 according to the new behavior

diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index 1691ba2a8e145c6135800117c5ddb577f6e677df..bcfd329a9a38b7217d521c0dd8ab614b380425a6 100644 (file)
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -178,16 +178,13 @@ void StepData_StepReaderData::SetRecord (const Standard_Integer num,
          //themults.SetValue(prev,num);
           themults.Bind(prev,num);
           if(thenametypes.FindKey(thetypes.Value(num)).IsLess(thenametypes.FindKey(thetypes.Value(prev)))) {
-         //if (thetypes.Value(num).IsLess(thetypes.Value(prev))) 
-
-//  ERREUR : Type complexe pas en ordre alphabetique. On enregistre.
+      //  Warning: components in complex entity are not in alphabetical order.
            TCollection_AsciiString errm("Complex Type incorrect : ");
            errm.AssignCat(thenametypes.FindKey(thetypes.Value(prev)));
            errm.AssignCat(" / ");
            errm.AssignCat(thenametypes.FindKey(thetypes.Value(num)));
            errm.AssignCat(" ... ");
-           thecheck->AddFail(errm.ToCString(),"Complex Type incorrect : ");
-//  On Affiche a l ecran, le plus de donnees possibles
+#ifdef OCCT_DEBUG
            while (theidents(prev) <= 0) {
              prev --;  if (prev <= 0) break;
            }
@@ -196,6 +193,8 @@ void StepData_StepReaderData::SetRecord (const Standard_Integer num,
              << " -> " << num*100/NbRecords() << " % in File)  ***";
            if (prev > 0) sout << "  Ident #" << theidents(prev);
            sout << "\n" << errm << endl;
+#endif
+      thecheck->AddWarning(errm.ToCString(),"Complex Type incorrect : ");
          }
          break;
        }

diff --git a/tests/bugs/modalg_6/bug27341_329 b/tests/bugs/modalg_6/bug27341_329
index 3313c76201b7d128e438c770332303bb5f2e036f..9d5402b9b7d8ead58222571e2416ae1e6f6ba798 100644 (file)
--- a/tests/bugs/modalg_6/bug27341_329
+++ b/tests/bugs/modalg_6/bug27341_329
@@ -1,5 +1,3 @@
-puts "TODO OCC27532 ALL: Error on Record"
-
 puts "============"
 puts "OCC27341"
 puts "============"

diff --git a/tests/bugs/step/bug2368 b/tests/bugs/step/bug2368
index 46dfe0d928b0bed9cd14c3d6070e45ff449c7b02..8238037a77624aba23737063489cd8e5072c88d1 100644 (file)
--- a/tests/bugs/step/bug2368
+++ b/tests/bugs/step/bug2368
@@ -1,6 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-puts "TODO OCC12345 ALL: OCC2368: Error during reading attached IGES file"
-
 puts "============"
 puts "OCC2368"
 puts "============"

diff --git a/tests/bugs/step/bug348_1 b/tests/bugs/step/bug348_1
index 4e39634c709c9d3ae49b161d6f2f3fe0bdade1e7..f2ca11ce2b1341ca35352e29b80975a163d18bb3 100755 (executable)
--- a/tests/bugs/step/bug348_1
+++ b/tests/bugs/step/bug348_1
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"

diff --git a/tests/bugs/step/bug348_2 b/tests/bugs/step/bug348_2
index 48fcceafc800c01ce1b04b0c0d47cc1b69f8a5c2..9c639e3bf6b3a266ca9236a87f9993740b57968e 100755 (executable)
--- a/tests/bugs/step/bug348_2
+++ b/tests/bugs/step/bug348_2
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"

diff --git a/tests/bugs/step/bug348_3 b/tests/bugs/step/bug348_3
index b6afc894ee4d40224669d88fefc03fb5b0aa64bb..5a46494d4b9c17893b74bf071a3abe693d3e96c7 100755 (executable)
--- a/tests/bugs/step/bug348_3
+++ b/tests/bugs/step/bug348_3
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"

diff --git a/tests/bugs/step/bug348_4 b/tests/bugs/step/bug348_4
index 23c7cc6c5e893480a970b92ff8b08cdf15d098a7..d46c1fd2e51a6f56f13e571623aa5f4d4b2cdab9 100755 (executable)
--- a/tests/bugs/step/bug348_4
+++ b/tests/bugs/step/bug348_4
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"

diff --git a/tests/bugs/step/bug926 b/tests/bugs/step/bug926
index 3573a3110901ca80c591e600bd419741fdc1a7c4..c2d80494961db8791159c30a978ed6266091b52e 100755 (executable)
--- a/tests/bugs/step/bug926
+++ b/tests/bugs/step/bug926
@@ -1,4 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
 puts "TODO OCC12345 ALL: Error : OCC926 is WRONG because number of "
 
 puts "================"

diff --git a/tests/bugs/step/parse.rules b/tests/bugs/step/parse.rules
deleted file mode 100644 (file)
index c48aff7..0000000
--- a/tests/bugs/step/parse.rules
+++ /dev/null
@@ -1 +0,0 @@
-IGNORE /Error on Record/ message during loading file

diff --git a/tests/bugs/vis/bug23153 b/tests/bugs/vis/bug23153
index 98bf47e22385f41296041fa79a49ec9a3c8e01b0..9f615399bdddc7d9e35345e43bdaf327e737aeea 100755 (executable)
--- a/tests/bugs/vis/bug23153
+++ b/tests/bugs/vis/bug23153
@@ -1,4 +1,4 @@
-puts "REQUIRED All: \\*\\*\\*  Error on Record"
+#puts "REQUIRED All: \\*\\*\\*  Error on Record"
 puts "============"
 puts "OCC23153"
 puts "============"

diff --git a/tests/bugs/xde/bug22982 b/tests/bugs/xde/bug22982
index 37b16449ca4c16fb0f6a1179ab4f941f69e7c676..b21c742605657c4d95ddcd9b0d67da6f3e033fec 100755 (executable)
--- a/tests/bugs/xde/bug22982
+++ b/tests/bugs/xde/bug22982
@@ -1,5 +1,3 @@
-puts "TODO OCC22982 ALL: Error on Record"
-# errors appear during reading source step file
 pload QAcommands
 
 puts "============"

diff --git a/tests/de/parse.rules b/tests/de/parse.rules
index 4ac2e98cd53616cece297468f56807f53b1597e9..813616d1cfc5c70ce08cb5e55de1e5e08c761a0e 100644 (file)
--- a/tests/de/parse.rules
+++ b/tests/de/parse.rules
@@ -1,5 +1,4 @@
 FAILED /\bFaulty\b/ error
-IGNORE /Error on Record/ message during loading file
 IGNORE /Software error/ message in tpstat
 IGNORE /Syntax error/ message in data c
 IGNORE /Transfer error/ message in tpstat

diff --git a/tests/xcaf/stp_to_xbf/G7 b/tests/xcaf/stp_to_xbf/G7
index c7fd9dfe72e0823574d4470cedfc3b48d33ae43e..fadee125604d5ba1cde9e578c55b9c183b4cd71f 100644 (file)
--- a/tests/xcaf/stp_to_xbf/G7
+++ b/tests/xcaf/stp_to_xbf/G7
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj3_d1-tc-214.stp]
 set TypeOfFile ""
 set AddToDocument ""

diff --git a/tests/xcaf/stp_to_xbf/I1 b/tests/xcaf/stp_to_xbf/I1
index 3145530bcb409ae14818eb1abeea297f79e65612..8cfcba046d07751d1eafc5d12e2397c20b3eb732 100644 (file)
--- a/tests/xcaf/stp_to_xbf/I1
+++ b/tests/xcaf/stp_to_xbf/I1
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj4_d2-tc-214.stp]
 set TypeOfFile ""
 set AddToDocument ""

diff --git a/tests/xcaf/stp_to_xbf/I2 b/tests/xcaf/stp_to_xbf/I2
index 0a3d48b55ec10d6c02e78ea8f760ae354019ed16..60746497704f7c1b1610262f26a8f40a53f158e0 100644 (file)
--- a/tests/xcaf/stp_to_xbf/I2
+++ b/tests/xcaf/stp_to_xbf/I2
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj4_d2-tu-214.stp]
 set TypeOfFile ""
 set AddToDocument ""