projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dfff614
)
add hourly frequency
author
ivan
<ivan>
Wed, 7 Sep 2005 22:52:23 +0000
(22:52 +0000)
committer
ivan
<ivan>
Wed, 7 Sep 2005 22:52:23 +0000
(22:52 +0000)
FS/FS/part_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg.pm
b/FS/FS/part_pkg.pm
index
73e469c
..
db31e45
100644
(file)
--- a/
FS/FS/part_pkg.pm
+++ b/
FS/FS/part_pkg.pm
@@
-420,7
+420,7
@@
sub check {
my $error = $self->ut_number('freq');
return $error if $error;
} else {
my $error = $self->ut_number('freq');
return $error if $error;
} else {
- $self->freq =~ /^(\d+[dw]?)$/
+ $self->freq =~ /^(\d+[
h
dw]?)$/
or return "Illegal or empty freq: ". $self->freq;
$self->freq($1);
}
or return "Illegal or empty freq: ". $self->freq;
$self->freq($1);
}
@@
-535,6
+535,7
@@
Returns an english representation of the I<freq> field, such as "monthly",
tie %freq, 'Tie::IxHash',
'0' => '(no recurring fee)',
tie %freq, 'Tie::IxHash',
'0' => '(no recurring fee)',
+ '1h' => 'hourly',
'1d' => 'daily',
'1w' => 'weekly',
'2w' => 'biweekly (every 2 weeks)',
'1d' => 'daily',
'1w' => 'weekly',
'2w' => 'biweekly (every 2 weeks)',
@@
-557,8
+558,8
@@
sub freq_pretty {
$freq{$freq};
} else {
my $interval = 'month';
$freq{$freq};
} else {
my $interval = 'month';
- if ( $freq =~ /^(\d+)([dw])$/ ) {
- my %interval = ( 'd'=>'day', 'w'=>'week' );
+ if ( $freq =~ /^(\d+)([
h
dw])$/ ) {
+ my %interval = ( '
h' => 'hour', '
d'=>'day', 'w'=>'week' );
$interval = $interval{$2};
}
if ( $1 == 1 ) {
$interval = $interval{$2};
}
if ( $1 == 1 ) {