(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.94.4.4 and 1.95

version 1.94.4.4, 2004/07/02 14:40:08 version 1.95, 2004/04/19 22:09:17
Line 29 
Line 29 
 //                  (carolann_graves@hp.com) //                  (carolann_graves@hp.com)
 //              Nitin Upasani, Hewlett-Packard Company (Nitin_Upasani@hp.com) //              Nitin Upasani, Hewlett-Packard Company (Nitin_Upasani@hp.com)
 //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
 //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
Line 3612 
Line 3611 
 { {
     XmlEntry entry;     XmlEntry entry;
  
     if (!testStartTagOrEmptyTag(parser, entry, "CLASS"))      if (!testStartTag(parser, entry, "CLASS"))
         return false;         return false;
  
     CIMName name = getCimNameAttribute(parser.getLine(), entry, "CLASS");     CIMName name = getCimNameAttribute(parser.getLine(), entry, "CLASS");
Line 3621 
Line 3620 
  
     cimClass = CIMClass(name, superClass);     cimClass = CIMClass(name, superClass);
  
         if(entry.type != XmlEntry::EMPTY_TAG)  
         {  
   
     // Get QUALIFIER elements:     // Get QUALIFIER elements:
  
     getQualifierElements(parser, cimClass);     getQualifierElements(parser, cimClass);
Line 3642 
Line 3638 
     // Get CLASS end tag:     // Get CLASS end tag:
  
         expectEndTag(parser, "CLASS");         expectEndTag(parser, "CLASS");
         }  
  
     return true;     return true;
 } }
Line 3944 
Line 3939 
  
 Boolean XmlReader::getIParamValueTag( Boolean XmlReader::getIParamValueTag(
     XmlParser& parser,     XmlParser& parser,
     const char*& name,      const char*& name)
     Boolean& isEmptyTag)  
 { {
     XmlEntry entry;     XmlEntry entry;
  
     if (!testStartTagOrEmptyTag(parser, entry, "IPARAMVALUE"))      if (!testStartTag(parser, entry, "IPARAMVALUE"))
         return false;         return false;
  
     isEmptyTag = (entry.type == XmlEntry::EMPTY_TAG);  
   
     // Get IPARAMVALUE.NAME attribute:     // Get IPARAMVALUE.NAME attribute:
  
     if (!entry.getAttributeValue("NAME", name)) {     if (!entry.getAttributeValue("NAME", name)) {
Line 3974 
Line 3966 
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
 // //
 // rejectNullIParamValue()  
 //  
 //------------------------------------------------------------------------------  
   
 void XmlReader::rejectNullIParamValue(  
     XmlParser& parser,  
     Boolean isEmptyTag,  
     const char* paramName)  
 {  
     if (isEmptyTag)  
     {  
         MessageLoaderParms mlParms("Common.XmlReader.INVALID_NULL_IPARAMVALUE",  
             "A null value is not valid for IPARAMVALUE \"$0\".",  
             paramName);  
         throw XmlValidationError(parser.getLine(), mlParms);  
     }  
 }  
   
 //------------------------------------------------------------------------------  
 //  
 // getBooleanValueElement() // getBooleanValueElement()
 // //
 //     Get an elements like: "<VALUE>FALSE</VALUE>" //     Get an elements like: "<VALUE>FALSE</VALUE>"
Line 4050 
Line 4022 
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
 //     Pending DMTF CR  //
   //     DMTF CR Pending
 // //
 //     <!ELEMENT ERROR (INSTANCE*)> //     <!ELEMENT ERROR (INSTANCE*)>
 //     <!ATTLIST ERROR //     <!ATTLIST ERROR
Line 4645 
Line 4618 
 { {
     XmlEntry entry;     XmlEntry entry;
     const char* name;     const char* name;
     CIMType type=CIMTYPE_BOOLEAN;      CIMType type;
     CIMValue value;     CIMValue value;
  
     if (!testStartTagOrEmptyTag(parser, entry, "PARAMVALUE"))     if (!testStartTagOrEmptyTag(parser, entry, "PARAMVALUE"))


Legend:
Removed from v.1.94.4.4  
changed lines
  Added in v.1.95

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2