aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrenrot12
1 files changed, 6 insertions, 6 deletions
diff --git a/renrot b/renrot
index 437cb40..027e32f 100755
--- a/renrot
+++ b/renrot
@@ -386,13 +386,13 @@ sub boolConv {
# Returns : number 1 or 0
# Parameters : one of "1", "Yes", "True", "On", "0", "No", "False" or "Off"
# Throws : no exceptions
# Comments : none
# See Also : boolConv()
sub boolConverter {
- my $value = shift;
+ my $value = trim_value(shift);
if ($value =~ m/^(0|No|False|Off)$/i) {
return 0;
} elsif ($value =~ m/^(1|Yes|True|On)$/i) {
return 1;
}
return $value;
@@ -610,20 +610,20 @@ sub getOptions {
########################################################################################
### CONFIGURATION FRAMEWORK ###
########################################################################################
########################################################################################
-# Usage : trimValue($value)
+# Usage : trim_value($value)
# Purpose : removes heading and trailing spaces
# Returns : trimmed $value
# Parameters : $value string
# Throws : no exceptions
# Comments : none
# See Also : N/A
-sub trimValue {
+sub trim_value {
my $value = shift;
$value =~ s/\s*([^\s]+.*[^\s]+)\s*/$1/;
return $value;
}
########################################################################################
@@ -636,17 +636,17 @@ sub trimValue {
# Comments : none
# See Also : N/A
sub parsePair {
my $str = shift;
my ($key, $value) = (undef, shift);
if ($str =~ m/^([^=]+)=(.+)/) {
- ($key, $value) = (trimValue($1), trimValue($2));
+ ($key, $value) = (trim_value($1), trim_value($2));
$value =~ s/^[\'\"](.+)[\'\"]/$1/; # trim quotes
dbgmsg (4, "Parsed: '$key' <- '$value'\n");
} elsif ($str =~ m/^([^=]+)=$/) {
- $key = trimValue($1);
+ $key = trim_value($1);
dbgmsg (4, "Parsed empty '$key', applying default value: ", defined $value ? "'$value'" : "undef", "\n");
}
return ($key, $value);
}
########################################################################################
@@ -792,13 +792,13 @@ sub keywordizer {
return if (not (-R $file and -f $file and -T $file));
dbgmsg (2, "Reading keywords from file: $file\n");
my @result = ();
my @keywordArr = getFileDataLines($file);
for (my $i = 0; $i < scalar(@keywordArr); $i++) {
$keywordArr[$i] =~ s/\r?\n$//; # remove CR and LF symbols
- push (@result, trimValue($keywordArr[$i])) if ($keywordArr[$i] !~ m/^\s*$/);
+ push (@result, trim_value($keywordArr[$i])) if ($keywordArr[$i] !~ m/^\s*$/);
}
return @result;
}
########################################################################################
# Usage : renRotProcess($exif_tool_obj, $counter_size)

Return to:

Send suggestions and report system problems to the System administrator.