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

Diff for /pegasus/src/Pegasus/Common/ObjectNormalizer.cpp between version 1.1 and 1.2

version 1.1, 2004/05/27 22:11:48 version 1.2, 2004/05/27 23:32:53
Line 37 
Line 37 
     const CIMQualifier & referenceQualifier,     const CIMQualifier & referenceQualifier,
     const CIMQualifier & cimQualifier)     const CIMQualifier & cimQualifier)
 { {
     std::cout << "_resolveQualifier(" << referenceQualifier.getName().getString() << ")" << std::endl;      PEGASUS_STD(cout) << "_resolveQualifier(" << referenceQualifier.getName().getString() << ")" << PEGASUS_STD(endl);
  
     CIMName qualifierName = referenceQualifier.getName();     CIMName qualifierName = referenceQualifier.getName();
     CIMValue qualifierValue = referenceQualifier.getValue();     CIMValue qualifierValue = referenceQualifier.getValue();
Line 65 
Line 65 
     const Boolean includeQualifiers,     const Boolean includeQualifiers,
     const Boolean includeClassOrigin)     const Boolean includeClassOrigin)
 { {
     std::cout << "_resolveProperty(" << referenceProperty.getName().getString() << ")" << std::endl;      PEGASUS_STD(cout) << "_resolveProperty(" << referenceProperty.getName().getString() << ")" << PEGASUS_STD(endl);
     std::cout << "flags :";      PEGASUS_STD(cout) << "flags :";
     std::cout << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");      PEGASUS_STD(cout) << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");
     std::cout << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");      PEGASUS_STD(cout) << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");
     std::cout << std::endl;      PEGASUS_STD(cout) << PEGASUS_STD(endl);
  
     CIMName propertyName = referenceProperty.getName();     CIMName propertyName = referenceProperty.getName();
     CIMValue propertyValue = referenceProperty.getValue();     CIMValue propertyValue = referenceProperty.getValue();
Line 119 
Line 119 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier referenceQualifier = referenceProperty.getQualifier(i).clone();             CIMQualifier referenceQualifier = referenceProperty.getQualifier(i).clone();
  
             std::cout << "adding qualifier - " << referenceQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "adding qualifier - " << referenceQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newProperty.addQualifier(referenceQualifier);             newProperty.addQualifier(referenceQualifier);
         }         }
Line 143 
Line 143 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier cimQualifier = cimProperty.getQualifier(i).clone();             CIMQualifier cimQualifier = cimProperty.getQualifier(i).clone();
  
             std::cout << "updating qualifier - " << cimQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "updating qualifier - " << cimQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newProperty.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));             newProperty.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));
         }         }
     }     }
  
     std::cout << newProperty.getName().getString() << " class origin = " << newProperty.getClassOrigin().getString() << std::endl;      PEGASUS_STD(cout) << newProperty.getName().getString() << " class origin = " << newProperty.getClassOrigin().getString() << PEGASUS_STD(endl);
  
     return(newProperty);     return(newProperty);
 } }
Line 159 
Line 159 
     const CIMParameter & cimParameter,     const CIMParameter & cimParameter,
     const Boolean includeQualifiers)     const Boolean includeQualifiers)
 { {
     std::cout << "_resolveParameter(" << referenceParameter.getName().getString() << ")" << std::endl;      PEGASUS_STD(cout) << "_resolveParameter(" << referenceParameter.getName().getString() << ")" << PEGASUS_STD(endl);
     std::cout << "flags :";      PEGASUS_STD(cout) << "flags :";
     std::cout << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");      PEGASUS_STD(cout) << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");
     std::cout << std::endl;      PEGASUS_STD(cout) << PEGASUS_STD(endl);
  
     CIMParameter newParameter;     CIMParameter newParameter;
  
Line 175 
Line 175 
     const Boolean includeQualifiers,     const Boolean includeQualifiers,
     const Boolean includeClassOrigin)     const Boolean includeClassOrigin)
 { {
     std::cout << "_resolveMethod(" << referenceMethod.getName().getString() << ")" << std::endl;      PEGASUS_STD(cout) << "_resolveMethod(" << referenceMethod.getName().getString() << ")" << PEGASUS_STD(endl);
     std::cout << "flags :";      PEGASUS_STD(cout) << "flags :";
     std::cout << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");      PEGASUS_STD(cout) << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");
     std::cout << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");      PEGASUS_STD(cout) << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");
     std::cout << std::endl;      PEGASUS_STD(cout) << PEGASUS_STD(endl);
  
     CIMMethod newMethod;     CIMMethod newMethod;
  
