Lines 960-965
sub GetNextSeq {
Link Here
|
960 |
$newlastvalue3 = $val->{setto3} if ( $newlastvalue3 > $val->{whenmorethan3} ); # reset counter if needed. |
960 |
$newlastvalue3 = $val->{setto3} if ( $newlastvalue3 > $val->{whenmorethan3} ); # reset counter if needed. |
961 |
$calculated =~ s/\{Z\}/$newlastvalue3/g; |
961 |
$calculated =~ s/\{Z\}/$newlastvalue3/g; |
962 |
|
962 |
|
|
|
963 |
my $x_label = $val->{'serialseq_x_label'}; |
964 |
my $y_label = $val->{'serialseq_y_label'}; |
965 |
my $z_label = $val->{'serialseq_z_label'}; |
966 |
$calculated =~ s/\{XL\}/$x_label/g; |
967 |
$calculated =~ s/\{YL\}/$y_label/g; |
968 |
$calculated =~ s/\{ZL\}/$z_label/g; |
969 |
|
963 |
return ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); |
970 |
return ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); |
964 |
} |
971 |
} |
965 |
|
972 |
|
Lines 1263-1269
sub ModSubscription {
Link Here
|
1263 |
$whenmorethan1, $setto1, $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, |
1270 |
$whenmorethan1, $setto1, $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, |
1264 |
$lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, |
1271 |
$lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, |
1265 |
$numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory, |
1272 |
$numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory, |
1266 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid |
1273 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, |
|
|
1274 |
$x_label, $y_label, $z_label |
1267 |
) = @_; |
1275 |
) = @_; |
1268 |
|
1276 |
|
1269 |
# warn $irregularity; |
1277 |
# warn $irregularity; |
Lines 1275-1283
sub ModSubscription {
Link Here
|
1275 |
add2=?,every2=?,whenmorethan2=?,setto2=?,lastvalue2=?,innerloop2=?, |
1283 |
add2=?,every2=?,whenmorethan2=?,setto2=?,lastvalue2=?,innerloop2=?, |
1276 |
add3=?,every3=?,whenmorethan3=?,setto3=?,lastvalue3=?,innerloop3=?, |
1284 |
add3=?,every3=?,whenmorethan3=?,setto3=?,lastvalue3=?,innerloop3=?, |
1277 |
numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, |
1285 |
numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, |
1278 |
letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, |
1286 |
letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, |
1279 |
staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ? |
1287 |
staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?, |
1280 |
,enddate=? |
1288 |
enddate=?, serialseq_x_label=?, serialseq_y_label=?, serialseq_z_label=? |
1281 |
WHERE subscriptionid = ?"; |
1289 |
WHERE subscriptionid = ?"; |
1282 |
|
1290 |
|
1283 |
#warn "query :".$query; |
1291 |
#warn "query :".$query; |
Lines 1294-1300
sub ModSubscription {
Link Here
|
1294 |
$numberingmethod, $status, $biblionumber, $callnumber, |
1302 |
$numberingmethod, $status, $biblionumber, $callnumber, |
1295 |
$notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ), |
1303 |
$notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ), |
1296 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, |
1304 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, |
1297 |
$graceperiod, $location, $enddate, $subscriptionid |
1305 |
$graceperiod, $location, $enddate, $subscriptionid, |
|
|
1306 |
$x_label, $y_label, $z_label |
1298 |
); |
1307 |
); |
1299 |
my $rows = $sth->rows; |
1308 |
my $rows = $sth->rows; |
1300 |
|
1309 |
|
Lines 1325-1331
sub NewSubscription {
Link Here
|
1325 |
$lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, |
1334 |
$lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, |
1326 |
$add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, |
1335 |
$add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, |
1327 |
$notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, |
1336 |
$notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, |
1328 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate |
1337 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $x_label, |
|
|
1338 |
$y_label, $z_label |
1329 |
) = @_; |
1339 |
) = @_; |
1330 |
my $dbh = C4::Context->dbh; |
1340 |
my $dbh = C4::Context->dbh; |
1331 |
|
1341 |
|
Lines 1339-1346
sub NewSubscription {
Link Here
|
1339 |
add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3, |
1349 |
add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3, |
1340 |
numberingmethod, status, notes, letter,firstacquidate,irregularity, |
1350 |
numberingmethod, status, notes, letter,firstacquidate,irregularity, |
1341 |
numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems, |
1351 |
numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems, |
1342 |
staffdisplaycount,opacdisplaycount,graceperiod,location,enddate) |
1352 |
staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,serialseq_x_label,serialseq_y_label,serialseq_z_label) |
1343 |
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
1353 |
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
1344 |
|; |
1354 |
|; |
1345 |
my $sth = $dbh->prepare($query); |
1355 |
my $sth = $dbh->prepare($query); |
1346 |
$sth->execute( |
1356 |
$sth->execute( |
Lines 1349-1355
sub NewSubscription {
Link Here
|
1349 |
$lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, |
1359 |
$lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, |
1350 |
$add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, "$status", |
1360 |
$add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, "$status", |
1351 |
$notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, |
1361 |
$notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, |
1352 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate |
1362 |
$internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $x_label, |
|
|
1363 |
$y_label, $z_label |
1353 |
); |
1364 |
); |
1354 |
|
1365 |
|
1355 |
my $subscriptionid = $dbh->{'mysql_insertid'}; |
1366 |
my $subscriptionid = $dbh->{'mysql_insertid'}; |