/[cvs]/nfo/perl/libs/Date/Merge.pm
ViewVC logotype

Diff of /nfo/perl/libs/Date/Merge.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by joko, Mon Dec 23 13:44:53 2002 UTC revision 1.4 by jonen, Thu Aug 11 14:13:23 2005 UTC
# Line 2  Line 2 
2  ##  $Id$  ##  $Id$
3  ## ------------------------------------------------------------------------  ## ------------------------------------------------------------------------
4  ##  $Log$  ##  $Log$
5    ##  Revision 1.4  2005/08/11 14:13:23  jonen
6    ##  + bugfix
7    ##
8    ##  Revision 1.3  2003/02/09 16:15:51  joko
9    ##  + minor update regarding module namespace refactoring
10    ##
11  ##  Revision 1.2  2002/12/23 13:44:53  joko  ##  Revision 1.2  2002/12/23 13:44:53  joko
12  ##  + sub stripDayName  ##  + sub stripDayName
13  ##  ##
# Line 25  our @EXPORT_OK = qw( Line 31  our @EXPORT_OK = qw(
31    
32    
33  use Date::Manip;  use Date::Manip;
34  use libp qw( today );  use shortcuts qw( today );
35    
36    
37  sub mergeDayAndTime {  sub mergeDayAndTime {
# Line 45  sub mergeDayAndTime { Line 51  sub mergeDayAndTime {
51                        
52                $date_day_raw =~ s/[^\d|-]//g;                $date_day_raw =~ s/[^\d|-]//g;
53                my $date_day = ParseDate($date_day_raw);                my $date_day = ParseDate($date_day_raw);
54                          
55                # $date_time (just the time!) will get auto-converted to a datetime from today, so ....                # $date_time (just the time!) will get auto-converted to a datetime from today, so ....
56                my $date_time = ParseDate($date_time_raw);                my $date_time = ParseDate($date_time_raw);
57    
58                # ... we should calculate the delta to get the real time-shift to continue further processing with                # ... we should calculate the delta to get the real time-shift to continue further processing with
59                my $date_time_delta = DateCalc(ParseDate(today()), '-' . $date_time);                #my $date_time_delta = DateCalc(ParseDate(today()), '-' . $date_time);
60                  my $date_time_delta = DateCalc(ParseDate(today()), $date_time);
61    
62                # add the delta to the 'date-day' parsed above to calculate the complete event-date ('endtime' in this case)                # add the delta to the 'date-day' parsed above to calculate the complete event-date ('endtime' in this case)
63                my $date_complete = DateCalc($date_day, $date_time_delta);                my $date_complete = DateCalc($date_day, $date_time_delta);
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.4
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed