show callnumber in result list and update SQL by using LEFT JOIN

Signed-off-by: Chris Cormack <crc@liblime.com>
This commit is contained in:
Paul POULAIN 2007-08-16 12:28:46 +02:00 committed by Chris Cormack
parent 720bc7b37a
commit 1e6c13df39
2 changed files with 22 additions and 20 deletions

View file

@ -623,11 +623,11 @@ sub GetSubscriptions {
my $sth;
if ($biblionumber) {
my $query = qq(
SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,subscription.branchcode,biblio.biblionumber
FROM subscription,biblio,biblioitems
WHERE biblio.biblionumber = biblioitems.biblionumber
AND biblio.biblionumber = subscription.biblionumber
AND biblio.biblionumber=?
SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber
FROM subscription
LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
WHERE biblio.biblionumber=?
);
if (C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
@ -642,11 +642,11 @@ sub GetSubscriptions {
else {
if ( $ISSN and $title ) {
my $query = qq|
SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,subscription.branchcode,biblio.biblionumber
FROM subscription,biblio,biblioitems
WHERE biblio.biblionumber = biblioitems.biblionumber
AND biblio.biblionumber= subscription.biblionumber
AND (biblioitems.issn = ? or|. join('and ',map{"biblio.title LIKE \"%$_%\""}split (" ",$title))." )";
SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber
FROM subscription
LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
WHERE (biblioitems.issn = ? or|. join('and ',map{"biblio.title LIKE \"%$_%\""}split (" ",$title))." )";
if (C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
@ -660,11 +660,11 @@ sub GetSubscriptions {
else {
if ($ISSN) {
my $query = qq(
SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,subscription.branchcode,biblio.biblionumber
FROM subscription,biblio,biblioitems
WHERE biblio.biblionumber = biblioitems.biblionumber
AND biblio.biblionumber=subscription.biblionumber
AND biblioitems.issn LIKE ?
SELECT subscription.*,biblio.title,biblioitems.issn,,biblio.biblionumber
FROM subscription
LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
WHERE biblioitems.issn LIKE ?
);
if (C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
@ -678,10 +678,11 @@ sub GetSubscriptions {
}
else {
my $query = qq(
SELECT subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,subscription.branchcode,biblio.biblionumber
FROM subscription,biblio,biblioitems
WHERE biblio.biblionumber = biblioitems.biblionumber
AND biblio.biblionumber=subscription.biblionumber
SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber
FROM subscription
LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
WHERE 1
).($title?" and ":""). join('and ',map{"biblio.title LIKE \"%$_%\""} split (" ",$title) );
warn $query;

View file

@ -119,7 +119,8 @@ Serials updated :
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF name="callnumber" --><p><!-- TMPL_VAR name="callnumber" --></p><!-- /TMPL_IF -->
</td>
<!-- TMPL_IF name="toggle" -->
<td class="hilighted">