Merge branch 'develop' into rcra_2021

USEPA · Jun 10, 2024 · ec8f3bb · ec8f3bb
2 parents ddfdde0 + 4662656
commit ec8f3bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/stewi/GHGRP.py b/stewi/GHGRP.py
@@ -123,7 +123,7 @@ def get_row_count(table, report_year):
     try:
         count_request = make_url_request(count_url)
         count_xml = minidom.parseString(count_request.text)
-        table_count = count_xml.getElementsByTagName('TOTALQUERYRESULTS')
+        table_count = count_xml.getElementsByTagName('REQUESTRECORDCOUNT')
         table_count = int(table_count[0].firstChild.nodeValue)
     except IndexError as e:
         raise Exception(f'error accessing table count for {table}') from e

diff --git a/stewi/data/eGRID/eGRID_required_fields.csv b/stewi/data/eGRID/eGRID_required_fields.csv
@@ -14,7 +14,7 @@ Nitrous oxide,1,,Plant annual N2O emissions (lbs),Plant annual N2O emissions (lb
 Plant primary fuel,1,1,Plant primary fuel,Plant primary fuel,Plant primary fuel,Plant primary fuel,Plant primary fuel,Plant primary fuel
 Plant nameplate capacity (MW),,,Plant nameplate capacity (MW),Plant nameplate capacity (MW),Plant nameplate capacity (MW),Plant nameplate capacity (MW),Plant nameplate capacity (MW),Plant nameplate capacity (MW)
 Plant capacity factor,,,Plant capacity factor,Plant capacity factor,Plant capacity factor,Plant capacity factor,Plant capacity factor,Plant capacity factor
-Plant primary coal/oil/gas/ other fossil fuel category,,1,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,,
+Plant primary coal/oil/gas/ other fossil fuel category,,1,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary coal/oil/gas/ other fossil fuel category,Plant primary fuel category,Plant primary fuel category
 NERC region acronym,,1,NERC region acronym,NERC region acronym,NERC region acronym,NERC region acronym,NERC region acronym,NERC region acronym
 eGRID subregion acronym,,1,eGRID subregion acronym,eGRID subregion acronym,eGRID subregion acronym,eGRID subregion acronym,eGRID subregion acronym,eGRID subregion acronym
 Balancing Authority Name,,1,Balancing Authority Name,Balancing Authority Name,Balancing Authority Name,Balancing Authority Name,Balancing Authority Name,Balancing Authority Name