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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-32 / +153 lines)
Lines 2-45 Link Here
2
Your List : [% shelfname %]
2
Your List : [% shelfname %]
3
<END_SUBJECT>
3
<END_SUBJECT>
4
4
5
[% USE HtmlToText %]
6
[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %]
7
[% myhtmltext | html2text %]
8
5
<HEADER>
9
<HEADER>
6
Hi,
10
[% FILTER html2text %]
11
    <p>Hi,</p>
12
13
    <p>Here is your list called [% shelfname %], sent from our online catalog.</p>
7
14
8
Here is your list called [% shelfname %], sent from our online catalog.
15
    <p>Please note that the attached file is a MARC bibliographic records file
16
    which can be imported into a Personal Bibliographic Software like EndNote,
17
    Reference Manager or ProCite.</p>
18
    <hr/>
19
[% END %]
9
20
10
Please note that the attached file is a MARC bibliographic records file
11
which can be imported into a Personal Bibliographic Software like EndNote,
12
Reference Manager or ProCite.
13
<END_HEADER>
21
<END_HEADER>
14
22
15
<MESSAGE>
23
<MESSAGE>
16
---------------------------------------------
24
[% FILTER html2text %]
17
[% IF ( comment ) %]
25
18
[% comment %]
26
    [% IF comment %]
19
[% END %]
27
        <p>[% comment %]</p>
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 ) %]
28
        <hr/>
21
29
    [% END %]
22
by [% BIBLIO_RESULT.author %][% END %]
30
    <ol>
23
[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %]
31
    [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
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 ) %]
32
        <li>
25
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
33
            <span>
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 ) %]
34
                [% BIBLIO_RESULT.title %]
27
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
35
                [% IF ( BIBLIO_RESULT.subtitle.size ) %]
28
Subject: [% BIBLIO_RESULT.subject %][% END %][% IF ( BIBLIO_RESULT.copyrightdate ) %]
36
                  [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %]
29
Copyright year: [% BIBLIO_RESULT.copyrightdate %][% END %][% IF ( BIBLIO_RESULT.notes ) %]
37
                    [% subtitle.subfield %]
30
Notes : [% BIBLIO_RESULT.notes %][% END %][% IF ( BIBLIO_RESULT.unititle ) %]
38
                  [% END %]
31
Unified title: [% BIBLIO_RESULT.unititle %][% END %][% IF ( BIBLIO_RESULT.serial ) %]
39
                [% END %]
32
Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
40
            </span>
33
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
41
34
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
42
            <p>
35
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
43
            [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
36
URL : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
44
            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %]
37
In the online catalog:
45
38
    http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
