[Omc-commit] SF.net SVN: omc:[805] cmpi-bindings

[<ba...@us...>]

Revision: 805
          http://omc.svn.sourceforge.net/omc/?rev=805&view=rev
Author:   bartw
Date:     2008-07-31 20:23:10 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
fixed types on null properties

Modified Paths:
--------------
    cmpi-bindings/TODO
    cmpi-bindings/src/cmpi_provider.c
    cmpi-bindings/swig/python/pycmpi_provider.py

Modified: cmpi-bindings/TODO
===================================================================
--- cmpi-bindings/TODO	2008-07-31 19:23:21 UTC (rev 804)
+++ cmpi-bindings/TODO	2008-07-31 20:23:10 UTC (rev 805)
@@ -2,8 +2,6 @@
 brokerEncFT, and which are created with clone().  We have to release the 
 later, not the former. 
 
-Setting NULL property values currently doesn't work. 
-
 Fix memory leaks related to cloning of CMPIData structs. 
 
 Items marked as "TODO" in the code. 
@@ -23,7 +21,7 @@
 [Not possible to pass status+message in a generic way. How about a
 toplevel function which raised the execption ?]
 
+Split src/ into target-specific and common parts
 
-Python error traceback overflows sfcb <ERROR DESCRIPTION="..."/> buffer
+Wrap CMPIEnumeration and CMPIArray in typemaps. 
 
-Split src/ into target-specific and common parts
\ No newline at end of file

Modified: cmpi-bindings/src/cmpi_provider.c
===================================================================
--- cmpi-bindings/src/cmpi_provider.c	2008-07-31 19:23:21 UTC (rev 804)
+++ cmpi-bindings/src/cmpi_provider.c	2008-07-31 20:23:10 UTC (rev 805)
@@ -1069,7 +1069,7 @@
    	CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
    
 #ifdef SWIGPYTHON
-    _SBLIM_TRACE(1,("references(Python) called, ctx %p, rslt %p, objName %p, role %s, resultRole %s, properties %p", ctx, rslt, objName, resultClass, role, properties));
+    _SBLIM_TRACE(1,("references(Python) called, ctx %p, rslt %p, objName %p, resultClass %s, role %s, properties %p", ctx, rslt, objName, resultClass, role, properties));
 
 	PY_CMPI_INIT
 
@@ -1399,7 +1399,7 @@
 	ExecQuery, 
 }; 
 
-static int createInit(const CMPIBroker* broker, 
+static void createInit(const CMPIBroker* broker, 
 		const CMPIContext* context, const char* miname, CMPIStatus* st)
 {
    _BROKER = broker;

Modified: cmpi-bindings/swig/python/pycmpi_provider.py
===================================================================
--- cmpi-bindings/swig/python/pycmpi_provider.py	2008-07-31 19:23:21 UTC (rev 804)
+++ cmpi-bindings/swig/python/pycmpi_provider.py	2008-07-31 20:23:10 UTC (rev 805)
@@ -117,10 +117,17 @@
         self.env = ProviderEnvironment(self.broker)
         self.proxy = ProviderProxy(self.env, 
                 '/usr/lib/pycim/'+miname+'.py')
+        broker = cmpi.CMPIBroker()
+        print '*** broker.name()', broker.name()
+        print '*** broker.capabilities()', broker.capabilities()
+        print '*** broker.version()', broker.version()
+        broker.LogMessage(1, 'LogID', 
+                '** This should go through broker.LogMessage()')
 
     def enum_instance_names(self, ctx, rslt, objname):
         print 'provider.py: In enum_instance_names()' 
         #test_conversions()
+
         
         op = cmpi2pywbem_instname(objname)
         conn = SFCBUDSConnection()
@@ -375,7 +382,8 @@
     
 def pywbem2cmpi_value(pdata, _type=None, cval=None):
     if pdata is None:
-        return None, 'sint32'
+        assert(_type is not None)
+        return None, _type
     is_array = isinstance(pdata, list)
     if _type is None:
         if isinstance(pdata, pywbem.CIMInstanceName):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.