|
Lines 156-161
else {
Link Here
|
| 156 |
($recordObj1, $recordObj2) = ($recordObj2, $recordObj1); |
156 |
($recordObj1, $recordObj2) = ($recordObj2, $recordObj1); |
| 157 |
} |
157 |
} |
| 158 |
|
158 |
|
|
|
159 |
# Getting frameworktext |
| 160 |
my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode ); |
| 161 |
my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode ); |
| 162 |
my $frameworktextdestination = Koha::Authority::Types->find( $framework ); |
| 163 |
|
| 159 |
# Creating a loop for display |
164 |
# Creating a loop for display |
| 160 |
|
165 |
|
| 161 |
my @records = ( |
166 |
my @records = ( |
|
Lines 163-168
else {
Link Here
|
| 163 |
recordid => $mergereference, |
168 |
recordid => $mergereference, |
| 164 |
record => $recordObj1->record, |
169 |
record => $recordObj1->record, |
| 165 |
frameworkcode => $recordObj1->authtypecode, |
170 |
frameworkcode => $recordObj1->authtypecode, |
|
|
171 |
frameworktext => $frameworktext1->authtypetext, |
| 166 |
display => $recordObj1->createMergeHash($tagslib), |
172 |
display => $recordObj1->createMergeHash($tagslib), |
| 167 |
reference => 1, |
173 |
reference => 1, |
| 168 |
}, |
174 |
}, |
|
Lines 170-175
else {
Link Here
|
| 170 |
recordid => $notreference, |
176 |
recordid => $notreference, |
| 171 |
record => $recordObj2->record, |
177 |
record => $recordObj2->record, |
| 172 |
frameworkcode => $recordObj2->authtypecode, |
178 |
frameworkcode => $recordObj2->authtypecode, |
|
|
179 |
frameworktext => $frameworktext2->authtypetext, |
| 173 |
display => $recordObj2->createMergeHash($tagslib), |
180 |
display => $recordObj2->createMergeHash($tagslib), |
| 174 |
}, |
181 |
}, |
| 175 |
); |
182 |
); |
|
Lines 180-185
else {
Link Here
|
| 180 |
recordid2 => $notreference, |
187 |
recordid2 => $notreference, |
| 181 |
records => \@records, |
188 |
records => \@records, |
| 182 |
framework => $framework, |
189 |
framework => $framework, |
|
|
190 |
frameworktext => $frameworktextdestination->authtypetext, |
| 183 |
); |
191 |
); |
| 184 |
} |
192 |
} |
| 185 |
else { |
193 |
else { |
|
Lines 194-203
else {
Link Here
|
| 194 |
); |
202 |
); |
| 195 |
if ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) { |
203 |
if ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) { |
| 196 |
my $authority_types = Koha::Authority::Types->search( { authtypecode => { '!=' => '' } }, { order_by => ['authtypetext'] } ); |
204 |
my $authority_types = Koha::Authority::Types->search( { authtypecode => { '!=' => '' } }, { order_by => ['authtypetext'] } ); |
|
|
205 |
my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode ); |
| 206 |
my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode ); |
| 197 |
$template->param( |
207 |
$template->param( |
| 198 |
frameworkselect => $authority_types->unblessed, |
208 |
frameworkselect => $authority_types->unblessed, |
| 199 |
frameworkcode1 => $recordObj1->authtypecode, |
209 |
frameworkcode1 => $recordObj1->authtypecode, |
| 200 |
frameworkcode2 => $recordObj2->authtypecode, |
210 |
frameworkcode2 => $recordObj2->authtypecode, |
|
|
211 |
frameworklabel1 => $frameworktext1->authtypetext, |
| 212 |
frameworklabel2 => $frameworktext2->authtypetext, |
| 201 |
); |
213 |
); |
| 202 |
} |
214 |
} |
| 203 |
} |
215 |
} |