Line 194 
Line 194 
     const Boolean includeClassOrigin,     const Boolean includeClassOrigin,
     const CIMPropertyList & propertyList)     const CIMPropertyList & propertyList)
 { {
     std::cout << "_resolveClass(" << referenceClass.getClassName().getString() << " : " << referenceClass.getSuperClassName().getString() << ")" << std::endl;      PEGASUS_STD(cout) << "_resolveClass(" << referenceClass.getClassName().getString() << " : " << referenceClass.getSuperClassName().getString() << ")" << PEGASUS_STD(endl);
     std::cout << "flags :";      PEGASUS_STD(cout) << "flags :";
     std::cout << " localOnly = " << (localOnly == true ? "true" : "false");      PEGASUS_STD(cout) << " localOnly = " << (localOnly == true ? "true" : "false");
     std::cout << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");      PEGASUS_STD(cout) << " includeQualifiers = " << (includeQualifiers == true ? "true" : "false");
     std::cout << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");      PEGASUS_STD(cout) << " includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false");
     std::cout << std::endl;      PEGASUS_STD(cout) << PEGASUS_STD(endl);
  
     // get object path elements     // get object path elements
     String hostName = referenceClass.getPath().getHost();     String hostName = referenceClass.getPath().getHost();
Line 224 
Line 224 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier referenceQualifier = referenceClass.getQualifier(i).clone();             CIMQualifier referenceQualifier = referenceClass.getQualifier(i).clone();
  
             std::cout << "adding qualifier - " << referenceQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "adding qualifier - " << referenceQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newClass.addQualifier(referenceQualifier);             newClass.addQualifier(referenceQualifier);
         }         }
Line 248 
Line 248 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier cimQualifier = cimClass.getQualifier(i).clone();             CIMQualifier cimQualifier = cimClass.getQualifier(i).clone();
  
             std::cout << "updating qualifier - " << cimQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "updating qualifier - " << cimQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newClass.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));             newClass.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));
         }         }
Line 262 
Line 262 
  
         if(localOnly && (!superClassName.isNull()) && (!referenceProperty.getPropagated()))         if(localOnly && (!superClassName.isNull()) && (!referenceProperty.getPropagated()))
         {         {
             std::cout << "adding property - " << referenceProperty.getName().getString() << std::endl;              PEGASUS_STD(cout) << "adding property - " << referenceProperty.getName().getString() << PEGASUS_STD(endl);
  
             CIMProperty cimProperty = referenceClass.getProperty(i).clone();             CIMProperty cimProperty = referenceClass.getProperty(i).clone();
  
Line 270 
Line 270 
         }         }
         else         else
         {         {
             std::cout << "ignoring property - " << referenceProperty.getName().getString() << std::endl;              PEGASUS_STD(cout) << "ignoring property - " << referenceProperty.getName().getString() << PEGASUS_STD(endl);
         }         }
     }     }
  
Line 282 
Line 282 
  
         if(localOnly && (!superClassName.isNull()) && (!referenceMethod.getPropagated()))         if(localOnly && (!superClassName.isNull()) && (!referenceMethod.getPropagated()))
         {         {
             std::cout << "adding method - " << referenceMethod.getName().getString() << std::endl;              PEGASUS_STD(cout) << "adding method - " << referenceMethod.getName().getString() << PEGASUS_STD(endl);
  
             CIMMethod cimMethod = referenceClass.getMethod(i).clone();             CIMMethod cimMethod = referenceClass.getMethod(i).clone();
  
Line 290 
Line 290 
         }         }
         else         else
         {         {
             std::cout << "ignoring method - " << referenceMethod.getName().getString() << std::endl;              PEGASUS_STD(cout) << "ignoring method - " << referenceMethod.getName().getString() << PEGASUS_STD(endl);
         }         }
     }     }
  
Line 317 
Line 317 
             // ATTN: convert const property to non const             // ATTN: convert const property to non const
             CIMProperty cimProperty = cimClass.getProperty(i).clone();             CIMProperty cimProperty = cimClass.getProperty(i).clone();
  
             std::cout << "updating property - " << cimProperty.getName().getString() << std::endl;              PEGASUS_STD(cout) << "updating property - " << cimProperty.getName().getString() << PEGASUS_STD(endl);
  
             newClass.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));             newClass.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));
         }         }
Line 354 
Line 354 
     const Boolean includeClassOrigin,     const Boolean includeClassOrigin,
     const CIMPropertyList & propertyList)     const CIMPropertyList & propertyList)
 { {
     std::cout << "_resolveInstance()" << std::endl;      PEGASUS_STD(cout) << "_resolveInstance()" << PEGASUS_STD(endl);
  
     std::cout << "localOnly = " << (localOnly == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "localOnly = " << (localOnly == true ? "true" : "false") << PEGASUS_STD(endl);
     std::cout << "includeQualifiers = " << (includeQualifiers == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "includeQualifiers = " << (includeQualifiers == true ? "true" : "false") << PEGASUS_STD(endl);
     std::cout << "includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false") << PEGASUS_STD(endl);
  
     // get object path elements     // get object path elements
     String hostName = referenceInstance.getPath().getHost();     String hostName = referenceInstance.getPath().getHost();
Line 378 
Line 378 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier referenceQualifier = referenceInstance.getQualifier(i).clone();             CIMQualifier referenceQualifier = referenceInstance.getQualifier(i).clone();
  
             std::cout << "adding qualifier - " << referenceQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "adding qualifier - " << referenceQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newInstance.addQualifier(referenceQualifier);             newInstance.addQualifier(referenceQualifier);
         }         }
Line 402 
Line 402 
             // ATTN: convert const qualifier to non const             // ATTN: convert const qualifier to non const
             CIMQualifier cimQualifier = cimInstance.getQualifier(i).clone();             CIMQualifier cimQualifier = cimInstance.getQualifier(i).clone();
  
             std::cout << "updating qualifier - " << cimQualifier.getName().getString() << std::endl;              PEGASUS_STD(cout) << "updating qualifier - " << cimQualifier.getName().getString() << PEGASUS_STD(endl);
  
             newInstance.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));             newInstance.addQualifier(_resolveQualifier(referenceQualifier, cimQualifier));
         }         }
