[Koha-cvs] koha/C4 Date.pm
Chris Cormack
chris at katipo.co.nz
Tue May 23 03:53:19 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch:
Changes by: Chris Cormack <rangi at savannah.gnu.org> 06/05/23 01:53:19
Modified files:
C4 : Date.pm
Log message:
No merge needed, added a version string and the copyright statement
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Date.pm.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: koha/C4/Date.pm
diff -u koha/C4/Date.pm:1.15 koha/C4/Date.pm:1.16
--- koha/C4/Date.pm:1.15 Fri Apr 14 09:32:57 2006
+++ koha/C4/Date.pm Tue May 23 01:53:19 2006
@@ -1,4 +1,23 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+# $Id: Date.pm,v 1.16 2006/05/23 01:53:19 rangi Exp $
package C4::Date;
@@ -10,156 +29,137 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-$VERSION = 0.01;
+$VERSION = do { my @v = '$Revision: 1.16 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
@ISA = qw(Exporter);
@EXPORT = qw(
- &display_date_format
- &format_date
- &format_date_in_iso
- &today
- get_date_format_string_for_DHTMLcalendar
+ &display_date_format
+ &format_date
+ &format_date_in_iso
+ &today
+ get_date_format_string_for_DHTMLcalendar
);
+sub get_date_format {
-sub get_date_format
-{
- #Get the database handle
- my $dbh = C4::Context->dbh;
- return C4::Context->preference('dateformat');
-}
-
-sub display_date_format
-{
- my $dateformat = get_date_format();
-
- if ( $dateformat eq "us" )
- {
- return "mm/dd/yyyy";
- }
- elsif ( $dateformat eq "metric" )
- {
- return "dd/mm/yyyy";
- }
- elsif ( $dateformat eq "iso" )
- {
- return "yyyy-mm-dd";
- }
- else
- {
- return "Invalid date format: $dateformat. Please change in system preferences";
- }
+ #Get the database handle
+ my $dbh = C4::Context->dbh;
+ return C4::Context->preference('dateformat');
+}
+
+sub display_date_format {
+ my $dateformat = get_date_format();
+
+ if ( $dateformat eq "us" ) {
+ return "mm/dd/yyyy";
+ }
+ elsif ( $dateformat eq "metric" ) {
+ return "dd/mm/yyyy";
+ }
+ elsif ( $dateformat eq "iso" ) {
+ return "yyyy-mm-dd";
+ }
+ else {
+ return
+"Invalid date format: $dateformat. Please change in system preferences";
+ }
}
sub get_date_format_string_for_DHTMLcalendar {
my $dateformat = get_date_format();
- if ($dateformat eq 'us') {
+ if ( $dateformat eq 'us' ) {
return '%m/%d/%Y';
}
- elsif ($dateformat eq 'metric') {
+ elsif ( $dateformat eq 'metric' ) {
return '%d/%m/%Y';
}
- elsif ($dateformat eq "iso") {
+ elsif ( $dateformat eq "iso" ) {
return '%Y-%m-%d';
}
else {
+ return 'Invalid date format: '
+ . $dateformat . '.'
+ . ' Please change in system preferences';
+ }
+}
+
+sub format_date {
+ my $olddate = shift;
+ my $newdate;
+
+ if ( !$olddate ) {
+ return "";
+ }
+
+ my $dateformat = get_date_format();
+
+ if ( $dateformat eq "us" ) {
+ Date_Init("DateFormat=US");
+ $olddate = ParseDate($olddate);
+ $newdate = UnixDate( $olddate, '%m/%d/%Y' );
+ }
+ elsif ( $dateformat eq "metric" ) {
+ Date_Init("DateFormat=metric");
+ $olddate = ParseDate($olddate);
+ $newdate = UnixDate( $olddate, '%d/%m/%Y' );
+ }
+ elsif ( $dateformat eq "iso" ) {
+ Date_Init("DateFormat=iso");
+ $olddate = ParseDate($olddate);
+ $newdate = UnixDate( $olddate, '%Y-%m-%d' );
+ }
+ else {
return
- 'Invalid date format: '.$dateformat.'.'
- .' Please change in system preferences';
+"Invalid date format: $dateformat. Please change in system preferences";
}
}
+sub format_date_in_iso {
+ my $olddate = shift;
+ my $newdate;
+
+ if ( !$olddate ) {
+ return "";
+ }
+
+ my $dateformat = get_date_format();
-sub format_date
-{
- my $olddate = shift;
- my $newdate;
-
- if ( ! $olddate )
- {
- return "";
- }
-
- my $dateformat = get_date_format();
-
- if ( $dateformat eq "us" )
- {
- Date_Init("DateFormat=US");
- $olddate = ParseDate($olddate);
- $newdate = UnixDate($olddate,'%m/%d/%Y');
- }
- elsif ( $dateformat eq "metric" )
- {
- Date_Init("DateFormat=metric");
- $olddate = ParseDate($olddate);
- $newdate = UnixDate($olddate,'%d/%m/%Y');
- }
- elsif ( $dateformat eq "iso" )
- {
- Date_Init("DateFormat=iso");
- $olddate = ParseDate($olddate);
- $newdate = UnixDate($olddate,'%Y-%m-%d');
- }
- else
- {
- return "Invalid date format: $dateformat. Please change in system preferences";
- }
-}
-
-sub format_date_in_iso
-{
- my $olddate = shift;
- my $newdate;
-
- if ( ! $olddate )
- {
- return "";
- }
-
- my $dateformat = get_date_format();
-
- if ( $dateformat eq "us" )
- {
- Date_Init("DateFormat=US");
- $olddate = ParseDate($olddate);
- }
- elsif ( $dateformat eq "metric" )
- {
- Date_Init("DateFormat=metric");
- $olddate = ParseDate($olddate);
- }
- elsif ( $dateformat eq "iso" )
- {
- Date_Init("DateFormat=iso");
- $olddate = ParseDate($olddate);
- }
- else
- {
- return "9999-99-99";
- }
+ if ( $dateformat eq "us" ) {
+ Date_Init("DateFormat=US");
+ $olddate = ParseDate($olddate);
+ }
+ elsif ( $dateformat eq "metric" ) {
+ Date_Init("DateFormat=metric");
+ $olddate = ParseDate($olddate);
+ }
+ elsif ( $dateformat eq "iso" ) {
+ Date_Init("DateFormat=iso");
+ $olddate = ParseDate($olddate);
+ }
+ else {
+ return "9999-99-99";
+ }
- $newdate = UnixDate($olddate, '%Y-%m-%d');
+ $newdate = UnixDate( $olddate, '%Y-%m-%d' );
- return $newdate;
+ return $newdate;
}
#function to return a current date OUEST-PROVENCE
-sub today
-{
- my ($adddate) =@_;
- my($j,$m,$a)=(localtime)[3,4,5];
- if ($j<10) {
- $j= '0'.$j;
- }
- $m=$m+1;
- if ($m<10){
- $m= '0'.$m
- }
- $a=$a+1900+$adddate;
- return format_date("$a-$m-$j");
+sub today {
+ my ($adddate) = @_;
+ my ( $j, $m, $a ) = (localtime)[ 3, 4, 5 ];
+ if ( $j < 10 ) {
+ $j = '0' . $j;
+ }
+ $m = $m + 1;
+ if ( $m < 10 ) {
+ $m = '0' . $m;
+ }
+ $a = $a + 1900 + $adddate;
+ return format_date("$a-$m-$j");
}
-
1;
More information about the Koha-cvs
mailing list