0030101: Application Framework - A mistake reading a RealArray attribute with too...

[occt.git] / src / XmlMDataStd / XmlMDataStd_RealListDriver.cxx

diff --git a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
index c86d47d..b0eb2a1 100644 (file)
--- a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <NCollection_LocalArray.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
@@ -24,14 +24,15 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RealListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
-
+IMPLEMENT_DOMSTRING (AttributeIDString, "reallistattguid")
 //=======================================================================
 //function : XmlMDataStd_RealListDriver
 //purpose  : Constructor
 //=======================================================================
-XmlMDataStd_RealListDriver::XmlMDataStd_RealListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+XmlMDataStd_RealListDriver::XmlMDataStd_RealListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : XmlMDF_ADriver (theMsgDriver, NULL)
 {
 
@@ -51,14 +52,23 @@ Handle(TDF_Attribute) XmlMDataStd_RealListDriver::NewEmpty() const
 //purpose  : persistent -> transient (retrieve)
 //=======================================================================
 Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&  theSource,
-                                                  const Handle(TDF_Attribute)& theTarget,
-                                                  XmlObjMgt_RRelocationTable&  ) const
+                                                   const Handle(TDF_Attribute)& theTarget,
+                                                   XmlObjMgt_RRelocationTable&  ) const
 {
-  Standard_Real aValue;
-  Standard_Integer aFirstInd, aLastInd, ind;
+  const Handle(TDataStd_RealList) aRealList = Handle(TDataStd_RealList)::DownCast(theTarget);
   const XmlObjMgt_Element& anElement = theSource;
 
+  // attribute id
+  Standard_GUID aGUID;
+  XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+  if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+    aGUID = TDataStd_RealList::GetID(); //default case
+  else
+    aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+  aRealList->SetID(aGUID);
+
   // Read the FirstIndex; if the attribute is absent initialize to 1
+  Standard_Integer aFirstInd, aLastInd, ind;
   XmlObjMgt_DOMString aFirstIndex= anElement.getAttribute(::FirstIndexString());
   if (aFirstIndex == NULL)
     aFirstInd = 1;
@@ -68,7 +78,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
       TCollection_ExtendedString("Cannot retrieve the first index"
                                  " for RealList attribute as \"")
         + aFirstIndex + "\"";
-    WriteMessage (aMessageString);
+    myMessageDriver->Send (aMessageString, Message_Fail);
     return Standard_False;
   }
 
@@ -79,11 +89,10 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
       TCollection_ExtendedString("Cannot retrieve the last index"
                                  " for RealList attribute as \"")
         + aFirstIndex + "\"";
-    WriteMessage (aMessageString);
+    myMessageDriver->Send (aMessageString, Message_Fail);
     return Standard_False;
   }
 
-  const Handle(TDataStd_RealList) aRealList = Handle(TDataStd_RealList)::DownCast(theTarget);
   // Check the type of LDOMString
   const XmlObjMgt_DOMString& aString = XmlObjMgt::GetStringValue(anElement);
   if(aLastInd == 0) aFirstInd = 0;
@@ -101,7 +110,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
         TCollection_ExtendedString("Cannot retrieve array of real members"
                                    " for RealList attribute from Integer \"")
         + aString + "\"";
-      WriteMessage (aMessageString);
+      myMessageDriver->Send (aMessageString, Message_Fail);
       return Standard_False;
     }
   } 
@@ -110,13 +119,19 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
     Standard_CString aValueStr = Standard_CString(aString.GetString());
     for (ind = aFirstInd; ind <= aLastInd; ind++)
     {
+      Standard_Real aValue;
       if (!XmlObjMgt::GetReal(aValueStr, aValue)) {
         TCollection_ExtendedString aMessageString =
           TCollection_ExtendedString("Cannot retrieve real member"
                                      " for RealList attribute as \"")
             + aValueStr + "\"";
-        WriteMessage (aMessageString);
-        return Standard_False;
+        myMessageDriver->Send(aMessageString, Message_Warning);
+        // skip the first space, if exists
+        while (*aValueStr != 0 && IsSpace (*aValueStr))
+          ++aValueStr;
+        // skip to the next space separator
+        while (*aValueStr != 0 && !IsSpace (*aValueStr))
+          ++aValueStr;
       }
       aRealList->Append(aValue);
     }
@@ -130,8 +145,8 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
 //purpose  : transient -> persistent (store)
 //=======================================================================
 void XmlMDataStd_RealListDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                      XmlObjMgt_Persistent&        theTarget,
-                                      XmlObjMgt_SRelocationTable&  ) const
+                                       XmlObjMgt_Persistent&        theTarget,
+                                       XmlObjMgt_SRelocationTable&  ) const
 {
   const Handle(TDataStd_RealList) aRealList = Handle(TDataStd_RealList)::DownCast(theSource);
 
@@ -152,4 +167,12 @@ void XmlMDataStd_RealListDriver::Paste(const Handle(TDF_Attribute)& theSource,
     }
   }
   XmlObjMgt::SetStringValue (theTarget, (Standard_Character*)str, Standard_True);
+
+  if(aRealList->ID() != TDataStd_RealList::GetID()) {
+    //convert GUID
+    Standard_Character aGuidStr [Standard_GUID_SIZE_ALLOC];
+    Standard_PCharacter pGuidStr = aGuidStr;
+    aRealList->ID().ToCString (pGuidStr);
+    theTarget.Element().setAttribute (::AttributeIDString(), aGuidStr);
+  }
 }