Best input method to log usage

Hi All,

I have emoncms logging my energy pulse meter output perfectly ok, but I recently got an Aeon Labs Z-Stick S2 and a GreenWave PowerNode 6 port switch.  Using the python openwave api I can query the state of each switch, and I want to log each one individually to it's own feed.

The problem I have is that the switch data returned is current Power (in W) and accumulated kWh.  If I query just power every minute or so, then I risk missing out on power spikes, so I also want to cater for the kWh measurement too.

Here's the thing:  The kWh value reported is the *total* energy used, ever (as far as I can see), so each time I query it, it'll respond with something like:

"2": {
      "Power": "0.0 W",
      "nicename": "Loeplamp",
      "Previous Reading": "0.0399999991059 kWh",
      "Energy": "0.0399999991059 kWh",
      "Interval": "9 seconds",
      "instance": "0161de41.3.25.2.0",
      "switch": true,
      "Exporting": "False "
    },

If the lamp is off, every time I query I get the same "Energy" (kWh) value - so I can't use an accumulator here and most of the other inputs are about increasing or difference values, which I don't have.

What would be the best input type to go for here?  Do I need to write my own? :)

Thanks

D.