diff --git a/cloud/websites/docs.gridlabd.us/index.html b/cloud/websites/docs.gridlabd.us/index.html index fef43042b..39ca74a46 100644 --- a/cloud/websites/docs.gridlabd.us/index.html +++ b/cloud/websites/docs.gridlabd.us/index.html @@ -1,9 +1,15 @@ - - - - -Redirecting to http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd... - - \ No newline at end of file + + + + diff --git a/converters/xlsx-spida2csv-geodata.py b/converters/xlsx-spida2csv-geodata.py index 10a2c39c6..814a49b7a 100644 --- a/converters/xlsx-spida2csv-geodata.py +++ b/converters/xlsx-spida2csv-geodata.py @@ -119,10 +119,13 @@ def convert(input_files, output_file, options={}): # Read all the sheets in the .xlxs file file_extension = input_pole_file.split(".")[-1] if file_extension == 'xlsx': - df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[ - 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length', - 'AS-IS Class', 'AS-IS Allowable Stress Adjustment', - 'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point'], engine='openpyxl') + df = pd.read_excel(input_pole_file, sheet_name=0, engine='openpyxl') + df.columns = [col.replace("_x0020_", " ") for col in df.columns] + desired_columns = [ + 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length', + 'AS-IS Class', 'AS-IS Allowable Stress Adjustment', + 'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point'] + df = df[desired_columns] elif file_extension == 'xls': df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[ 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length', diff --git a/source/version.h b/source/version.h index 483eed1fc..ea676946d 100644 --- a/source/version.h +++ b/source/version.h @@ -11,7 +11,7 @@ #define REV_MAJOR 4 #define REV_MINOR 3 -#define REV_PATCH 5 +#define REV_PATCH 6 #ifdef HAVE_CONFIG_H #include "config.h"