/[pspp]/pspp/src/descript.c
ViewVC logotype

Diff of /pspp/src/descript.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11 by jmd, Fri Apr 29 01:02:14 2005 UTC revision 1.12 by blp, Mon May 2 06:21:20 2005 UTC
# Line 120  static const struct dsc_statistic_info d Line 120  static const struct dsc_statistic_info d
120  struct dsc_var  struct dsc_var
121    {    {
122      struct variable *v;         /* Variable to calculate on. */      struct variable *v;         /* Variable to calculate on. */
123      char z_name[SHORT_NAME_LEN + 1];/* Name for z-score variable. */      char z_name[LONG_NAME_LEN + 1]; /* Name for z-score variable. */
124      double valid, missing;      /* Valid, missing counts. */      double valid, missing;      /* Valid, missing counts. */
125      struct moments *moments;    /* Moments. */      struct moments *moments;    /* Moments. */
126      double min, max;            /* Maximum and mimimum values. */      double min, max;            /* Maximum and mimimum values. */
# Line 465  try_name (struct dsc_proc *dsc, char *na Line 465  try_name (struct dsc_proc *dsc, char *na
465    if (dict_lookup_var (default_dict, name) != NULL)    if (dict_lookup_var (default_dict, name) != NULL)
466      return 0;      return 0;
467    for (i = 0; i < dsc->var_cnt; i++)    for (i = 0; i < dsc->var_cnt; i++)
468      if (!strcmp (dsc->vars[i].z_name, name))      if (!strcasecmp (dsc->vars[i].z_name, name))
469        return 0;        return 0;
470    return 1;    return 1;
471  }  }
# Line 478  static int Line 478  static int
478  generate_z_varname (struct dsc_proc *dsc, char *z_name,  generate_z_varname (struct dsc_proc *dsc, char *z_name,
479                      const char *var_name, int *z_cnt)                      const char *var_name, int *z_cnt)
480  {  {
481    char name[10];    char name[LONG_NAME_LEN + 1];
482    
483    /* Try a name based on the original variable name. */    /* Try a name based on the original variable name. */
484    name[0] = 'Z';    name[0] = 'Z';
485    strcpy (name + 1, var_name);    st_trim_copy (name + 1, var_name, sizeof name - 1);
   name[SHORT_NAME_LEN] = '\0';  
486    if (try_name (dsc, name))    if (try_name (dsc, name))
487      {      {
488        strcpy (z_name, name);        strcpy (z_name, name);
# Line 925  descriptives_compare_dsc_vars (const voi Line 924  descriptives_compare_dsc_vars (const voi
924    int result;    int result;
925    
926    if (dsc->sort_by_stat == DSC_NAME)    if (dsc->sort_by_stat == DSC_NAME)
927      result = strcmp (a->v->name, b->v->name);      result = strcasecmp (a->v->name, b->v->name);
928    else    else
929      {      {
930        double as = a->stats[dsc->sort_by_stat];        double as = a->stats[dsc->sort_by_stat];

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26