Lines 146-154
sub get_opac_news {
Link Here
|
146 |
my $dbh = C4::Context->dbh; |
146 |
my $dbh = C4::Context->dbh; |
147 |
my $query = q{ |
147 |
my $query = q{ |
148 |
SELECT opac_news.*, branches.branchname, |
148 |
SELECT opac_news.*, branches.branchname, |
149 |
timestamp AS newdate |
149 |
timestamp AS newdate, |
|
|
150 |
borrowers.title AS author_title, |
151 |
borrowers.firstname AS author_firstname, |
152 |
borrowers.surname AS author_surname |
150 |
FROM opac_news LEFT JOIN branches |
153 |
FROM opac_news LEFT JOIN branches |
151 |
ON opac_news.branchcode=branches.branchcode |
154 |
ON opac_news.branchcode=branches.branchcode |
|
|
155 |
LEFT JOIN borrowers on borrowers.borrowernumber = opac_news.borrowernumber |
152 |
}; |
156 |
}; |
153 |
$query .= ' WHERE 1'; |
157 |
$query .= ' WHERE 1'; |
154 |
if ($lang) { |
158 |
if ($lang) { |
Lines 190-197
sub GetNewsToDisplay {
Link Here
|
190 |
my $dbh = C4::Context->dbh; |
194 |
my $dbh = C4::Context->dbh; |
191 |
# SELECT *,DATE_FORMAT(timestamp, '%d/%m/%Y') AS newdate |
195 |
# SELECT *,DATE_FORMAT(timestamp, '%d/%m/%Y') AS newdate |
192 |
my $query = q{ |
196 |
my $query = q{ |
193 |
SELECT *,timestamp AS newdate |
197 |
SELECT opac_news.*,timestamp AS newdate, |
|
|
198 |
borrowers.title AS author_title, |
199 |
borrowers.firstname AS author_firstname, |
200 |
borrowers.surname AS author_surname |
194 |
FROM opac_news |
201 |
FROM opac_news |
|
|
202 |
LEFT JOIN borrowers on borrowers.borrowernumber = opac_news.borrowernumber |
195 |
WHERE ( |
203 |
WHERE ( |
196 |
expirationdate >= CURRENT_DATE() |
204 |
expirationdate >= CURRENT_DATE() |
197 |
OR expirationdate IS NULL |
205 |
OR expirationdate IS NULL |
Lines 199-205
sub GetNewsToDisplay {
Link Here
|
199 |
) |
207 |
) |
200 |
AND DATE(timestamp) < DATE_ADD(CURDATE(), INTERVAL 1 DAY) |
208 |
AND DATE(timestamp) < DATE_ADD(CURDATE(), INTERVAL 1 DAY) |
201 |
AND (lang = '' OR lang = ?) |
209 |
AND (lang = '' OR lang = ?) |
202 |
AND (branchcode IS NULL OR branchcode = ?) |
210 |
AND (opac_news.branchcode IS NULL OR opac_news.branchcode = ?) |
203 |
ORDER BY number |
211 |
ORDER BY number |
204 |
}; # expirationdate field is NOT in ISO format? |
212 |
}; # expirationdate field is NOT in ISO format? |
205 |
# timestamp has HH:mm:ss, CURRENT_DATE generates 00:00:00 |
213 |
# timestamp has HH:mm:ss, CURRENT_DATE generates 00:00:00 |