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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-5 / +7 lines)
Lines 17-25 Reference Manager or ProCite. Link Here
17
[% IF ( comment ) %]
17
[% IF ( comment ) %]
18
[% comment %]
18
[% comment %]
19
[% END %]
19
[% END %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %][% subtitle.subfield %][% END %][% END %][% IF ( BIBLIO_RESULT.author ) %]
21
Author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
21
22
[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
22
by [% BIBLIO_RESULT.author %][% END %]
23
[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %]
24
Additional author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %] [% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
23
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
25
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
24
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
26
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
25
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
27
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
Lines 31-39 Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %] Link Here
31
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
33
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
32
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
34
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
33
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
35
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
34
url : [% BIBLIO_RESULT.url %][% END %]
36
url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
35
In the online catalog:
37
In the online catalog:
36
[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
38
    http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
37
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
39
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
38
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
40
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
39
41
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt (-4 / +7 lines)
Lines 17-24 Reference Manager or ProCite. Link Here
17
[% IF ( comment ) %]
17
[% IF ( comment ) %]
18
[% comment %]
18
[% comment %]
19
[% END %]
19
[% END %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %][% subtitle.subfield %][% END %][% END %][% IF ( BIBLIO_RESULT.author ) %]
21
Author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
21
22
by [% BIBLIO_RESULT.author %][% END %]
23
[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %]
24
Additional author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %] [% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
22
[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
25
[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
23
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
26
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
24
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
27
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
Lines 31-39 Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %] Link Here
31
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
34
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
32
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
35
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
33
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
36
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
34
url : [% BIBLIO_RESULT.url %][% END %]
37
url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
35
In the online catalog:
38
In the online catalog:
36
[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
39
    http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
37
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
40
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
38
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
41
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
39
42
(-)a/opac/opac-sendshelf.pl (-3 / +9 lines)
Lines 81-92 if ( $email ) { Link Here
81
    # retrieve biblios from shelf
81
    # retrieve biblios from shelf
82
    foreach my $biblio (@$items) {
82
    foreach my $biblio (@$items) {
83
        my $biblionumber = $biblio->{biblionumber};
83
        my $biblionumber = $biblio->{biblionumber};
84
84
        my $fw               = GetFrameworkCode($biblionumber);
85
        my $dat              = GetBiblioData($biblionumber);
85
        my $dat              = GetBiblioData($biblionumber);
86
        my $record           = GetMarcBiblio($biblionumber);
86
        my $record           = GetMarcBiblio($biblionumber);
87
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
87
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
88
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
88
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
89
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
89
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
90
        my $subtitle         = GetRecordValue('subtitle', $record, $fw);
90
91
91
        my @items = GetItemsInfo( $biblionumber );
92
        my @items = GetItemsInfo( $biblionumber );
92
93
Lines 95-107 if ( $email ) { Link Here
95
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
96
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
96
        $dat->{'biblionumber'} = $biblionumber;
97
        $dat->{'biblionumber'} = $biblionumber;
97
        $dat->{ITEM_RESULTS}   = \@items;
98
        $dat->{ITEM_RESULTS}   = \@items;
99
        $dat->{subtitle}       = $subtitle;
98
100
99
        $iso2709 .= $record->as_usmarc();
101
        $iso2709 .= $record->as_usmarc();
100
102
101
        push( @results, $dat );
103
        push( @results, $dat );
102
    }
104
    }
103
105
104
    my $user = GetMember(borrowernumber => $borrowernumber); 
106
    my $user = GetMember(borrowernumber => $borrowernumber);
107
108
    if (C4::Context->preference('OPACBaseURL')){
109
          $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
110
    }
105
111
106
    $template2->param(
112
    $template2->param(
107
        BIBLIO_RESULTS => \@results,
113
        BIBLIO_RESULTS => \@results,
Lines 185-188 END_OF_BODY Link Here
185
                      url     => "/cgi-bin/koha/opac-sendshelf.pl",
191
                      url     => "/cgi-bin/koha/opac-sendshelf.pl",
186
    );
192
    );
187
    output_html_with_http_headers $query, $cookie, $template->output;
193
    output_html_with_http_headers $query, $cookie, $template->output;
188
}
194
}
(-)a/virtualshelves/sendshelf.pl (-3 / +8 lines)
Lines 77-89 if ( $email ) { Link Here
77
77
78
    # retrieve biblios from shelf
78
    # retrieve biblios from shelf
79
    foreach my $biblio (@$items) {
79
    foreach my $biblio (@$items) {
80
        my $biblionumber = $biblio->{biblionumber};
80
        my $biblionumber     = $biblio->{biblionumber};
81
81
        my $fw               = GetFrameworkCode($biblionumber);
82
        my $dat              = GetBiblioData($biblionumber);
82
        my $dat              = GetBiblioData($biblionumber);
83
        my $record           = GetMarcBiblio($biblionumber);
83
        my $record           = GetMarcBiblio($biblionumber);
84
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
84
        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
85
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
85
        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
86
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
86
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
87
        my $subtitle         = GetRecordValue('subtitle', $record, $fw);
87
88
88
        my @items = GetItemsInfo( $biblionumber );
89
        my @items = GetItemsInfo( $biblionumber );
89
90
Lines 92-103 if ( $email ) { Link Here
92
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
93
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
93
        $dat->{'biblionumber'} = $biblionumber;
94
        $dat->{'biblionumber'} = $biblionumber;
94
        $dat->{ITEM_RESULTS}   = \@items;
95
        $dat->{ITEM_RESULTS}   = \@items;
96
        $dat->{subtitle}       = $subtitle;
95
97
96
        $iso2709 .= $record->as_usmarc();
98
        $iso2709 .= $record->as_usmarc();
97
99
98
        push( @results, $dat );
100
        push( @results, $dat );
99
    }
101
    }
100
102
103
  if (C4::Context->preference('OPACBaseURL')){
104
        $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
105
  }
106
101
    $template2->param(
107
    $template2->param(
102
        BIBLIO_RESULTS => \@results,
108
        BIBLIO_RESULTS => \@results,
103
        email_sender   => $email_from,
109
        email_sender   => $email_from,
104
- 

Return to bug 6957