From fcf736f99006b275b0db0c1fbe40df858f8403a1 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Wed, 22 Aug 2007 20:06:47 +0000 Subject: [PATCH] Some bug fixes. The fixes to scatterplot and cor code will eventually be replaced with a new approach to building column select lists. --- tools/plotting/scatterplot_code.py | 5 ++++- tools/stats/cor_code.py | 5 ++++- tools/stats/gsummary.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/plotting/scatterplot_code.py b/tools/plotting/scatterplot_code.py index ce0b42f775c..a8797292612 100644 --- a/tools/plotting/scatterplot_code.py +++ b/tools/plotting/scatterplot_code.py @@ -18,10 +18,13 @@ def get_columns( input ): for col in range(1, input.metadata.columns+1): try: val = float(elems[col-1]) + valid = True except: val = elems[col-1] if val: - if val.strip().lower() != "na": + if val.strip().lower() == "na": + valid = True + else: valid = False else: valid = False diff --git a/tools/stats/cor_code.py b/tools/stats/cor_code.py index ce0b42f775c..a8797292612 100644 --- a/tools/stats/cor_code.py +++ b/tools/stats/cor_code.py @@ -18,10 +18,13 @@ def get_columns( input ): for col in range(1, input.metadata.columns+1): try: val = float(elems[col-1]) + valid = True except: val = elems[col-1] if val: - if val.strip().lower() != "na": + if val.strip().lower() == "na": + valid = True + else: valid = False else: valid = False diff --git a/tools/stats/gsummary.py b/tools/stats/gsummary.py index 143d3fcb317..86b9955f033 100755 --- a/tools/stats/gsummary.py +++ b/tools/stats/gsummary.py @@ -143,7 +143,7 @@ def read_table(datafile, cols): try: exec code except Exception, e: - stop_err(e) + stop_err(str(e)) return (skipped_lines, first_invalid_line, d) else: return (skipped_lines, first_invalid_line, None)