46
            [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
39
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
47
                [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
40
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
48
                [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
41
49
                    [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
42
---------------------------------------------
50
                        [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %]
51
                    [% END %]
52
                    [% UNLESS ( loop.last ) %];[% END %]
53
                [% END %]
54
            [% END %]
55
            </span><br/>
56
            [% END %]
57
58
            [% IF ( BIBLIO_RESULT.ISBN && BIBLIO_RESULT.size > 0 ) %]
59
            <span>
60
                ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %]
61
                          [% isbn.marcisbn %]
62
                          [% UNLESS ( loop.last ) %]; [% END %]
63
                      [% END %]
64
            </span><br/>
65
            [% END %]
66
67
            [% IF BIBLIO_RESULT.publishercode %]
68
            <span>
69
                Published by: [% BIBLIO_RESULT.publishercode %]
70
                [% IF ( BIBLIO_RESULT.publicationyear ) %]
71
                    in [% BIBLIO_RESULT.publicationyear %]
72
                [% END %]
73
                [% IF ( BIBLIO_RESULT.pages ) %]
74
                    , [% BIBLIO_RESULT.pages %]
75
                [% END %]
76
                [% IF BIBLIO_RESULT.size %]
77
                , [% BIBLIO_RESULT.size %]
78
                [% END %]
79
            </span><br/>
80
            [% END %]
81
82
            [% IF BIBLIO_RESULT.collection %]
83
            <span>
84
                Collection: [% BIBLIO_RESULT.seriestitle %]
85
            </span><br/>
86
            [% END %]
87
88
            [% IF ( BIBLIO_RESULT.subject ) %]
89
            <span>
90
                Subject: [% BIBLIO_RESULT.subject %]
91
            <span><br/>
92
            [% END %]
93
94
            [% IF ( BIBLIO_RESULT.copyrightdate ) %]
95
            <span>
96
                Copyright year: [% BIBLIO_RESULT.copyrightdate %]
97
            </span><br/>
98
            [% END %]
99
100
            [% IF ( BIBLIO_RESULT.notes ) %]
101
            <span>
102
                Notes : [% BIBLIO_RESULT.notes %]
103
            </span><br/>
104
            [% END %]
105
106
            [% IF ( BIBLIO_RESULT.unititle ) %]
107
            <span>
108
                Unified title: [% BIBLIO_RESULT.unititle %]
109
            </span><br/>
110
            [% END %]
111
112
            [% IF ( BIBLIO_RESULT.serial ) %]
113
            <span>
114
                Serial: [% BIBLIO_RESULT.serial %]
115
            </span><br/>
116
            [% END %]
117
118
            [% IF ( BIBLIO_RESULT.dewey ) %]
119
            <span>
120
                Dewey: [% BIBLIO_RESULT.dewey %]
121
            </span><br/>
122
            [% END %]
123
124
            [% IF ( BIBLIO_RESULT.classification ) %]
125
            <span>
126
                Classification: [% BIBLIO_RESULT.classification %]
127
            </span><br/>
128
            [% END %]
129
130
            [% IF ( BIBLIO_RESULT.lccn ) %]
131
            <span>
132
                LCCN: [% BIBLIO_RESULT.lccn %]
133
            </span><br/>
134
            [% END %]
135
            [% IF ( BIBLIO_RESULT.url ) %]
136
            <span>
137
                URL: [% BIBLIO_RESULT.url %]
138
            </span>
139
            [% END %]
140
            </p>
141
142
            [% IF ( OPACBaseURL ) %]
143
            <p>
144
                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
145
            </p>
146
            [% END %]
147
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
148
            <p>Items:
149
            <ul>
150
                [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
151
                    [% ITEM_RESULT.branchname %]
152
                    [% ITEM_RESULT.location %]
153
                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
154
                    [% ITEM_RESULT.barcode %]
155
                </li>[% END %]
156
            </ul>
157
            </p>
158
            [% END %]
159
            <hr/>
160
        </li>
161
    [% END %]
162
    </ol>
43
163
44
[% END %]
164
[% END %]
165
45
<END_MESSAGE>
166
<END_MESSAGE>
(-)a/virtualshelves/sendshelf.pl (-8 / +14 lines)
Lines 21-27 use strict; Link Here
21
use warnings;
21
use warnings;
22
22
23
use CGI;
23
use CGI;
24
use Encode qw(encode);
24
use Encode qw(decode encode);
25
use Carp;
25
use Carp;
26
26
27
use Mail::Sendmail;
27
use Mail::Sendmail;
Lines 116-137 if ( $email ) { Link Here
116
    my $body;
116
    my $body;
117
117
118
    # Analysing information and getting mail properties
118
    # Analysing information and getting mail properties
119
    if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
119
    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
120
        $mail{'subject'} = $1;
120
        $mail{subject} = $1;
121
        $mail{subject} =~ s|\n?(.*)\n?|$1|;
121
    }
122
    }
122
    else { $mail{'subject'} = "no subject"; }
123
    else { $mail{'subject'} = "no subject"; }
123
124
124
    my $email_header = "";
125
    my $email_header = "";
125
    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
126
    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
126
        $email_header = $1;
127
        $email_header = $1;
128
        $email_header =~ s|\n?(.*)\n?|$1|;
127
    }
129
    }
128
130
129
    my $email_file = "basket.txt";
131
    my $email_file = "list.txt";
130
    if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
132
    if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
131
        $email_file = $1;
133
        $email_file = $1;
134
        $email_file =~ s|\n?(.*)\n?|$1|;
132
    }
135
    }
133
136
134
    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
137
    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
138
        $body = $1;
139
        $body =~ s|\n?(.*)\n?|$1|;
140
        $body = encode("UTF-8", encode_qp($body));
141
    }
135
142
136
    my $boundary = "====" . time() . "====";
143
    my $boundary = "====" . time() . "====";
137
144
138
- 

Return to bug 11248