[Koha-cvs] koha/C4/Calendar Calendar.pm [rel_2_2]

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Chris Cormack <rangi>   07/02/13 09:27:04

Modified files:
        C4/Calendar    : Calendar.pm 

Log message:
        Fixes for holiday code

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Calendar/Calendar.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.1&r2=1.4.2.2

Patches:
Index: Calendar.pm
===================================================================
RCS file: /sources/koha/koha/C4/Calendar/Calendar.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- Calendar.pm 15 Jan 2007 23:40:42 -0000      1.4.2.1
+++ Calendar.pm 13 Feb 2007 09:27:03 -0000      1.4.2.2
@@ -20,7 +20,7 @@
 use vars qw($VERSION @EXPORT);
 
 use C4::Context;
-
+use Date::Calc;
 use C4::Date;
 
 # set the version for version checking
@@ -547,24 +547,14 @@
 }
 
 sub Date_DayOfWeek{
-my ($month, $day, $year)address@hidden;
-my $date=DATE_obj($year."-".$month."-".$day);
-
-return $date->day_of_week;
-}
+    my ($month, $day, $year)address@hidden;
+    return Date::Calc::Day_of_Week($year,$month,$day)
+#my $date=DATE_obj($year."-".$month."-".$day);
 
-sub Add_Delta_Days{
-my ($year, $month, $day, $offset)address@hidden;
-my $date=DATE_obj($year."-".$month."-".$day);
-my $duration=get_duration($offset." days");
-
- $date->add_duration($duration);
-
-return ($date->year, $date->month, $date->day);
+#return $date->day_of_week;
 }
 
 
-
 1;
 
 __END__