Line 415 
Line 415 
         CIMProperty referenceProperty = referenceInstance.getProperty(i).clone();         CIMProperty referenceProperty = referenceInstance.getProperty(i).clone();
         CIMProperty cimProperty = referenceInstance.getProperty(i).clone();         CIMProperty cimProperty = referenceInstance.getProperty(i).clone();
  
         std::cout << "adding property - " << referenceProperty.getName().getString() << std::endl;          PEGASUS_STD(cout) << "adding property - " << referenceProperty.getName().getString() << PEGASUS_STD(endl);
  
         newInstance.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));         newInstance.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));
     }     }
Line 438 
Line 438 
         // ATTN: convert const property to non const         // ATTN: convert const property to non const
         CIMProperty cimProperty = cimInstance.getProperty(i).clone();         CIMProperty cimProperty = cimInstance.getProperty(i).clone();
  
         std::cout << "updating property - " << cimProperty.getName().getString() << std::endl;          PEGASUS_STD(cout) << "updating property - " << cimProperty.getName().getString() << PEGASUS_STD(endl);
  
         newInstance.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));         newInstance.addProperty(_resolveProperty(referenceProperty, cimProperty, includeQualifiers, includeClassOrigin));
     }     }
Line 480 
Line 480 
     const Boolean includeClassOrigin,     const Boolean includeClassOrigin,
     const CIMPropertyList & propertyList)     const CIMPropertyList & propertyList)
 { {
     std::cout << "_resolveIndication()" << std::endl;      PEGASUS_STD(cout) << "_resolveIndication()" << PEGASUS_STD(endl);
  
     CIMNamespaceName nameSpace = referenceIndication.getPath().getNameSpace();     CIMNamespaceName nameSpace = referenceIndication.getPath().getNameSpace();
     CIMName className = referenceIndication.getPath().getClassName();     CIMName className = referenceIndication.getPath().getClassName();
  
     std::cout << "localOnly = " << (localOnly == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "localOnly = " << (localOnly == true ? "true" : "false") << PEGASUS_STD(endl);
     std::cout << "includeQualifiers = " << (includeQualifiers == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "includeQualifiers = " << (includeQualifiers == true ? "true" : "false") << PEGASUS_STD(endl);
     std::cout << "includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false") << std::endl;      PEGASUS_STD(cout) << "includeClassOrigin = " << (includeClassOrigin == true ? "true" : "false") << PEGASUS_STD(endl);
  
     CIMIndication newIndication;     CIMIndication newIndication;
  
Line 499 
Line 499 
     const CIMMethod & cimMethod,     const CIMMethod & cimMethod,
     const Uint32 flags)     const Uint32 flags)
 { {
     std::cout << "_resolveMethod()" << std::endl;      PEGASUS_STD(cout) << "_resolveMethod()" << PEGASUS_STD(endl);
  
     CIMMethod newMethod;     CIMMethod newMethod;
  
Line 511 
Line 511 
     const CIMParameter & cimParameter,     const CIMParameter & cimParameter,
     const Uint32 flags)     const Uint32 flags)
 { {
     std::cout << "_resolveParameter()" << std::endl;      PEGASUS_STD(cout) << "_resolveParameter()" << PEGASUS_STD(endl);
  
     CIMParameter newParameter;     CIMParameter newParameter;
  
Line 529 
Line 529 
     const Boolean includeClassOrigin,     const Boolean includeClassOrigin,
     const CIMPropertyList & propertyList)     const CIMPropertyList & propertyList)
 { {
     std::cout << "ObjectNormalizer::resolveClass()" << std::endl;      PEGASUS_STD(cout) << "ObjectNormalizer::resolveClass()" << PEGASUS_STD(endl);
  
     CIMNamespaceName nameSpace = cimClass.getPath().getNameSpace();     CIMNamespaceName nameSpace = cimClass.getPath().getNameSpace();
     CIMName className = cimClass.getPath().getClassName();     CIMName className = cimClass.getPath().getClassName();
Line 583 
Line 583 
     const Boolean includeClassOrigin,     const Boolean includeClassOrigin,
     const CIMPropertyList & propertyList)     const CIMPropertyList & propertyList)
 { {
     std::cout << "ObjectNormalizer::resolveInstances()" << std::endl;      PEGASUS_STD(cout) << "ObjectNormalizer::resolveInstances()" << PEGASUS_STD(endl);
  
     // TODO: ensure array is not empty     // TODO: ensure array is not empty
     // TODO: ensure objects in the array are initialized     // TODO: ensure objects in the array are initialized

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2