refactoring

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 7f5ac97f8bb9de9b0f2aac8a059aec589c4e481c..ff8f1abbc0a6f0f95b7f8a3b40f620507b0f8a37 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4697,27 +4697,12 @@ ctables_prepare_table (struct ctables_table *t)
                     && t->clabels_from_axis != PIVOT_AXIS_LAYER
                     && t->clabels_to_axis != PIVOT_AXIS_LAYER)
                   n_drop = a == t->clabels_from_axis ? 2 : 0;
-                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                else if (at == CTAT_SUBTABLE
+                         && t->clabels_from_axis != PIVOT_AXIS_LAYER
+                         && t->clabels_to_axis == PIVOT_AXIS_LAYER)
                   {
-                    if (a == PIVOT_AXIS_COLUMN)
-                      n_drop = 1;
-                    else
-                      {
-                        if (a == PIVOT_AXIS_ROW)
-                          drop_inner = true;
-                        n_drop = 0;
-                      }
-                  }
-                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                  {
-                    if (a == PIVOT_AXIS_ROW)
-                      n_drop = 1;
-                    else
-                      {
-                        if (a == PIVOT_AXIS_COLUMN)
-                          drop_inner = true;
-                        n_drop = 0;
-                      }
+                    drop_inner = a == t->clabels_from_axis;
+                    n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
                   }
                 else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   n_drop = 0;