Attachment 5931 Details for Bug 7045 – New patch, minus a typo.

[patch] New patch, minus a typo.

0001-Bug-7045-Default-value-behavior-inconsistency.patch (text/plain), 2.54 KB, created by D Ruth Holloway on 2011-10-17 15:27:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: D Ruth Holloway

Created: 2011-10-17 15:27:49 UTC

Size: 2.54 KB

patch

obsolete

>From c4dec8d272338ff416f12e4a393987fc69779c7c Mon Sep 17 00:00:00 2001
>From: D Ruth Bavousett <ruth@bywatersolutions.com>
>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.
>
>It also will now allow USER in item fields.
>---
> cataloguing/addbiblio.pl |    4 +++-
> cataloguing/additem.pl   |    8 +++++++-
> 2 files changed, 10 insertions(+), 2 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..9fe22b7 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -33,6 +33,7 @@ use C4::ClassSource;
> use C4::Dates;
> use List::MoreUtils qw/any/;
> 
>+use Date::Calc qw(Today);
> use MARC::File::XML;
> use URI::Escape;
> 
>@@ -124,10 +125,15 @@ sub generate_subfield_form {
>         if ( ! defined( $value ) || $value eq '')  {
>             $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 ( $year, $month, $day ) = Today();
>+            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;
>+            my $username=(C4::Context->userenv?C4::Context->userenv->{'surname'}:"superlibrarian");
>+            $value=~s/USER/$username/g;
>+
>         }
>         
>         $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} < -4));
>-- 
>1.7.2.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 7045: 5922 | 5923 | 5924 | 5925 | 5926 | 5927 | 5928 | 5929 | 5931 | 5932 | 54496 | 54497 | 54500 | 54501 | 54669 | 54670