deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added parsing of COOJA logs

Browse source
This commit is contained in:
nifi 2010-10-07 21:01:46 +00:00
parent 54692bf62a
commit 20e04b5c23
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
examples/sky-shell/src/se/sics/contiki/collect/SensorData.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: SensorData.java,v 1.10 2010/09/30 23:09:25 adamdunkels Exp $ * $Id: SensorData.java,v 1.11 2010/10/07 21:01:46 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/09/30 23:09:25 $ * Updated : $Date: 2010/10/07 21:01:46 $
* $Revision: 1.10 $ * $Revision: 1.11 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -118,9 +118,22 @@ public class SensorData implements SensorInfo {
} }
public static SensorData parseSensorData(CollectServer server, String line, long systemTime) { public static SensorData parseSensorData(CollectServer server, String line, long systemTime) {
String[] components = line.trim().split(" "); String[] components = line.trim().split("[ \t]+");
if (components.length == SensorData.VALUES_COUNT + 1) { // Check if COOJA log
// Sensor data with system time if (components.length == VALUES_COUNT + 2 && components[1].startsWith("ID:")) {
if (!components[2].equals("" + VALUES_COUNT)) {
// Ignore non sensor data
return null;
}
try {
systemTime = Long.parseLong(components[0]);
components = Arrays.copyOfRange(components, 2, components.length);
} catch (NumberFormatException e) {
// First column does not seem to be system time
}
} else if (components[0].length() > 8) {
// Sensor data prefixed with system time
try { try {
systemTime = Long.parseLong(components[0]); systemTime = Long.parseLong(components[0]);
components = Arrays.copyOfRange(components, 1, components.length); components = Arrays.copyOfRange(components, 1, components.length);