Adding Finerules script.

[koha-ffzg.git] / admin / marctagstructure.pl

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index c6fa2fe..6dcecf1 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -25,9 +25,8 @@ 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;
@@ -226,7 +225,16 @@ if ($op eq 'add_form') {
                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 = ();
@@ -259,11 +267,6 @@ if ($op eq 'add_form') {
                        $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'};
@@ -357,7 +360,6 @@ sub StringSearch  {
        my @results;
        while (my $data=$sth->fetchrow_hashref){
        push(@results,$data);
-       warn "=> ".$data->{liblibrarian};
        }
        #  $sth->execute;
        $sth->finish;