Lines 98-104
if ($op eq 'add_form') {
Link Here
|
98 |
#---- if primkey exists, it's a modify action, so read values to modify... |
98 |
#---- if primkey exists, it's a modify action, so read values to modify... |
99 |
my $data; |
99 |
my $data; |
100 |
if ($searchfield) { |
100 |
if ($searchfield) { |
101 |
$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?"); |
101 |
$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); |
102 |
$sth->execute($searchfield,$frameworkcode); |
102 |
$sth->execute($searchfield,$frameworkcode); |
103 |
$data=$sth->fetchrow_hashref; |
103 |
$data=$sth->fetchrow_hashref; |
104 |
} |
104 |
} |
Lines 121-129
if ($op eq 'add_form') {
Link Here
|
121 |
$template->param('use_heading_flags_p' => 1); |
121 |
$template->param('use_heading_flags_p' => 1); |
122 |
$template->param(liblibrarian => $data->{'liblibrarian'}, |
122 |
$template->param(liblibrarian => $data->{'liblibrarian'}, |
123 |
libopac => $data->{'libopac'}, |
123 |
libopac => $data->{'libopac'}, |
124 |
repeatable => $data->{'repeatable'}, |
124 |
repeatable => $data->{'repeatable'}, |
125 |
mandatory => $data->{'mandatory'}, |
125 |
mandatory => $data->{'mandatory'}, |
126 |
authorised_value => $authorised_value, |
126 |
authorised_value => $authorised_value, |
|
|
127 |
ind1_defaultvalue => $data->{'ind1_defaultvalue'}, |
128 |
ind2_defaultvalue => $data->{'ind2_defaultvalue'}, |
127 |
frameworkcode => $frameworkcode, |
129 |
frameworkcode => $frameworkcode, |
128 |
); # FIXME: move checkboxes to presentation layer |
130 |
); # FIXME: move checkboxes to presentation layer |
129 |
# END $OP eq ADD_FORM |
131 |
# END $OP eq ADD_FORM |
Lines 136-157
if ($op eq 'add_form') {
Link Here
|
136 |
my $repeatable = $input->param('repeatable') ? 1 : 0; |
138 |
my $repeatable = $input->param('repeatable') ? 1 : 0; |
137 |
my $mandatory = $input->param('mandatory') ? 1 : 0; |
139 |
my $mandatory = $input->param('mandatory') ? 1 : 0; |
138 |
my $authorised_value = $input->param('authorised_value'); |
140 |
my $authorised_value = $input->param('authorised_value'); |
|
|
141 |
my $ind1_defaultvalue = $input->param('ind1_defaultvalue'); |
142 |
my $ind2_defaultvalue = $input->param('ind2_defaultvalue'); |
139 |
unless (C4::Context->config('demo')) { |
143 |
unless (C4::Context->config('demo')) { |
140 |
if ($input->param('modif')) { |
144 |
if ($input->param('modif')) { |
141 |
$sth = $dbh->prepare( |
145 |
$sth = $dbh->prepare( |
142 |
"UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=? WHERE frameworkcode=? AND tagfield=?" |
146 |
"UPDATE marc_tag_structure SET liblibrarian=? ,libopac=? ,repeatable=? ,mandatory=? ,authorised_value=?, ind1_defaultvalue=?, ind2_defaultvalue=? WHERE frameworkcode=? AND tagfield=?" |
143 |
); |
147 |
); |
144 |
$sth->execute( $liblibrarian, |
148 |
$sth->execute( $liblibrarian, |
145 |
$libopac, |
149 |
$libopac, |
146 |
$repeatable, |
150 |
$repeatable, |
147 |
$mandatory, |
151 |
$mandatory, |
148 |
$authorised_value, |
152 |
$authorised_value, |
|
|
153 |
$ind1_defaultvalue, |
154 |
$ind2_defaultvalue, |
149 |
$frameworkcode, |
155 |
$frameworkcode, |
150 |
$tagfield |
156 |
$tagfield |
151 |
); |
157 |
); |
152 |
} else { |
158 |
} else { |
153 |
$sth = $dbh->prepare( |
159 |
$sth = $dbh->prepare( |
154 |
"INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)" |
160 |
"INSERT INTO marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue,frameworkcode) values (?,?,?,?,?,?,?,?,?)" |
155 |
); |
161 |
); |
156 |
$sth->execute($tagfield, |
162 |
$sth->execute($tagfield, |
157 |
$liblibrarian, |
163 |
$liblibrarian, |
Lines 159-164
if ($op eq 'add_form') {
Link Here
|
159 |
$repeatable, |
165 |
$repeatable, |
160 |
$mandatory, |
166 |
$mandatory, |
161 |
$authorised_value, |
167 |
$authorised_value, |
|
|
168 |
$ind1_defaultvalue, |
169 |
$ind2_defaultvalue, |
162 |
$frameworkcode |
170 |
$frameworkcode |
163 |
); |
171 |
); |
164 |
} |
172 |
} |
Lines 173-179
if ($op eq 'add_form') {
Link Here
|
173 |
################## DELETE_CONFIRM ################################## |
181 |
################## DELETE_CONFIRM ################################## |
174 |
# called by default form, used to confirm deletion of data in DB |
182 |
# called by default form, used to confirm deletion of data in DB |
175 |
} elsif ($op eq 'delete_confirm') { |
183 |
} elsif ($op eq 'delete_confirm') { |
176 |
$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where tagfield=? and frameworkcode=?"); |
184 |
$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue from marc_tag_structure where tagfield=? and frameworkcode=?"); |
177 |
$sth->execute($searchfield, $frameworkcode); |
185 |
$sth->execute($searchfield, $frameworkcode); |
178 |
my $data = $sth->fetchrow_hashref; |
186 |
my $data = $sth->fetchrow_hashref; |
179 |
$template->param( |
187 |
$template->param( |
Lines 236-241
if ($op eq 'add_form') {
Link Here
|
236 |
marc_tag_structure.repeatable as mts_repeatable, |
244 |
marc_tag_structure.repeatable as mts_repeatable, |
237 |
marc_tag_structure.mandatory as mts_mandatory, |
245 |
marc_tag_structure.mandatory as mts_mandatory, |
238 |
marc_tag_structure.authorised_value as mts_authorized_value, |
246 |
marc_tag_structure.authorised_value as mts_authorized_value, |
|
|
247 |
marc_tag_structure.ind1_defaultvalue as mts_ind1_defaultvalue, |
248 |
marc_tag_structure.ind1_defaultvalue as mts_ind2_defaultvalue, |
239 |
marc_subfield_structure.* |
249 |
marc_subfield_structure.* |
240 |
FROM marc_tag_structure |
250 |
FROM marc_tag_structure |
241 |
LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield"); |
251 |
LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield"); |
Lines 257-262
if ($op eq 'add_form') {
Link Here
|
257 |
$row_data{repeatable} = $results[$i]->{'mts_repeatable'}; |
267 |
$row_data{repeatable} = $results[$i]->{'mts_repeatable'}; |
258 |
$row_data{mandatory} = $results[$i]->{'mts_mandatory'}; |
268 |
$row_data{mandatory} = $results[$i]->{'mts_mandatory'}; |
259 |
$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'}; |
269 |
$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'}; |
|
|
270 |
$row_data{ind1_defaultvalue} = $results[$i]->{'mts_ind1_defaultvalue'}; |
271 |
$row_data{ind2_defaultvalue} = $results[$i]->{'mts_ind2_defaultvalue'}; |
260 |
$row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
272 |
$row_data{subfield_link} = "marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
261 |
$row_data{edit} = "$script_name?op=add_form&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
273 |
$row_data{edit} = "$script_name?op=add_form&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
262 |
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
274 |
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=" .$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode; |
Lines 296-301
if ($op eq 'add_form') {
Link Here
|
296 |
$row_data{repeatable} = $results->[$i]{'repeatable'}; |
308 |
$row_data{repeatable} = $results->[$i]{'repeatable'}; |
297 |
$row_data{mandatory} = $results->[$i]{'mandatory'}; |
309 |
$row_data{mandatory} = $results->[$i]{'mandatory'}; |
298 |
$row_data{authorised_value} = $results->[$i]{'authorised_value'}; |
310 |
$row_data{authorised_value} = $results->[$i]{'authorised_value'}; |
|
|
311 |
$row_data{ind1_defaultvalue} = $results->[$i]{'ind1_defaultvalue'}; |
312 |
$row_data{ind2_defaultvalue} = $results->[$i]{'ind2_defaultvalue'}; |
299 |
$row_data{subfield_link} = "marc_subfields_structure.pl?tagfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
313 |
$row_data{subfield_link} = "marc_subfields_structure.pl?tagfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
300 |
$row_data{edit} = "$script_name?op=add_form&searchfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
314 |
$row_data{edit} = "$script_name?op=add_form&searchfield=" .$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
301 |
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
315 |
$row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode; |
Lines 328-334
output_html_with_http_headers $input, $cookie, $template->output;
Link Here
|
328 |
sub StringSearch { |
342 |
sub StringSearch { |
329 |
my ($searchstring,$frameworkcode)=@_; |
343 |
my ($searchstring,$frameworkcode)=@_; |
330 |
my $sth = C4::Context->dbh->prepare(" |
344 |
my $sth = C4::Context->dbh->prepare(" |
331 |
SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value |
345 |
SELECT tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaultvalue |
332 |
FROM marc_tag_structure |
346 |
FROM marc_tag_structure |
333 |
WHERE (tagfield >= ? and frameworkcode=?) |
347 |
WHERE (tagfield >= ? and frameworkcode=?) |
334 |
ORDER BY tagfield |
348 |
ORDER BY tagfield |
Lines 344-354
sub StringSearch {
Link Here
|
344 |
sub duplicate_framework { |
358 |
sub duplicate_framework { |
345 |
my ($newframeworkcode,$oldframeworkcode) = @_; |
359 |
my ($newframeworkcode,$oldframeworkcode) = @_; |
346 |
my $dbh = C4::Context->dbh; |
360 |
my $dbh = C4::Context->dbh; |
347 |
my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from marc_tag_structure where frameworkcode=?"); |
361 |
my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,ind1_defaultvalue,ind2_defaulvalue from marc_tag_structure where frameworkcode=?"); |
348 |
$sth->execute($oldframeworkcode); |
362 |
$sth->execute($oldframeworkcode); |
349 |
my $sth_insert = $dbh->prepare("insert into marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)"); |
363 |
my $sth_insert = $dbh->prepare("insert into marc_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, ind1_defaultvalue, ind2_defaultvalue, frameworkcode) values (?,?,?,?,?,?,?,?,?)"); |
350 |
while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) { |
364 |
while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue) = $sth->fetchrow) { |
351 |
$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode); |
365 |
$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$ind1_defaultvalue,$ind2_defaultvalue,$newframeworkcode); |
352 |
} |
366 |
} |
353 |
|
367 |
|
354 |
$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=?"); |
368 |
$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden from marc_subfield_structure where frameworkcode=?"); |