View | Details | Raw Unified | Return to bug 3206
Collapse All | Expand All

(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 232-237 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
232
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
232
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
233
('OAI-PMH:AutoUpdateSets','0','','Automatically update OAI sets when a bibliographic record is created or updated','YesNo'),
233
('OAI-PMH:AutoUpdateSets','0','','Automatically update OAI sets when a bibliographic record is created or updated','YesNo'),
234
('OAI-PMH:ConfFile','',NULL,'If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.','File'),
234
('OAI-PMH:ConfFile','',NULL,'If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.','File'),
235
('OAI-PMH:DeletedRecord','persistent','Koha\'s deletedbiblio table will never be deleted (persistent), might be deleted (transient), or will never have any data in it (no)','transient|persistent|no','Choice')
235
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
236
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
236
('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'),
237
('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'),
237
('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'),
238
('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'),
Lines 479-484 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
479
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
480
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
480
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
481
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
481
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
482
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
482
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
483
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
483
('OAI-PMH:DeletedRecord','persistent','Koha\'s deletedbiblio table will never be deleted (persistent) or might be deleted (transient)','transient|persistent','Choice')
484
;
484
;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref (+1 lines)
Lines 33-38 Web services: Link Here
33
              choices:
33
              choices:
34
                  persistent: will never be emptied or truncated (persistent)
34
                  persistent: will never be emptied or truncated (persistent)
35
                  transient: might be emptied or truncated at some point (transient)
35
                  transient: might be emptied or truncated at some point (transient)
36
                  no: will never have any data in it (no)
36
            - "."
37
            - "."
37
    ILS-DI:
38
    ILS-DI:
38
        -
39
        -
(-)a/opac/oai.pl (-17 / +12 lines)
Lines 254-261 sub new { Link Here
254
254
255
package C4::OAI::DeletedRecord;
255
package C4::OAI::DeletedRecord;
256
256
257
use strict;
257
use Modern::Perl;
258
use warnings;
259
use HTTP::OAI;
258
use HTTP::OAI;
260
use HTTP::OAI::Metadata::OAI_DC;
259
use HTTP::OAI::Metadata::OAI_DC;
261
260
Lines 300-322 sub new { Link Here
300
    my $self = HTTP::OAI::GetRecord->new(%args);
299
    my $self = HTTP::OAI::GetRecord->new(%args);
301
300
302
    my $dbh = C4::Context->dbh;
301
    my $dbh = C4::Context->dbh;
303
    my $sth = $dbh->prepare("
304
        SELECT marcxml, timestamp
305
        FROM   biblioitems
306
        WHERE  biblionumber=? " );
307
    my $prefix = $repository->{koha_identifier} . ':';
302
    my $prefix = $repository->{koha_identifier} . ':';
308
    my ($biblionumber) = $args{identifier} =~ /^$prefix(.*)/;
303
    my ($biblionumber) = $args{identifier} =~ /^$prefix(.*)/;
309
    $sth->execute( $biblionumber );
310
    my ($marcxml, $timestamp);
304
    my ($marcxml, $timestamp);
311
    my $deleted = 0;
305
    my $deleted = 0;
312
    unless ( ($marcxml, $timestamp) = $sth->fetchrow ) {
306
    unless ( ($marcxml, $timestamp) = $dbh->selectrow_array(q/
313
      $sth = $dbh->prepare("
307
        SELECT marcxml, timestamp
314
        SELECT biblionumber, timestamp
308
        FROM   biblioitems
315
        FROM deletedbiblio
309
        WHERE  biblionumber=? /, undef, $biblionumber)) {
316
        WHERE biblionumber=? " );
310
317
      $sth->execute( $biblionumber );
311
      unless ( ($marcxml, $timestamp) = $dbh->selectrow_array(q/
312
          SELECT biblionumber, timestamp
313
          FROM deletedbiblio
314
          WHERE biblionumber=? /, undef, $biblionumber )) {
318
315
319
      unless ( ($marcxml, $timestamp) = $sth->fetchrow ) {
320
316
321
        return HTTP::OAI::Response->new(
317
        return HTTP::OAI::Response->new(
322
            requestURL  => $repository->self_url(),
318
            requestURL  => $repository->self_url(),
Lines 370-376 sub new { Link Here
370
    }
366
    }
371
    my $max = $repository->{koha_max_count};
367
    my $max = $repository->{koha_max_count};
372
    my $sql = "
368
    my $sql = "
373
        (SELECT biblioitems.biblionumber, timestamp
369
        (SELECT biblioitems.biblionumber, biblioitems.timestamp
374
        FROM biblioitems
370
        FROM biblioitems
375
    ";
371
    ";
376
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
372
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
Lines 535-541 sub new { Link Here
535
    }
531
    }
536
    my $max = $repository->{koha_max_count};
532
    my $max = $repository->{koha_max_count};
537
    my $sql = "
533
    my $sql = "
538
        (SELECT biblioitems.biblionumber, marcxml, timestamp
534
        (SELECT biblioitems.biblionumber, biblioitems.marcxml, biblioitems.timestamp
539
        FROM biblioitems
535
        FROM biblioitems
540
    ";
536
    ";
541
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
537
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
542
- 

Return to bug 3206