Lines 50-61
use constant ATOMICUPD_PREF => '_LocalAtomicUpdates';
Link Here
|
50 |
my $debug = 0; |
50 |
my $debug = 0; |
51 |
my $aupd = { #hash for atomic updates |
51 |
my $aupd = { #hash for atomic updates |
52 |
location => C4::Context->config('intranetdir')."/installer/data/mysql/atomicupdate", |
52 |
location => C4::Context->config('intranetdir')."/installer/data/mysql/atomicupdate", |
|
|
53 |
mode => C4::Context->config('devupdatecontrol') || 'PROD', |
53 |
remember => C4::Context->preference(ATOMICUPD_PREF)//'', |
54 |
remember => C4::Context->preference(ATOMICUPD_PREF)//'', |
54 |
skipfiles => { |
55 |
skipfiles => { |
55 |
'Bug-4246-Talking-Tech-itiva-phone-notifications.pl' => 1, |
56 |
'Bug-4246-Talking-Tech-itiva-phone-notifications.pl' => 1, |
56 |
'oai_sets.sql' => 1, |
57 |
'oai_sets.sql' => 1, |
57 |
}, |
58 |
}, |
58 |
}; |
59 |
}; |
|
|
60 |
# Short explanation of the various dev update control modes: |
61 |
# PROD: Only install official database revisions (default and fallback) |
62 |
# RESET: After an official database rev, reinstall all development updates |
63 |
# ALWAYS: When upgrading, reinstall all development updates |
64 |
# TRACK: Do not reinstall applied development updates |
59 |
|
65 |
|
60 |
my ( |
66 |
my ( |
61 |
$sth, $sti, |
67 |
$sth, $sti, |
Lines 9700-9706
sub RunRemainingAtomicUpdates {
Link Here
|
9700 |
if( exists $atomicupd->{skipfiles}->{$upd} ) { |
9706 |
if( exists $atomicupd->{skipfiles}->{$upd} ) { |
9701 |
next; # Skip official db revision |
9707 |
next; # Skip official db revision |
9702 |
} |
9708 |
} |
9703 |
if( $atomicupd->{remember} =~ /(^|;)$upd;/ ) { |
9709 |
if( $atomicupd->{mode} ne 'ALWAYS' && |
|
|
9710 |
$atomicupd->{remember} =~ /(^|;)$upd;/ ) { |
9704 |
#Skip files that have recently been applied |
9711 |
#Skip files that have recently been applied |
9705 |
#Note that an official db rev erases this list |
9712 |
#Note that an official db rev erases this list |
9706 |
print "Skipping $upd as recently applied dev update\n"; |
9713 |
print "Skipping $upd as recently applied dev update\n"; |
Lines 9758-9764
sub ExecDBRev {
Link Here
|
9758 |
print "Dev upgrade $file done\n"; |
9765 |
print "Dev upgrade $file done\n"; |
9759 |
_atomic_memory( $atomicupd, $file ) if $rv; |
9766 |
_atomic_memory( $atomicupd, $file ) if $rv; |
9760 |
} else { |
9767 |
} else { |
9761 |
_atomic_memory( $atomicupd ); #Official db rev clears the atomic pref |
9768 |
_atomic_memory( $atomicupd ); #Official dbrev may clear atomic pref |
9762 |
SetVersion($version); |
9769 |
SetVersion($version); |
9763 |
print "Upgrade to $version done (Bug $bugno - $descr)\n"; |
9770 |
print "Upgrade to $version done (Bug $bugno - $descr)\n"; |
9764 |
} |
9771 |
} |
Lines 9766-9771
sub ExecDBRev {
Link Here
|
9766 |
|
9773 |
|
9767 |
sub _atomic_memory { |
9774 |
sub _atomic_memory { |
9768 |
my ( $atomicupd, $upd ) = @_; |
9775 |
my ( $atomicupd, $upd ) = @_; |
|
|
9776 |
|
9777 |
return if $atomicupd->{mode} eq 'ALWAYS'; # ignores the pref |
9778 |
return if !$upd && $atomicupd->{mode} eq 'TRACK'; # no reset |
9779 |
|
9769 |
$atomicupd->{remember}= $upd? $atomicupd->{remember}."$upd;": ''; |
9780 |
$atomicupd->{remember}= $upd? $atomicupd->{remember}."$upd;": ''; |
9770 |
C4::Context->set_preference( ATOMICUPD_PREF, $atomicupd->{remember} ); |
9781 |
C4::Context->set_preference( ATOMICUPD_PREF, $atomicupd->{remember} ); |
9771 |
} |
9782 |
} |
Lines 9879-9883
sub CheckVersion {
Link Here
|
9879 |
} |
9890 |
} |
9880 |
} |
9891 |
} |
9881 |
|
9892 |
|
9882 |
RunRemainingAtomicUpdates( $aupd ); |
9893 |
RunRemainingAtomicUpdates( $aupd ) if $aupd->{mode} ne 'PROD'; |
9883 |
exit; |
9894 |
exit; |
9884 |
- |
|
|