see mail on koha-devel : code cleaning on Search.pm + normalizing API + use of biblio...

diff --git a/C4/Circulation/Returns.pm b/C4/Circulation/Returns.pm
index 1379abe..ccb139d 100755 (executable)
--- a/C4/Circulation/Returns.pm
+++ b/C4/Circulation/Returns.pm
@@ -38,7 +38,7 @@ use C4::Circulation::Main;
        # use each other, so functions get redefined.
 use C4::Scan;
 use C4::Stats;
-use C4::Search;
+use C4::Members;
 use C4::Print;
 
 use vars qw($VERSION @ISA @EXPORT);
@@ -90,7 +90,7 @@ sub Returns {
       if ($resp ne "") {
         #if ($resp eq "Returned") {
        if ($itemno ne "" ) {
-         my $item = itemnodata($env,$dbh,$itemno);
+         my $item = getbibliofromitemnumber($env,$dbh,$itemno);
          # FIXME - This relies on C4::Circulation::Main to have a
          # "use C4::Circulation::Issues;" line, which is bogus.
          my $fmtitem = C4::Circulation::Issues::formatitem($env,$item,"",$amt_owing);
@@ -282,7 +282,7 @@ sub updatelastseen {
 # obsolete. So presumably this function is obsolete too.
 sub find_reserves {
   my ($env,$dbh,$itemno) = @_;
-  my $itemdata = itemnodata($env,$dbh,$itemno);
+  my $itemdata = getbibliofromitemnumber($env,$dbh,$itemno);
   my $sth = $dbh->prepare("select * from reserves where found is null
   and biblionumber = ? and cancellationdate is NULL
   order by priority,reservedate ");

diff --git a/koha-curses/circ.pl b/koha-curses/circ.pl
index 087c34c..e668023 100755 (executable)
--- a/koha-curses/circ.pl
+++ b/koha-curses/circ.pl
@@ -23,7 +23,7 @@ use strict;
 use lib '/usr/local/koha/intranet/modules';
 use Curses::UI;
 use C4::Circulation::Circ2;
-use C4::Search;
+use C4::Members;
 use C4::Print;
 use C4::Context;
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl
index acb9690..f0797fb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl
@@ -3,7 +3,7 @@
 <div id="mainbloc">
        <h1 class="catalogue">Adding a new Biblio</h1>
        
-       <div id="bloc60">
+       <div class="bloc25">
                <h2 class="catalogue">Section One: Copyright Information </h2>
        
                <!-- TMPL_IF NAME="ERROR" -->
@@ -23,11 +23,11 @@
                <p><label class="label100">&nbsp;</label><input name="seriestitle" size="40" /></p>
                <p>Subject Headings: <i>One Subject per line</i></p>
                <p><label class="label100">&nbsp;</label>
-                       <textarea class="form-box-textarea2" name="subjectheadings" cols="30" rows="6"></textarea>
+                       <textarea class="form-box-textarea2" name="subjectheadings" cols="40" rows="6"></textarea>
                </p>
-               <label class="label100">Copyright Date:</label><input name="copyrightdate" size="40" /></p>
-               <label class="label100">Abstract:</label><textarea cols="30" rows="6" name="abstract"></textarea></p>
-               <label class="label100">Notes:</label><textarea cols="30" rows="6" name="notes"></textarea></p>
+               <p><label class="label100">Copyright Date:</label><input name="copyrightdate" size="40" /></p>
+               <p><label class="label100">Abstract:</label><textarea cols="40" rows="6" name="abstract"></textarea></p>
+               <p><label class="label100">Notes:</label><textarea cols="40" rows="6" name="notes"></textarea></p>
                <p><input type="submit" value="Submit" class="button catalogue"></p>
                </form>
                * Required

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
index 8e6d44d..25b0739 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
@@ -71,7 +71,7 @@
                                </select>
                        </td>
                        <td>
-                               <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=10 maxlength=15>
+                               <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
                        </td>
                </tr>
        <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl
index 9194eda..05e9093 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl
@@ -18,18 +18,20 @@
                <p><label class="label100">Supplier</label><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>)<a href="#" onClick="FindAcqui(f)">...</a></p>
                <p><label class="label100">Biblio</label><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>)<a href="#" onClick="Plugin(f)">...</a></p>
                <p><label class="label100">Notes</label><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></p>
-               <p><label class="label100">Enable issue alert</label>
-                       <select name="letter">
-                               <option value=""></option>
-                               <!-- TMPL_LOOP name="letters" -->
-                                       <!-- TMPL_IF name="selected" -->
-                                               <option value="<!-- TMPL_VAR name="code" -->" selected><!-- TMPL_VAR name="name" --></option>
-                                       <!-- TMPL_ELSE -->
-                                               <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
-                                       <!-- /TMPL_IF -->
-                               <!-- /TMPL_LOOP -->
-                       </select>
-               </p>
+               <!-- TMPL_IF name="letters" -->
+                       <p><label class="label100">Enable issue alert</label>
+                               <select name="letter">
+                                       <option value=""></option>
+                                       <!-- TMPL_LOOP name="letters" -->
+                                               <!-- TMPL_IF name="selected" -->
+                                                       <option value="<!-- TMPL_VAR name="code" -->" selected><!-- TMPL_VAR name="name" --></option>
+                                               <!-- TMPL_ELSE -->
+                                                       <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
+                                               <!-- /TMPL_IF -->
+                                       <!-- /TMPL_LOOP -->
+                               </select>
+                       </p>
+               <!-- /TMPL_IF -->
                <p class="problem">warning</p>
                <ul>
                        <li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
index 5dd3fda..941266c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
@@ -3,7 +3,8 @@
 <div id="mainbloc">
 <h1 class="bull">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
 <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Modify subscription">Edit</a>
-<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Recieve issues">Receive</a>
+<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Recieve issues">Receive issues</a>
+<a href="distribution.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="Recieve issues">Define distribution</a>
 <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="All issues on this title">Issue history</a>
 <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
 <!-- TMPL_IF name="letter" -->
@@ -28,9 +29,11 @@
                        <!-- TMPL_IF name="letter" -->
                                <label class="label100">Issue alert with letter:</label><!-- TMPL_VAR name="letter" -->
                        <!-- TMPL_ELSE -->
-                               <label class="label100">Borrowers can't subscribe to issue alerts</label>
+                               Borrowers can't subscribe to issue alerts
                        <!-- /TMPL_IF -->
                </p>
+               <p><label>Distributed to</label></p>
+               <p><!-- TMPL_IF name="distributedto" --></p>
 </div>
 <div id="bloc25">
        <h2 class="bull">Planning</h2>

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index 79b9efe..7622735 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -4,10 +4,10 @@
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
        <h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
        <div class="bibliomenu">
-               <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+               <a href="acqui.simple/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
                        Edit biblio
                </a>
-               <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
+               <a href="acqui.simple/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
                        Duplicate
                </a>
                <a href="acqui.simple/additem.pl?biblionumber=<!-- TMPL_VAR name="biblionumber"-->&biblioitem=<!-- TMPL_VAR name="biblioitemnumber" -->" class="button catalogue">
@@ -17,19 +17,19 @@
                <a href="javascript:confirm_deletion()" class="button catalogue">
                        delete
                </a>
-               <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+               <a href="MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
                        Complete
                </a>
-               <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+               <a href="detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
                        Normal
                </a>
-               <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+               <a href="ISBDdetail.pl?biblionumber=<!-- 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">
+               <a href="javascript:Dopop('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
                        Print
                </a>
                <!-- TMPL_IF name="subscriptionsnumber" -->
@@ -39,7 +39,7 @@
                <!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="norequests" -->
                <!-- TMPL_ELSE -->
-                       <a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Request</a>
+                       <a href="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Request</a>
                <!-- /TMPL_IF -->
        </div>
        <div id="bloc25">

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index bb1202c..e5c4b21 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -268,7 +268,7 @@
                        None
                <!-- /TMPL_IF -->
        </div>
-
+       <!-- TMPL_IF name="alertloop" -->
                <div class="bloc25">
                <h2 class="members">Alert subscriptions</h2>
                        <table>
@@ -285,6 +285,7 @@
                        <!-- /TMPL_LOOP -->
                        </table>
                </div>
+       <!-- /TMPL_IF -->
 
        
 </div>

diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 6bab850..99d9ea0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -1,11 +1,11 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 <div id="mainbloc">
        <form action="placerequest.pl" method="post" name="request">
-       <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
+       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
        <input type="hidden" name="type" value="str8">
        <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
        <h1 class="catalogue">
-               Requesting: <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->"><!-- TMPL_VAR NAME="title" --></a>
+               Requesting: <a href="/cgi-bin/koha/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
                <!-- TMPL_VAR NAME="author" -->
        </h1>
        <div id="bloc25">
@@ -24,7 +24,14 @@
                <p><label class="label100">Member Number</label><input type="text" size="10" name="member"> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="openWindow('/cgi-bin/koha/members/members-home.pl?quicksearch=1', 'newwin'); return false;">(Quick Search)</a></p>
                <p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
                <p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
-               <p><label class="label100">Pickup</label><!-- TMPL_VAR NAME="CGIbranch" --></p>
+               <p><label class="label100">Pickup</label>
+                       <select name="pickup">
+                               <option value="">Default</option>
+                       <!-- TMPL_LOOP name="branchloop" -->
+                               <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+                       <!-- /TMPL_LOOP -->
+                       </select>
+</p>
                <p>
                        <label class="label100">Request</label><input type="checkbox" name="request" value="any">Next Available, or choose from list below
                </p>
@@ -89,7 +96,7 @@
                                        <tr>
                                                <td>
                                                        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-                                                       <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+                                                       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
                                                        <select name="rank-request">
                                                                <!-- TMPL_IF Name="wait" -->
                                                                        <option value="W" selected>Waiting</option>
@@ -126,7 +133,7 @@
                                                </td>
                                                <td>
                                                        <!-- TMPL_IF Name="wait" -->
-                                                               <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
+                                                               <a href="/cgi-bin/koha/detail.pl?biblionumber=<!-- TMPL_VAR NAME=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
                                                                        <!-- TMPL_VAR NAME="barcode" -->
                                                                </a>
                                                        <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index ed39925..a1fb3a4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -69,7 +69,12 @@
                                <input type="hidden" name="and_or" value="and">
                                <input type="hidden" name="excluding" value="">
                                <input type="hidden" name="operator" value="=">  
-                               <!-- TMPL_VAR name="CGIbranch" -->
+                               <select name="branch">
+                                       <option value="">Default</option>
+                               <!-- TMPL_LOOP name="branchloop" -->
+                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+                               <!-- /TMPL_LOOP -->
+                               </select>
                </p>
        </div>
        <div class="bloc25">

diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
index 793a952..64197ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
@@ -104,7 +104,7 @@
 
 function report(index,summary)
 {      
-       var regexp= /(\d* \/ *)(.*)/;
+       var regexp= /(\d* - *)(.*)/;
        var result=summary.match(regexp);
        opener.document.f.field_value[index].value=result[2];
        self.close();

diff --git a/search.marc/search.pl b/search.marc/search.pl
index 21d0e8c..8ba60de 100755 (executable)
--- a/search.marc/search.pl
+++ b/search.marc/search.pl
@@ -343,26 +343,23 @@ else {
        my @branches;
        my @select_branch;
        my %select_branches;
-       my ($count2,@branches)=branches();
-       push @select_branch, "";
-       $select_branches{''} = "";
-       for (my $i=0;$i<$count2;$i++){
-               push @select_branch, $branches[$i]->{'branchcode'};#
-               $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
+       my $branches=getbranches();
+       my @branchloop;
+       foreach my $thisbranch (sort keys %$branches) {
+#              my $selected = 1 if $thisbranch eq $branch;
+               my %row =(value => $thisbranch,
+#                                      selected => $selected,
+                                       branchname => $branches->{$thisbranch}->{'branchname'},
+                               );
+               push @branchloop, \%row;
        }
-       my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-                               -id => 'branch',
-                               -values   => \@select_branch,
-                               -labels   => \%select_branches,
-                               -size     => 1,
-                               -multiple => 0 );
        $sth->finish;
 
 
        $template->param("statements" => \@statements,
                        "nbstatements" => 3,
                        CGIitemtype => $CGIitemtype,
-                       CGIbranch => $CGIbranch,
+                       branchloop => \@branchloop,
                        );
 }