[Sblim-commit] wbemcli ChangeLog,1.3,1.4 CimXml.cpp,1.37,1.38 NEWS,1.3,1.4 configure.ac,1.9,1.10

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/wbemcli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13563

Modified Files:
	ChangeLog CimXml.cpp NEWS configure.ac 
Log Message:
Bugs fixed: incorrect key type classification.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NEWS	12 May 2005 09:05:17 -0000	1.3
+++ NEWS	1 Jun 2005 10:57:05 -0000	1.4
@@ -1,5 +1,10 @@
 SBLIM WBEMCLI NEWS
 
+Changes in Version 1.4.11
+=========================
+Bugs:
+- 1184528 Fix key type recognition.
+
 Changes in Version 1.4.10
 =========================
 Bugs:

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/wbemcli/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	12 May 2005 09:05:17 -0000	1.9
+++ configure.ac	1 Jun 2005 10:57:05 -0000	1.10
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(SBLIM WBEMCLI, 1.4.10, sbl...@li...)
+AC_INIT(SBLIM WBEMCLI, 1.4.10a, sbl...@li...)
 AC_CONFIG_SRCDIR([CimXml.cpp])
 AC_CANONICAL_HOST
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	12 May 2005 09:05:17 -0000	1.3
+++ ChangeLog	1 Jun 2005 10:57:05 -0000	1.4
@@ -1,3 +1,10 @@
+2005-06-01    <mih...@dy...>
+
+	* CimXml.cpp (toStringBuffer): 
+	Bug 1184528: determine the type (string, numeric, boolean)
+	of key properties by the format of the value and generate
+	keybindings accordingly.
+
 2005-05-12    <mih...@dy...>
 
 	* CimCurl.cpp: 

Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- CimXml.cpp	6 Dec 2004 17:08:47 -0000	1.37
+++ CimXml.cpp	1 Jun 2005 10:57:05 -0000	1.38
@@ -20,8 +20,6 @@
  * Description: Line command interface to DMTF conforming WBEM servers
 */
 
-#define PEGASUS_CONFORM
-
 #include "CimXml.h"
 #include <iostream>
 #include <cstdlib>
@@ -1619,9 +1617,20 @@
    name=string(n,p-n);
    p++;
    value=Option<ValueXml>(ValueXml(p));
-   if (strcasecmp(p,"true")==0 || strcasecmp(p,"false")==0) type="boolean";
-   else if (isdigit(*p)) type="numeric";
-   else type="string";
+   if (strcasecmp(p,"true")==0 || strcasecmp(p,"false")==0) {
+     type="boolean";
+   } else if (*p=='+' || * p=='-' || isdigit(*p)) {
+     type="numeric";   
+     int i=1;
+     while (p[i]) {
+       if (!isdigit(p[i++])) {
+	 type="string";
+	 break;
+       }
+     }
+   } else {
+     type="string";
+   }
 }
 
 void PropertyXml::toStringBuffer(string &sb, char *q)
@@ -2566,7 +2575,7 @@
 
          }
          else {
-#ifdef PEGASUS_CONFORM
+#ifdef OLD_PEGASUS_CONFORM
             sb = sb + "<KEYVALUE VALUETYPE=\"" + "string" + "\">" + p.value.val().getValue() + "</KEYVALUE>";
 #else
             sb = sb + "<KEYVALUE VALUETYPE=\"" + p.type + "\">" + p.value.val().getValue() + "</KEYVALUE>";
@@ -2584,7 +2593,7 @@
 	 }
 	 else {
             sb = sb + "<KEYBINDING NAME=\"" + p.name + "\">";
-#ifdef PEGASUS_CONFORM
+#ifdef OLD_PEGASUS_CONFORM
             sb = sb + "<KEYVALUE VALUETYPE=\"" + "string" + "\">" + p.value.val().getValue() + "</KEYVALUE>";
 #else
             sb = sb + "<KEYVALUE VALUETYPE=\"" + p.type + "\">" + p.value.val().getValue() + "</KEYVALUE>";