update for missing subscriptions.lastbranch col in serials
[koha_fer] / admin / marctagstructure.pl
index 9f0c721..78cc6eb 100755 (executable)
@@ -24,10 +24,8 @@ use C4::Auth;
 use C4::Koha;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
 use C4::Context;
-use HTML::Template;
+
 
 # retrieve parameters
 my $input = new CGI;
@@ -51,7 +49,7 @@ my $dbh = C4::Context->dbh;
 
 # open template
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "parameters/marctagstructure.tmpl",
+    = get_template_and_user({template_name => "admin/marctagstructure.tmpl",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
@@ -119,6 +117,7 @@ if ($op eq 'add_form') {
        my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
                        -values=> \@authorised_values,
                        -size=>1,
+                       -tabindex=>'',
                        -id=>"authorised_value",
                        -multiple=>0,
                        -default => $data->{'authorised_value'},
@@ -138,11 +137,13 @@ if ($op eq 'add_form') {
                        repeatable => CGI::checkbox(-name=>'repeatable',
                                                -checked=> $data->{'repeatable'}?'checked':'',
                                                -value=> 1,
+                                               -tabindex=>'',
                                                -label => '',
                                                -id=> 'repeatable'),
                        mandatory => CGI::checkbox(-name => 'mandatory',
                                                -checked => $data->{'mandatory'}?'checked':'',
                                                -value => 1,
+                                               -tabindex=>'',
                                                -label => '',
                                                -id => 'mandatory'),
                        authorised_value => $authorised_value,
@@ -220,10 +221,18 @@ if ($op eq 'add_form') {
        my $cnt=0;
        if ($dspchoice) {
                #here, user only wants used tags/subfields displayed
-               my $env;
                $searchfield=~ s/\'/\\\'/g;
                my @data=split(' ',$searchfield);
-               my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure 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");
+               my $sth=$dbh->prepare("
+                     SELECT marc_tag_structure.tagfield AS mts_tagfield,
+                             marc_tag_structure.liblibrarian as mts_liblibrarian,
+                             marc_tag_structure.libopac as mts_libopac,
+                             marc_tag_structure.repeatable as mts_repeatable,
+                             marc_tag_structure.mandatory as mts_mandatory,
+                             marc_tag_structure.authorised_value as mts_authorized_value,
+                             marc_subfield_structure.*
+                FROM marc_tag_structure 
+                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");
                #could be ordoned by tab
                $sth->execute($data[0], $frameworkcode);
                my @results = ();
@@ -249,18 +258,13 @@ if ($op eq 'add_form') {
                        $row_data{repeatable} = $results[$i]->{'mts_repeatable'};
                        $row_data{mandatory} = $results[$i]->{'mts_mandatory'};
                        $row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-                       $row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-                       $row_data{edit} = "$script_name?op=add_form&searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-                       $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
+                       $row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
+                       $row_data{edit} = "$script_name?op=add_form&searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
+                       $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
                        $row_data{toggle} = $toggle;
                        $j=$i;
                        my @internal_loop = ();
                        while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
-                               if ($toggle eq 0) {
-                                       $toggle=1;
-                               } else {
-                                       $toggle=0;
-                               }
                                my %subfield_data;
                                $subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
                                $subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
@@ -288,8 +292,7 @@ if ($op eq 'add_form') {
                $sth->finish;
        } else {
                #here, normal old style : display every tags
-               my $env;
-               my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
+               my ($count,$results)=StringSearch($searchfield,$frameworkcode);
                $cnt = $count;
                my $toggle=0;
                my @loop_data = ();
@@ -305,9 +308,9 @@ if ($op eq 'add_form') {
                        $row_data{repeatable} = $results->[$i]{'repeatable'};
                        $row_data{mandatory} = $results->[$i]{'mandatory'};
                        $row_data{authorised_value} = $results->[$i]{'authorised_value'};
-                       $row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-                       $row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-                       $row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
+                       $row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
+                       $row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
+                       $row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
                        $row_data{toggle} = $toggle;
                        push(@loop_data, \%row_data);
                }
@@ -332,7 +335,8 @@ if ($op eq 'add_form') {
        }
 } #---- END $OP eq DEFAULT
 
-$template->param(loggeninuser => $loggedinuser);
+$template->param(loggeninuser => $loggedinuser,
+               );
 output_html_with_http_headers $input, $cookie, $template->output;
 
 
@@ -340,7 +344,7 @@ output_html_with_http_headers $input, $cookie, $template->output;
 # the sub used for searches
 #
 sub StringSearch  {
-       my ($env,$searchstring,$frameworkcode)=@_;
+       my ($searchstring,$frameworkcode)=@_;
        my $dbh = C4::Context->dbh;
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
@@ -350,7 +354,6 @@ sub StringSearch  {
        my @results;
        while (my $data=$sth->fetchrow_hashref){
        push(@results,$data);
-       warn "=> ".$data->{liblibrarian};
        }
        #  $sth->execute;
        $sth->finish;
@@ -369,11 +372,11 @@ sub duplicate_framework {
                $sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode);
        }
 
-       $sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso from marc_subfield_structure where frameworkcode=?");
+       $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=?");
        $sth->execute($oldframeworkcode);
-       $sth_insert = $dbh->prepare("insert into marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso) values (?,?,?,?,?,?,?,?,?,?,?,?,?)");
-       while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso) = $sth->fetchrow) {
-           $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso);
+       $sth_insert = $dbh->prepare("insert into marc_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,authtypecode,value_builder,seealso,hidden) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+       while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden) = $sth->fetchrow) {
+           $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso, $hidden);
        }
 }