Skip to content

Commit 02e6701

Browse files
committed
(follow-up) Fix insert circ rules since bug 18925
I messed everything up in the last commit. I cherry-picked a local branch that contained changes for the whole circ rules move. Here (18925) we only moved maxissueqty and maxonsiteissueqty TODO: Things are going to be even more dirty when other changes will be pushed, we will need to rework this code to make it more robust.
1 parent 8eb9c24 commit 02e6701

1 file changed

Lines changed: 27 additions & 36 deletions

File tree

insert_data.pl

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -126,43 +126,34 @@ sub insert_default_circ_rule {
126126
);
127127
$sth->execute('maxissueqty', 5);
128128
$sth->execute('maxonsiteissueqty', 5);
129-
$sth->execute('issuelength', 5);
130-
$sth->execute('lengthunit', 'days');
131-
$sth->execute('renewalperiod', 5);
132-
$sth->execute('reservesallowed', 5);
133-
$sth->execute('holds_per_record', 2);
134-
$sth->execute('onshelfholds', 1);
135-
$sth->execute('opacitemholds', 'Y');
136-
$sth->execute('article_requests', 'yes');
137-
} else {
138-
$dbh->do(
139-
q|INSERT INTO issuingrules (
140-
categorycode, itemtype, branchcode,
141-
maxissueqty
142-
| . ( $VERSION >= '32100035' ? ', maxonsiteissueqty' : '' ) . q|
143-
, issuelength
144-
, lengthunit
145-
, renewalperiod
146-
, reservesallowed
147-
| . ( $VERSION >= '160600018' ? ', holds_per_record' : '' ) . q|
148-
| . ( $VERSION >= '31900017' ? ', onshelfholds' : '' ) . q|
149-
| . ( $VERSION >= '31900017' ? ', opacitemholds' : '' ) . q|
150-
| . ( $VERSION >= '160600037' ? ', article_requests' : '' ) . q|
151-
) VALUES (
152-
'*', '*', '*',
153-
5
154-
| . ( $VERSION >= '32100035' ? ', 5' : '' ) . q|
155-
, 5
156-
, 'days'
157-
, 5
158-
, 5
159-
| . ( $VERSION >= '160600018' ? ', 2 ' : '' ) . q|
160-
| . ( $VERSION >= '31900017' ? ', 1 ' : '' ) . q|
161-
| . ( $VERSION >= '31900017' ? ', "Y" ' : '' ) . q|
162-
| . ( $VERSION >= '160600037' ? ', "yes" ' : '' ) . q|
163-
)|
164-
);
165129
}
130+
$dbh->do(
131+
q|INSERT INTO issuingrules (
132+
categorycode, itemtype, branchcode
133+
| . ( $VERSION < '181200020' ? ', maxissueqty' : '' ) . q|
134+
| . ( $VERSION >= '32100035' && $VERSION < '181200020' ? ', maxonsiteissueqty' : '' ) . q|
135+
, issuelength
136+
, lengthunit
137+
, renewalperiod
138+
, reservesallowed
139+
| . ( $VERSION >= '160600018' ? ', holds_per_record' : '' ) . q|
140+
| . ( $VERSION >= '31900017' ? ', onshelfholds' : '' ) . q|
141+
| . ( $VERSION >= '31900017' ? ', opacitemholds' : '' ) . q|
142+
| . ( $VERSION >= '160600037' ? ', article_requests' : '' ) . q|
143+
) VALUES (
144+
'*', '*', '*'
145+
| . ( $VERSION < '181200020' ? ', 5' : '' ) . q|
146+
| . ( $VERSION >= '32100035' && $VERSION < '181200020' ? ', 5' : '' ) . q|
147+
, 5
148+
, 'days'
149+
, 5
150+
, 5
151+
| . ( $VERSION >= '160600018' ? ', 2 ' : '' ) . q|
152+
| . ( $VERSION >= '31900017' ? ', 1 ' : '' ) . q|
153+
| . ( $VERSION >= '31900017' ? ', "Y" ' : '' ) . q|
154+
| . ( $VERSION >= '160600037' ? ', "yes" ' : '' ) . q|
155+
)|
156+
);
166157
}
167158

168159
sub configure_plugins {

0 commit comments

Comments
 (0)