From cfb95004ad55f9889425c80b46d789e9835c8aa1 Mon Sep 17 00:00:00 2001 From: Xiaming Chen Date: Mon, 28 Dec 2015 15:01:19 +0800 Subject: [PATCH] Fix bug of merge_session timestamps --- .../scala/cn/edu/sjtu/omnilab/odh/spark/MergeWifiSession.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etlers/WifiToolkit/src/main/scala/cn/edu/sjtu/omnilab/odh/spark/MergeWifiSession.scala b/etlers/WifiToolkit/src/main/scala/cn/edu/sjtu/omnilab/odh/spark/MergeWifiSession.scala index 3d7c954..7645cbf 100644 --- a/etlers/WifiToolkit/src/main/scala/cn/edu/sjtu/omnilab/odh/spark/MergeWifiSession.scala +++ b/etlers/WifiToolkit/src/main/scala/cn/edu/sjtu/omnilab/odh/spark/MergeWifiSession.scala @@ -1,6 +1,7 @@ package cn.edu.sjtu.omnilab.odh.spark import cn.edu.sjtu.omnilab.odh.rawfilter.{APToBuilding, WIFICode} +import cn.edu.sjtu.omnilab.odh.utils.Utils import org.apache.commons.lang.StringUtils import org.apache.spark.{SparkContext, SparkConf} import org.apache.spark.SparkContext._ // to use join etc. @@ -67,7 +68,7 @@ object MergeWifiSession { CleanWIFILog( MAC = parts(0), - time = parts(1).toLong, + time = Utils.ISOToUnix(parts(1)), code = parts(2).toInt, payload = parts(3) )