You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "error.h"
#include "value-labels.h"
#include "var.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* Constants for DISPLAY utility. */
enum
{
AS_VECTOR
};
-int describe_variable (struct variable *v, struct tab_table *t, int r, int as);
+static int describe_variable (struct variable *v, struct tab_table *t, int r, int as);
/* Sets the widths of all the columns and heights of all the rows in
table T for driver D. */
tab_submit (t);
nr = 1 + 2 * dict_get_var_cnt (d);
+
t = tab_create (4, nr, 1);
tab_dim (t, sysfile_info_dim);
tab_headers (t, 0, 0, 1, 0);
for (r = 1, i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *v = dict_get_var (d, i);
- int nvl = val_labs_count (v->val_labs);
+ const int nvl = val_labs_count (v->val_labs);
if (r + 10 + nvl > nr)
{
r = describe_variable (v, t, r, AS_DICTIONARY);
}
+
tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, r);
- tab_vline (t, TAL_1, 0, 0, r);
tab_vline (t, TAL_1, 1, 0, r);
tab_vline (t, TAL_1, 3, 0, r);
+
tab_resize (t, -1, r);
tab_flags (t, SOMF_NO_TITLE);
tab_submit (t);
/* Puts a description of variable V into table T starting at row R.
The variable will be described in the format AS. Returns the next
row available for use in the table. */
-int
+static int
describe_variable (struct variable *v, struct tab_table *t, int r, int as)
{
/* Put the name, var label, and position into the first row. */
}
/* Missing values if any. */
- if (v->miss_type != MISSING_NONE)
+ if (!mv_is_empty (&v->miss))
{
- char buf[80];
- char *cp = stpcpy (buf, _("Missing Values: "));
-
- if (v->type == NUMERIC)
- switch (v->miss_type)
- {
- case MISSING_1:
- sprintf (cp, "%g", v->missing[0].f);
- break;
- case MISSING_2:
- sprintf (cp, "%g; %g", v->missing[0].f, v->missing[1].f);
- break;
- case MISSING_3:
- sprintf (cp, "%g; %g; %g", v->missing[0].f,
- v->missing[1].f, v->missing[2].f);
- break;
- case MISSING_RANGE:
- sprintf (cp, "%g THRU %g", v->missing[0].f, v->missing[1].f);
- break;
- case MISSING_LOW:
- sprintf (cp, "LOWEST THRU %g", v->missing[0].f);
- break;
- case MISSING_HIGH:
- sprintf (cp, "%g THRU HIGHEST", v->missing[0].f);
- break;
- case MISSING_RANGE_1:
- sprintf (cp, "%g THRU %g; %g",
- v->missing[0].f, v->missing[1].f, v->missing[2].f);
- break;
- case MISSING_LOW_1:
- sprintf (cp, "LOWEST THRU %g; %g",
- v->missing[0].f, v->missing[1].f);
- break;
- case MISSING_HIGH_1:
- sprintf (cp, "%g THRU HIGHEST; %g",
- v->missing[0].f, v->missing[1].f);
- break;
- default:
- assert (0);
- }
- else
- {
- int i;
-
- for (i = 0; i < v->miss_type; i++)
- {
- if (i != 0)
- cp = stpcpy (cp, "; ");
- *cp++ = '"';
- memcpy (cp, v->missing[i].s, v->width);
+ char buf[128];
+ char *cp;
+ struct missing_values mv;
+ int cnt = 0;
+
+ cp = stpcpy (buf, _("Missing Values: "));
+ mv_copy (&mv, &v->miss);
+ if (mv_has_range (&mv))
+ {
+ double x, y;
+ mv_pop_range (&mv, &x, &y);
+ if (x == LOWEST)
+ cp += nsprintf (cp, "LOWEST THRU %g", y);
+ else if (y == HIGHEST)
+ cp += nsprintf (cp, "%g THRU HIGHEST", x);
+ else
+ cp += nsprintf (cp, "%g THRU %g", x, y);
+ cnt++;
+ }
+ while (mv_has_value (&mv))
+ {
+ union value value;
+ mv_pop_value (&mv, &value);
+ if (cnt++ > 0)
+ cp += nsprintf (cp, "; ");
+ if (v->type == NUMERIC)
+ cp += nsprintf (cp, "%g", value.f);
+ else
+ {
+ *cp++ = '"';
+ memcpy (cp, value.s, v->width);
cp += v->width;
*cp++ = '"';
- }
- *cp = 0;
- }
+ *cp = '\0';
+ }
+ }
tab_joint_text (t, 1, r, 2, r, TAB_LEFT, buf);
r++;
struct vector *a = *pa;
struct vector *b = *pb;
- return strcmp (a->name, b->name);
+ return strcasecmp (a->name, b->name);
}
/* Display a list of vectors. If SORTED is nonzero then they are
free (vl);
}
+
+
+
+
+
+
+
+
+
+
+