version 1.1.1.2, 2000/01/22 14:15:57 |
version 1.1.1.3, 2003/09/15 07:09:24 |
Line 253 static char *df_gets() |
|
Line 253 static char *df_gets() |
|
{ |
{ |
int len = 0; |
int len = 0; |
|
|
|
/* HBB 20000526: prompt user for inline data, if in interactive mode */ |
|
if (mixed_data_fp && interactive) |
|
fputs("input data ('e' ends) > ", stderr); |
|
|
if (!fgets(line, max_line_len, data_fp)) |
if (!fgets(line, max_line_len, data_fp)) |
return NULL; |
return NULL; |
|
|
|
|
/* |
/* |
* optimizations by Corey Satten, corey@cac.washington.edu |
* optimizations by Corey Satten, corey@cac.washington.edu |
*/ |
*/ |
if (fast_columns == 0 || |
|
df_no_use_specs > 0 && (use_spec[0].column == dfncp1 || |
if ((fast_columns == 0) |
df_no_use_specs > 1 && (use_spec[1].column == dfncp1 || |
|| (df_no_use_specs == 0) |
df_no_use_specs > 2 && (use_spec[2].column == dfncp1 || |
|| ((df_no_use_specs > 0) |
df_no_use_specs > 3 && (use_spec[3].column == dfncp1 || |
&& (use_spec[0].column == dfncp1 |
df_no_use_specs > 4 && (use_spec[4].column == dfncp1 || |
|| (df_no_use_specs > 1 |
df_no_use_specs > 5))))) || |
&& (use_spec[1].column == dfncp1 |
df_no_use_specs == 0) { |
|| (df_no_use_specs > 2 |
|
&& (use_spec[2].column == dfncp1 |
|
|| (df_no_use_specs > 3 |
|
&& (use_spec[3].column == dfncp1 |
|
|| (df_no_use_specs > 4 && (use_spec[4].column == dfncp1 || df_no_use_specs > 5) |
|
) |
|
) |
|
) |
|
) |
|
) |
|
) |
|
) |
|
) |
|
) |
|
) { |
|
|
#ifndef NO_FORTRAN_NUMS |
#ifndef NO_FORTRAN_NUMS |
count = sscanf(s, "%lf%n", &df_column[df_no_cols].datum, &used); |
count = sscanf(s, "%lf%n", &df_column[df_no_cols].datum, &used); |