(file) Return to XmlReader.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlReader.cpp between version 1.109 and 1.110

version 1.109, 2005/02/28 21:12:22 version 1.110, 2005/03/09 21:02:26
Line 2340 
Line 2340 
     Boolean propagated = getCimBooleanAttribute(     Boolean propagated = getCimBooleanAttribute(
         parser.getLine(), entry, "PROPERTY", "PROPAGATED", false, false);         parser.getLine(), entry, "PROPERTY", "PROPAGATED", false, false);
  
     // Get PROPERTY.EMBEDDEDOBJECT      // Get PROPERTY.EMBEDDEDOBJECT attribute:
  
     String embeddedObject = getEmbeddedObjectAttribute(     String embeddedObject = getEmbeddedObjectAttribute(
         parser.getLine(), entry, "PROPERTY");         parser.getLine(), entry, "PROPERTY");
Line 2362 
Line 2362 
             getQualifierElements(parser, property);             getQualifierElements(parser, property);
     }     }
  
       Boolean embeddedObjectQualifierValue = false;
       Uint32 ix = property.findQualifier(CIMName("EmbeddedObject"));
       if (ix != PEG_NOT_FOUND)
       {
           property.getQualifier(ix).getValue().get(embeddedObjectQualifierValue);
       }
   
     // If the EMBEDDEDOBJECT attribute is present with value "object"     // If the EMBEDDEDOBJECT attribute is present with value "object"
     // or the EmbeddedObject qualifier exists on this property      // or the EmbeddedObject qualifier exists on this property with value "true"
     // then     // then
     //     Convert the EmbeddedObject-encoded string into a CIMObject     //     Convert the EmbeddedObject-encoded string into a CIMObject
     if (String::equal(embeddedObject, "object")      if (String::equal(embeddedObject, "object") || embeddedObjectQualifierValue)
         || property.findQualifier(CIMName("EmbeddedObject")) != PEG_NOT_FOUND  
         )  
     {     {
         // The EMBEDDEDOBJECT attribute is only valid on Properties of type string         // The EMBEDDEDOBJECT attribute is only valid on Properties of type string
         if (type == CIMTYPE_STRING)         if (type == CIMTYPE_STRING)
Line 2519 
Line 2524 
                                                 ,false                                                 ,false
                                                 ,false);                                                 ,false);
  
     // Get PROPERTY.EMBEDDEDOBJECT      // Get PROPERTY.EMBEDDEDOBJECT attribute:
  
     String embeddedObject = getEmbeddedObjectAttribute(parser.getLine()     String embeddedObject = getEmbeddedObjectAttribute(parser.getLine()
                                                        ,entry                                                        ,entry
Line 2536 
Line 2541 
         getQualifierElements(parser, property);         getQualifierElements(parser, property);
     }     }
  
       Boolean embeddedObjectQualifierValue = false;
       Uint32 ix = property.findQualifier(CIMName("EmbeddedObject"));
       if (ix != PEG_NOT_FOUND)
       {
           property.getQualifier(ix).getValue().get(embeddedObjectQualifierValue);
       }
   
     // If the EMBEDDEDOBJECT attribute is present with value "object"     // If the EMBEDDEDOBJECT attribute is present with value "object"
     // or the EmbeddedObject qualifier exists on this property      // or the EmbeddedObject qualifier exists on this property with value "true"
     // then     // then
     //     Convert the EmbeddedObject-encoded string into a CIMObject     //     Convert the EmbeddedObject-encoded string into a CIMObject
     if (String::equal(embeddedObject, "object")      if (String::equal(embeddedObject, "object") || embeddedObjectQualifierValue)
         || property.findQualifier(CIMName("EmbeddedObject")) != PEG_NOT_FOUND  
         )  
     {     {
         // The EMBEDDEDOBJECT attribute is only valid on Properties of type string         // The EMBEDDEDOBJECT attribute is only valid on Properties of type string
         if (type == CIMTYPE_STRING)         if (type == CIMTYPE_STRING)


Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2