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

(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 233-238 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
233
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
233
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
234
('OAI-PMH:AutoUpdateSets','0','','Automatically update OAI sets when a bibliographic record is created or updated','YesNo'),
234
('OAI-PMH:AutoUpdateSets','0','','Automatically update OAI sets when a bibliographic record is created or updated','YesNo'),
235
('OAI-PMH:ConfFile','',NULL,'If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.','File'),
235
('OAI-PMH:ConfFile','',NULL,'If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.','File'),
236
('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')
236
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
237
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
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'),
238
('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'),
238
('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'),
239
('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 242-249 sub new { Link Here
242
242
243
package C4::OAI::DeletedRecord;
243
package C4::OAI::DeletedRecord;
244
244
245
use strict;
245
use Modern::Perl;
246
use warnings;
247
use HTTP::OAI;
246
use HTTP::OAI;
248
use HTTP::OAI::Metadata::OAI_DC;
247
use HTTP::OAI::Metadata::OAI_DC;
249
248
Lines 288-310 sub new { Link Here
288
    my $self = HTTP::OAI::GetRecord->new(%args);
287
    my $self = HTTP::OAI::GetRecord->new(%args);
289
288
290
    my $dbh = C4::Context->dbh;
289
    my $dbh = C4::Context->dbh;
291
    my $sth = $dbh->prepare("
292
        SELECT marcxml, timestamp
293
        FROM   biblioitems
294
        WHERE  biblionumber=? " );
295
    my $prefix = $repository->{koha_identifier} . ':';
290
    my $prefix = $repository->{koha_identifier} . ':';
296
    my ($biblionumber) = $args{identifier} =~ /^$prefix(.*)/;
291
    my ($biblionumber) = $args{identifier} =~ /^$prefix(.*)/;
297
    $sth->execute( $biblionumber );
298
    my ($marcxml, $timestamp);
292
    my ($marcxml, $timestamp);
299
    my $deleted = 0;
293
    my $deleted = 0;
300
    unless ( ($marcxml, $timestamp) = $sth->fetchrow ) {
294
    unless ( ($marcxml, $timestamp) = $dbh->selectrow_array(q/
301
      $sth = $dbh->prepare("
295
        SELECT marcxml, timestamp
302
        SELECT biblionumber, timestamp
296
        FROM   biblioitems
303
        FROM deletedbiblio
297
        WHERE  biblionumber=? /, undef, $biblionumber)) {
304
        WHERE biblionumber=? " );
298
305
      $sth->execute( $biblionumber );
299
      unless ( ($marcxml, $timestamp) = $dbh->selectrow_array(q/
300
          SELECT biblionumber, timestamp
301
          FROM deletedbiblio
302
          WHERE biblionumber=? /, undef, $biblionumber )) {
306
303
307
      unless ( ($marcxml, $timestamp) = $sth->fetchrow ) {
308
304
309
        return HTTP::OAI::Response->new(
305
        return HTTP::OAI::Response->new(
310
            requestURL  => $repository->self_url(),
306
            requestURL  => $repository->self_url(),
Lines 358-364 sub new { Link Here
358
    }
354
    }
359
    my $max = $repository->{koha_max_count};
355
    my $max = $repository->{koha_max_count};
360
    my $sql = "
356
    my $sql = "
361
        (SELECT biblioitems.biblionumber, timestamp
357
        (SELECT biblioitems.biblionumber, biblioitems.timestamp
362
        FROM biblioitems
358
        FROM biblioitems
363
    ";
359
    ";
364
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
360
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
Lines 523-529 sub new { Link Here
523
    }
519
    }
524
    my $max = $repository->{koha_max_count};
520
    my $max = $repository->{koha_max_count};
525
    my $sql = "
521
    my $sql = "
526
        (SELECT biblioitems.biblionumber, marcxml, timestamp
522
        (SELECT biblioitems.biblionumber, biblioitems.marcxml, biblioitems.timestamp
527
        FROM biblioitems
523
        FROM biblioitems
528
    ";
524
    ";
529
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
525
    $sql .= " JOIN oai_sets_biblios ON biblioitems.biblionumber = oai_sets_biblios.biblionumber " if defined $set;
530
- 

Return to bug 3206