X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/7ad273d8b48d1ae0e8d8e3eb5da0637da2bc9d6f..25ecb96fab6571c9ccb7086e55187ac872ef00ad:/unitproc/bktemp-timeDuration

diff --git a/unitproc/bktemp-timeDuration b/unitproc/bktemp-timeDuration
index 5aac0d5..25740ff 100644
--- a/unitproc/bktemp-timeDuration
+++ b/unitproc/bktemp-timeDuration
@@ -10,12 +10,17 @@ timeDuration(){
     # Ref/Attrib: ISO-8601:2004(E), §4.4.4.2 Representations of time intervals by duration and context information
     # Note: "1 month" ("P1M") is assumed to be "30 days" (see ISO-8601:2004(E), §2.2.1.2)
     # Usage: timeDuration [arg1] ([arg2])
+    # Version: 1.0.1
     # Input: arg1: seconds as base 10 integer >= 0  (ex: 3601)
     #        arg2: precision level (optional; default=2)
     # Output: stdout: ISO-8601 duration string (ex: "P1H1S", "P2Y10M15DT10H30M20S")
     # Example: 'timeDuration 111111 3' yields 'P1DT6H51M'
-    # Depends: date 8 (gnucoreutils)
-    local returnState fullHours fullMinutes fullSeconds;
+    # Depends: date 8 (gnucoreutils), yell, 
+    local returnState ARG1 ARG2 remainder precision witherPrecision
+    local fullYears fullMonths fullDays fullHours fullMinutes fullSeconds
+    local displayYears displayMonths displayDays displayHours displayMinutes displaySeconds
+    local hasYears hasMonths hasDays hasHours hasMinutes hasSeconds
+    
     ARG1="$1";
     ARG2="$2";
     precision=2; # set default precision
@@ -28,13 +33,12 @@ timeDuration(){
 
     # Check that arg1 provided
     if [[ $# -ge 1 ]]; then
-	# Check that arg1 is a positive integer
+	## Check that arg1 is a positive integer
 	if [[ "$ARG1" =~ ^[[:digit:]]+$ ]]; then
-   	    arg1Valid="true";
+   	    :
 	else
 	    yell "ERROR:ARG1 not a digit.";
 	    returnState="ERROR_INPUT";
-	    arg1Valid="false";
 	fi
     else
 	yell "ERROR:No argument provided. Exiting.";
@@ -44,49 +48,35 @@ timeDuration(){
     # Consider whether arg2 was provided
     if  [[ $# -eq 2 ]]; then
 	# Check that the second arg is a positive integer
-	if [[ "$ARG2" =~ ^[[:digit:]]+$ ]] && [[ "ARG2" -gt 0 ]]; then
-	arg2Valid="true";
+	if [[ "$ARG2" =~ ^[[:digit:]]+$ ]] && [[ "$ARG2" -gt 0 ]]; then
 	precision="$ARG2";
 	else
 	    yell "ERROR:ARG2 not a positive integer. (is $ARG2 ). Leaving early.";
 	    returnState="ERROR_INPUT";
-	    arg2Valid="false";
 	fi;
     else
-	arg2Valid="false";
+	:
     fi;
     
     remainder="$ARG1" ; # seconds
     ## Calculate full years Y, update remainder
     fullYears=$(( remainder / (365*24*60*60) ));
     remainder=$(( remainder - (fullYears*365*24*60*60) ));
-    #yell "DEBUG:post-Y remainder:$remainder"
-    #yell "DEBUG:fullYears:$fullYears"
     ## Calculate full months M, update remainder
     fullMonths=$(( remainder / (30*24*60*60) ));
     remainder=$(( remainder - (fullMonths*30*24*60*60) ));
-    #yell "DEBUG:post-m remainder:$remainder"
-    #yell "DEBUG:fullMonths:$fullMonths"
     ## Calculate full days D, update remainder
     fullDays=$(( remainder / (24*60*60) ));
     remainder=$(( remainder - (fullDays*24*60*60) ));
-    #yell "DEBUG:post-d remainder:$remainder"
-    #yell "DEBUG:fullMonths:$fullDays"
     ## Calculate full hours H, update remainder
     fullHours=$(( remainder / (60*60) ));
     remainder=$(( remainder - (fullHours*60*60) ));
-    #yell "DEBUG:post-H remainder:$remainder"
-    #yell "DEBUG:fullHours:$fullHours"
     ## Calculate full minutes M, update remainder
     fullMinutes=$(( remainder / (60) ));
     remainder=$(( remainder - (fullMinutes*60) ));
-    #yell "DEBUG:post-M remainder:$remainder"
-    #yell "DEBUG:fullMinutes:$fullMinutes"
     ## Calculate full seconds S, update remainder
     fullSeconds=$(( remainder / (1) ));
     remainder=$(( remainder - (remainder*1) ));
-    #yell "DEBUG:post-S remainder:$remainder"
-    #yell "DEBUG:fullSeconds:$fullSeconds"
     ## Check which fields filled
     if [[ $fullYears -gt 0 ]]; then hasYears="true"; else hasYears="false"; fi
     if [[ $fullMonths -gt 0 ]]; then hasMonths="true"; else hasMonths="false"; fi
@@ -171,7 +161,6 @@ timeDuration(){
 
 
     ## Determine whether or not the "T" separator is needed to separate date and time elements
-    #    if ( $displayYears || $displayMonths || $displayDays ) && ( $displayHours || $displayMinutes || $displaySeconds); then
     if ( $displayHours || $displayMinutes || $displaySeconds); then
 	displayDateTime="true"; else displayDateTime="false"; fi
     
@@ -194,23 +183,6 @@ timeDuration(){
 
     ## Output duration string to stdout
     if [[ "$returnState" = "true" ]]; then echo "$OUTPUT"; fi
-    
-
-    # if [[ "$OPTION_DATEPARSE" = "true" ]]; then
-    # 	echo "asdf";
-    # 	# Get current time for parsing year/month/day idiosyncrasies
-    # 	DATE_NOW="$(TZ=":UTC" date --iso-8601 | tr -d '[:punct:]')"; # Produces YYYYMMDD
-    # 	#TIME_CURRENT="$(date --iso-8601=seconds)" ; # Produce `date`-parsable current timestamp with resolution of 1 second.
-    # 	# Get date : Given YYYY-MM-DDTHH:MM:SS+ZZ, outputs YYYYMMDD (also supports YYYYYY)
-    # 	DATE_AGO="$(TZ="UTC" date -d '$ARG1 seconds ago' --iso-8601=seconds | tr -d '[:punct:]' | cut -dT -f1)"; 
-    # 	# Get day
-    # 	DAY_AGO=${DATE_AGO: -2}
-    # 	# Get month
-    # 	MONTH_AGO=${DATE_AGO: -4: -2}
-    # 	# Get year
-    # 	YEAR_AGO=${YEAR: 0: -4}
-	
-    # fi
 
     #===Determine function return code===
     if [ "$returnState" = "true" ]; then