From dfd16a2309f189d00ef15e162e92e7f79be8ff28 Mon Sep 17 00:00:00 2001 From: D Ruth Bavousett Date: Mon, 17 Oct 2011 07:15:17 -0700 Subject: [PATCH] Bug 7045: Default-value behavior inconsistency This patch will allow for YY as well as YYYY substitutions on framework default values, and changes the substitution of 'user' for the username to require USER. --- cataloguing/addbiblio.pl | 4 +++- cataloguing/additem.pl | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index ee0662a..e180c82 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -307,13 +307,15 @@ sub create_input { # get today date & replace YYYY, MM, DD if provided in the default value my ( $year, $month, $day ) = Today(); + my $shortyear = substr $year, 2, 2; $month = sprintf( "%02d", $month ); $day = sprintf( "%02d", $day ); $value =~ s/YYYY/$year/g; + $value =~ s/YY/$shortyear/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; my $username=(C4::Context->userenv?C4::Context->userenv->{'surname'}:"superlibrarian"); - $value=~s/user/$username/g; + $value=~s/USER/$username/g; } my $dbh = C4::Context->dbh; diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 6229f0c..6e22913 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -125,7 +125,9 @@ sub generate_subfield_form { $value = $subfieldlib->{defaultvalue}; # get today date & replace YYYY, MM, DD if provided in the default value my ( $year, $month, $day ) = split ',', $today_iso; # FIXME: iso dates don't have commas! + my $shortyear = substr $year, 2, 2; $value =~ s/YYYY/$year/g; + $value =~ s/YY/$shortyear/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; } -- 1.7.2.5