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

diff --git a/unitproc/bktemp-timeDuration b/unitproc/bktemp-timeDuration
index f132d08..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,16 +48,14 @@ 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