Release 4.3.6 (#167)

Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu> Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com> Co-authored-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
arras-energy · Feb 17, 2024 · abf328d · abf328d
1 parent 806435b
commit abf328d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/cloud/websites/docs.gridlabd.us/index.html b/cloud/websites/docs.gridlabd.us/index.html
@@ -1,9 +1,15 @@
 <!DOCTYPE HTML />
 <HTML>
-<HEAD>
-<META HTTP-EQUIV="refresh" CONTENT="0,url=http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd" />
-</HEAD>
-<BODY>
-Redirecting to <A HREF="http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd">http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd</A>...
-</BODY>
-</HTML>
+<SCRIPT LANGUAGE="Javascript" SRC="_defaults.js"></SCRIPT>
+<SCRIPT LANGUAGE="JavaScript">
+	document.writeln('<FRAMESET ROWS="' + (top_panel_height+20) + ',*" BORDER=2>');
+    console.info(window.location.search)
+    document.writeln('<FRAME SRC="_topbar.html" NORESIZE="noresize"></FRAME>');
+    document.writeln('<FRAMESET COLS="320,*" BORDER=3>');
+    document.writeln('<FRAME NAME="contents" SRC="_contents.html' + window.location.search + '"></FRAME>');
+	document.writeln('<FRAME NAME="page" SRC="_page.html' + window.location.search + '"></FRAME>');
+    document.writeln('</FRAMESET>');
+    document.writeln('</FRAMESET>');
+</SCRIPT>
+
+</HTML>
diff --git 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
@@ -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"