Rewrite almanach merge logic

[eccc_to_commons.git] / dllist.sh

diff --git a/dllist.sh b/dllist.sh
index c2b9e627532c3e690395550405802f9481f5219d..ba3d436f75c1258a376c83d6b8b735583bd925ca 100755 (executable)
--- a/dllist.sh
+++ b/dllist.sh
@@ -24,20 +24,21 @@ CSV_COLUMNS=19
 set -e
 
 function generateStation() {
-       local -ir id="${1}"
-       local -ir monthly_start_year="${2}"
-       local -ir monthly_end_year="${3}"
-       local -ir daily_start_year="${4}"
-       local -ir daily_end_year="${5}"
-       local -ir hourly_start_year="${6}"
-       local -ir hourly_end_year="${7}"
+       local -r cid="${1}"
+       local -ir sid="${2}"
+       local -ir monthly_start_year="${3}"
+       local -ir monthly_end_year="${4}"
+       local -ir daily_start_year="${5}"
+       local -ir daily_end_year="${6}"
+       local -ir hourly_start_year="${7}"
+       local -ir hourly_end_year="${8}"
 
        # Generate monthly link
        if [ "${monthly_start_year}" -ne 0 ]&&[ "${monthly_end_year}" -ne 0 ]
        then
                cat <<-EOF >&1
-               url = "${XML_PREFIX}&timeframe=3&stationID=${id}"
-               output = "${OUTPUT_PREFIX}/monthly/${id}.xml"
+               url = "${XML_PREFIX}&timeframe=3&stationID=${sid}"
+               output = "${OUTPUT_PREFIX}/monthly/${cid}.xml"
 
                EOF
        fi
@@ -48,8 +49,8 @@ function generateStation() {
                for year in $(seq ${daily_start_year} ${daily_end_year})
                do
                        cat <<-EOF >&1
-                       url = "${XML_PREFIX}&timeframe=2&stationID=${id}&Year=${year}&Month=1"
-                       output = "${OUTPUT_PREFIX}/daily/${id}/${year}.xml"
+                       url = "${XML_PREFIX}&timeframe=2&stationID=${sid}&Year=${year}&Month=1"
+                       output = "${OUTPUT_PREFIX}/daily/${cid}/${year}.xml"
 
                        EOF
                done
@@ -69,8 +70,8 @@ function generateStation() {
                                fi
 
                                cat <<-EOF >&1
-                               url = "${XML_PREFIX}&timeframe=1&stationID=${id}&Year=${year}&Month=${month}&Day=1"
-                               output = "${OUTPUT_PREFIX}/hourly/${id}/${year}-$(printf "%02i" ${month}).xml"
+                               url = "${XML_PREFIX}&timeframe=1&stationID=${sid}&Year=${year}&Month=${month}&Day=1"
+                               output = "${OUTPUT_PREFIX}/hourly/${cid}/${year}-$(printf "%02i" ${month}).xml"
 
                                EOF
                        done
@@ -79,8 +80,8 @@ function generateStation() {
 
        # Generate almanac link
        cat <<-EOF >&1
-       url = "${XML_PREFIX}&timeframe=4&stationID=${id}"
-       output = "${OUTPUT_PREFIX}/almanac/${id}.xml"
+       url = "${XML_PREFIX}&timeframe=4&stationID=${sid}"
+       output = "${OUTPUT_PREFIX}/almanac/${cid}.xml"
 
        EOF
 }
@@ -125,6 +126,7 @@ do
                        continue
                fi
 
+               CLIMATE_ID="$(echo "${station}" | awk -F'"' '{print $6}')"
                STATION_ID="$(echo "${station}" | awk -F'"' '{print $8}')"
                STATION_HOURLY_START=$(echo "${station}" | awk -F'"' '{print $28}')
                STATION_HOURLY_END=$(echo "${station}" | awk -F'"' '{print $30}')
@@ -132,7 +134,7 @@ do
                STATION_DAILY_END=$(echo "${station}" | awk -F'"' '{print $34}')
                STATION_MONTHLY_START=$(echo "${station}" | awk -F'"' '{print $36}')
                STATION_MONTHLY_END=$(echo "${station}" | awk -F'"' '{print $38}')
-               generateStation "${STATION_ID}" "${STATION_MONTHLY_START}" "${STATION_MONTHLY_END}" "${STATION_DAILY_START}" "${STATION_DAILY_END}" "${STATION_HOURLY_START}" "${STATION_HOURLY_END}"
+               generateStation "${CLIMATE_ID}" "${STATION_ID}" "${STATION_MONTHLY_START}" "${STATION_MONTHLY_END}" "${STATION_DAILY_START}" "${STATION_DAILY_END}" "${STATION_HOURLY_START}" "${STATION_HOURLY_END}"
        else
                if [ "${HEADER}" -eq 0 ]
                then