sblim-commit

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/wbemcli
In directory vz-cvs-3.sog:/tmp/cvs-serv14319

Modified Files:
	ChangeLog CimXml.cpp NEWS 
Log Message:
Fixed 3519016: wbemcli does not support EmbeddedObject attr of PARAMVALUE

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- NEWS	17 Apr 2012 16:17:02 -0000	1.42
+++ NEWS	18 Apr 2012 04:52:16 -0000	1.43
@@ -2,6 +2,7 @@
 ========================
 
 Bugs:
+- 3519016 wbemcli does not support EmbeddedObject attr of PARAMVALUE
 - 3514126 wbemcli does not compile with GCC 4.7
 - 3324380 support optional CIMType in KEYVALUE element
 - 3216622 wbemcli throws parser error on CDATA string value

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	17 Apr 2012 16:17:02 -0000	1.36
+++ ChangeLog	18 Apr 2012 04:52:16 -0000	1.37
@@ -1,3 +1,9 @@
+2012-04-18 Dave Heller <hel...@us...>
+
+	* CimXml.cpp, NEWS:
+
+	Fixed 3519016: wbemcli does not support EmbeddedObject attr of PARAMVALUE
+
 2012-04-17 Dave Heller <hel...@us...>
 
 	* CimXml.h, CimCurl.cpp, NEWS, contributions.txt:

Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- CimXml.cpp	22 Jun 2011 05:58:39 -0000	1.71
+++ CimXml.cpp	18 Apr 2012 04:52:16 -0000	1.72
@@ -960,10 +960,14 @@
     sb += ": ";
     rvl->getReturnData()->toStringBuffer(sb,q);
   }
-  if (useNl) sb += "\n";
-  else sb += " ";
-  if (pvll) {
-    pvll->toStringBuffer(sb,q);
+  char *sep;
+  if (useNl) sep = (char*)"\n";
+  else sep = (char*)", ";
+  // This ensures separators are properly printed. Only print sep after rvl if
+  // more data is to follow, and pass the proper separator to the method call.
+  if (pvll && !pvll->empty()) {
+    sb += sep;
+    pvll->toStringBuffer(sb,sep,q);
   }
 }
 
@@ -1673,9 +1677,10 @@
 bool ParamvalueXml::initialized(false);
 
 void ParamvalueXml::initialize() {
-  elm.attr = StringArray(2);
+  elm.attr = StringArray(3);
   elm.attr[0] = string("NAME");
   elm.attr[1] = string("PARAMTYPE");
+  elm.attr[2] = string("EmbeddedObject");
   initialized=true;
 }
 
@@ -1701,7 +1706,7 @@
    if (!initialized) initialize();
    XmlAttr attr;
    attr.eTagFound = 0;
-   attr.attr=StringArray(2);
+   attr.attr=StringArray(3);
    char *tag;
 
    if (xb.tagEquals("PARAMVALUE")) {
@@ -1726,7 +1731,8 @@
 void ParamvalueXml::toStringBuffer(string &sb, const char *q)
 {
   sb += name;
-  sb += ":";
+  sb += " (" + type + ")";
+  sb += ": ";
   sb += q;
   if (val) val->toStringBuffer(sb,q);
 }