Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains -

Adding - to regexp for matching branch code. Wondering if other characters should not be added too.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl
index c05ec48..c5e1fd3 100755 (executable)
--- a/cataloguing/value_builder/barcode.pl
+++ b/cataloguing/value_builder/barcode.pl
@@ -102,7 +102,7 @@ sub plugin_javascript {
         $year = substr($year, -2);
         $query = "SELECT MAX(CAST(SUBSTRING(barcode,-4) AS signed)) AS number FROM items WHERE barcode REGEXP ?";
         my $sth = $dbh->prepare($query);
-        $sth->execute("^[a-zA-Z]{1,}$year");
+        $sth->execute("^[-a-zA-Z]{1,}$year");
         while (my ($count)= $sth->fetchrow_array) {
             $nextnum = $count if $count;
             $nextnum = 0 if $nextnum == 9999; # this sequence only allows for cataloging 10000 books per month