Lines 108-113
sub new {
Link Here
|
108 |
$self->{ from } = $from; |
108 |
$self->{ from } = $from; |
109 |
$self->{ until } = $until; |
109 |
$self->{ until } = $until; |
110 |
$self->{ set } = $set; |
110 |
$self->{ set } = $set; |
|
|
111 |
$self->{ from_arg } = _strip_UTC_designators($from); |
112 |
$self->{ until_arg } = _strip_UTC_designators($until); |
111 |
|
113 |
|
112 |
$self->resumptionToken( |
114 |
$self->resumptionToken( |
113 |
join( ':', $metadata_prefix, $offset, $from, $until, $set ) ); |
115 |
join( ':', $metadata_prefix, $offset, $from, $until, $set ) ); |
Lines 116-121
sub new {
Link Here
|
116 |
return $self; |
118 |
return $self; |
117 |
} |
119 |
} |
118 |
|
120 |
|
|
|
121 |
sub _strip_UTC_designators { |
122 |
my ( $timestamp ) = @_; |
123 |
$timestamp =~ s/T/ /g; |
124 |
$timestamp =~ s/Z//g; |
125 |
return $timestamp; |
126 |
} |
127 |
|
119 |
# __END__ C4::OAI::ResumptionToken |
128 |
# __END__ C4::OAI::ResumptionToken |
120 |
|
129 |
|
121 |
|
130 |
|
Lines 319-332
sub new {
Link Here
|
319 |
FROM biblioitems |
328 |
FROM biblioitems |
320 |
"; |
329 |
"; |
321 |
$sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set; |
330 |
$sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set; |
322 |
$sql .= " WHERE DATE(timestamp) >= ? AND DATE(timestamp) <= ? "; |
331 |
$sql .= " WHERE timestamp >= ? AND DATE(timestamp) <= ? "; |
323 |
$sql .= " AND oai_sets_biblios.set_id = ? " if defined $set; |
332 |
$sql .= " AND oai_sets_biblios.set_id = ? " if defined $set; |
324 |
$sql .= " |
333 |
$sql .= " |
325 |
LIMIT $repository->{'koha_max_count'} |
334 |
LIMIT $repository->{'koha_max_count'} |
326 |
OFFSET $token->{'offset'} |
335 |
OFFSET $token->{'offset'} |
327 |
"; |
336 |
"; |
328 |
my $sth = $dbh->prepare( $sql ); |
337 |
my $sth = $dbh->prepare( $sql ); |
329 |
my @bind_params = ($token->{'from'}, $token->{'until'}); |
338 |
my @bind_params = ($token->{'from_arg'}, $token->{'until_arg'}); |
330 |
push @bind_params, $set->{'id'} if defined $set; |
339 |
push @bind_params, $set->{'id'} if defined $set; |
331 |
$sth->execute( @bind_params ); |
340 |
$sth->execute( @bind_params ); |
332 |
|
341 |
|
Lines 472-478
sub new {
Link Here
|
472 |
FROM biblioitems |
481 |
FROM biblioitems |
473 |
"; |
482 |
"; |
474 |
$sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set; |
483 |
$sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set; |
475 |
$sql .= " WHERE DATE(timestamp) >= ? AND DATE(timestamp) <= ? "; |
484 |
$sql .= " WHERE timestamp >= ? AND timestamp <= ? "; |
476 |
$sql .= " AND oai_sets_biblios.set_id = ? " if defined $set; |
485 |
$sql .= " AND oai_sets_biblios.set_id = ? " if defined $set; |
477 |
$sql .= " |
486 |
$sql .= " |
478 |
LIMIT $repository->{'koha_max_count'} |
487 |
LIMIT $repository->{'koha_max_count'} |
Lines 480-486
sub new {
Link Here
|
480 |
"; |
489 |
"; |
481 |
|
490 |
|
482 |
my $sth = $dbh->prepare( $sql ); |
491 |
my $sth = $dbh->prepare( $sql ); |
483 |
my @bind_params = ($token->{'from'}, $token->{'until'}); |
492 |
my @bind_params = ($token->{'from_arg'}, $token->{'until_arg'}); |
484 |
push @bind_params, $set->{'id'} if defined $set; |
493 |
push @bind_params, $set->{'id'} if defined $set; |
485 |
$sth->execute( @bind_params ); |
494 |
$sth->execute( @bind_params ); |
486 |
|
495 |
|
487 |
- |
|
|