new feature : checking for duplicate biblio.

For instance, it's only done on ISBN only. Will be improved soon.

When a duplicate is detected, the biblio is not saved, but the user is asked for a confirmations.

diff --git a/MARCdetail.pl b/MARCdetail.pl
index e9974f7..3dc8f02 100755 (executable)
--- a/MARCdetail.pl
+++ b/MARCdetail.pl
@@ -65,6 +65,8 @@ my $dbh=C4::Context->dbh;
 
 my $biblionumber=$query->param('bib');
 my $bibid = $query->param('bibid');
+my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
+
 $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
 $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
 my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
@@ -185,6 +187,7 @@ $template->param(item_loop => \@item_value_loop,
                                                bibid => $bibid,
                                                biblionumber => $biblionumber,
                                                subscriptionid => $subscriptionid,
+                                               popup => $popup,
                                                );
 output_html_with_http_headers $query, $cookie, $template->output;
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
index 64ad25e..e946a4f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
@@ -1,43 +1,44 @@
 <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
 
-<div class="tabbed">
-       <h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
-       <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
-               Edit biblio
-       </a>
-       <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
-               Edit item
-       </a>
-
-       <a href="javascript:confirm_deletion()" class="button catalogue">
-               delete
-       </a>
-       <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
-               Normal
-       </a>
-       <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
-               ISBD
-       </a>
-       <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
-               Add to shelf
-       </a>
-       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
-               Print
-       </a>
-       <!-- TMPL_IF name="subscriptionid" -->
-       <a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue">
-               Subscription
-       </a>
-       <a href="bull/serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
-               Issues
-       </a>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="norequests" -->
-       <!-- TMPL_ELSE -->
-               <a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Request</a>
-       <!-- /TMPL_IF -->
-</div>
-
+<!-- TMPL_UNLESS name="popup" -->
+       <div class="tabbed">
+               <h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
+               <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+                       Edit biblio
+               </a>
+               <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
+                       Edit item
+               </a>
+       
+               <a href="javascript:confirm_deletion()" class="button catalogue">
+                       delete
+               </a>
+               <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+                       Normal
+               </a>
+               <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+                       ISBD
+               </a>
+               <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+                       Add to shelf
+               </a>
+               <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+                       Print
+               </a>
+               <!-- TMPL_IF name="subscriptionid" -->
+               <a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue">
+                       Subscription
+               </a>
+               <a href="bull/serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+                       Issues
+               </a>
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="norequests" -->
+               <!-- TMPL_ELSE -->
+                       <a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Request</a>
+               <!-- /TMPL_IF -->
+       </div>
+<!-- /TMPL_UNLESS -->
        <div class="tabs">
                <!-- TMPL_IF NAME="0XX" -->
                        <div id="link0"><a href="javascript:active(0)">0</a></div>

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
index 935733b..5678e01 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc
@@ -38,26 +38,28 @@ a.catalogue:hover {
 </head>
 
 <body>
-<!-- MENUS -->
-<div id="menubar">
-       <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-       <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-       <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-       <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-       <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-       <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-       <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-       <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-       <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-       <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-       <a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">search</a>
-       <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu2">Add biblio</a>
-       <a class="bull" href="/cgi-bin/koha/bull-home.pl">Serial</a>
-       <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtual shelves</a>
-</div>
+<!-- TMPL_UNLESS name="popup" -->
+       <!-- MENUS -->
+       <div id="menubar">
+               <span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
+               <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
+               <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
+               <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+               <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
+               <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
+               <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
+               <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
+               <a class="about" href="/cgi-bin/koha/about.pl">About</a>
+               <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
+       </div>
+       <div id="submenu">
+               <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
+               <a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">search</a>
+               <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu2">Add biblio</a>
+               <a class="bull" href="/cgi-bin/koha/bull-home.pl">Serial</a>
+               <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtual shelves</a>
+       </div>
+<!-- /TMPL_UNLESS -->
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->