shared/net/tz/spss/SpssValue.scala
changeset 5 44aad285dc66
parent 2 7461111ce9ed
--- a/shared/net/tz/spss/SpssValue.scala	Thu Sep 19 12:49:03 2019 +0200
+++ b/shared/net/tz/spss/SpssValue.scala	Thu Sep 19 13:00:31 2019 +0200
@@ -1,7 +1,5 @@
 package net.tz.spss
 
-import com.bedatadriven.spss.SpssDataFileReader
-
 sealed trait SpssValue
 
 sealed trait Missing extends SpssValue
@@ -17,17 +15,3 @@
 case object SystemMissing extends Missing
 // ??? case class MissingString(v: String) extends MissingValue[String]
 case class MissingDouble(v: Double) extends MissingValue[Double]
-
-object SpssValue {
-
-  def apply(r: SpssDataFileReader, variable: SpssVariable): SpssValue = {
-    val i = variable.index
-    if (r.isSystemMissing(i))
-      SystemMissing
-    else
-      Option(r.getDoubleValue(i)) map(x =>
-        if (r.isValueMissing(i, x)) MissingDouble(x) else DoubleValue(x)
-        ) orElse (Option(r.getStringValue(i)) map StringValue
-        ) getOrElse SystemMissing
-  }
-}