Merge pull request #77 from /issues/76/colorder

Issue 76: preserve column order from the columns option
astrolabsoftware · May 15, 2019 · 24dd75d · 24dd75d
2 parents 7aa656b + b299cdd
commit 24dd75d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/scala/com/astrolabsoftware/sparkfits/FitsHduBintable.scala b/src/main/scala/com/astrolabsoftware/sparkfits/FitsHduBintable.scala
@@ -46,8 +46,12 @@ object FitsHduBintable {
       colNames.values.toList.asInstanceOf[List[String]]
     }
 
-    val colPositions = selectedColNames.map(
-      x => getColumnPos(keyValues, x)).toList.sorted
+    val colPositions = if (selectedColumns != null) {
+      selectedColNames.map(x => getColumnPos(keyValues, x)).toList
+    } else {
+      selectedColNames.map(x => getColumnPos(keyValues, x)).toList.sorted
+    }
+
 
     val rowTypes = getColTypes(keyValues)