(bug #4004) disallow access for non-logged in users in opac

[koha.git] / cataloguing / value_builder / unimarc_field_210c.pl

diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index 34fea24..c91eeb6 100755 (executable)
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -19,7 +18,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-require Exporter;
+
 use C4::AuthoritiesMarc;
 use C4::Auth;
 use C4::Context;
@@ -28,6 +27,7 @@ use CGI;
 use C4::Search;
 use MARC::Record;
 use C4::Koha;
+
 ###TODO To rewrite in order to use SearchAuthorities
 
 =head1
@@ -56,58 +56,19 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "210c".(int(rand(100000))+1);
+my $function_name= $field_number;
 #---- build editors list.
 #---- the editor list is built from the "EDITORS" thesaurus
 #---- this thesaurus category must be filled as follow :
 #---- 200$a for isbn
 #---- 200$b for editor
 #---- 200$c (repeated) for collections
- my $sth 
-= $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
-                        left join auth_header on auth_subfield_table.authid=auth_header.authid
-                        where authtypecode='EDITORS' and tag='200' and subfieldcode='a'");
- my $sth2
- = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='b' and authid=?");
-$sth->execute;
-my @editors;
-my $authoritysep = C4::Context->preference("authoritysep");
-while (my ($authid,$isbn) = $sth->fetchrow) {
-    $sth2->execute($authid);
-    my ($editor) = $sth2->fetchrow;
-    push(@editors,"$isbn $authoritysep $editor");
-}
+
+
 my $res  = "
 <script type=\"text/javascript\">
 function Focus$function_name(index) {
-var isbn_array = [ ";
-foreach my $editor (@editors) {
-    my @arr = split (/ $authoritysep /,$editor);
-    $res .='["'.$arr[0].'","'.$arr[1].'","'.$arr[2].'"],';
-}
-chop $res;
-$res .= "
-];
-    // search isbn subfield. it''s 010a
-    var isbn_found;
-    var nb_fields = document.f.field_value.length;
-    for (i=0 ; i< nb_fields; i++) {
-        if (document.f.tag[i].value == '010' && document.f.subfield[i].value == 'a') {
-            isbn_found=document.f.field_value[i].value;
-            break;
-        }
-    }
-    try{
-        isbn_found.getAttribute('value'); // throw an exception if doesn't (if no 010a)
-    }
-    catch(e){
-        return;
-    }
-    for (i=0;i<=isbn_array.length;i++) {
-        if (isbn_found.substr(0,isbn_array[i][0].length) == isbn_array[i][0]) {
-            document.f.field_value[index].value =isbn_array[i][1];
-        }
-    }
+
 }
 
 function Blur$function_name(subfield_managed) {
@@ -115,8 +76,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(subfield_managed) {
-    defaultvalue=escape(document.forms['f'].field_value[subfield_managed].value);
-    newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
+    defaultvalue=escape(document.getElementById(\"$field_number\").value);
+    newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
 }
 </script>
 ";
@@ -131,9 +92,6 @@ plugin : the true value_builded. The screen that is open in the popup window.
 
 sub plugin {
 my ($input) = @_;
-    my $index = $input->param("index");
-    my $result =  $input->param("result");
-
     my $query=new CGI;
     my $op = $query->param('op');
     my $authtypecode = $query->param('authtypecode');
@@ -165,17 +123,25 @@ my ($input) = @_;
         my @excluding = $query->param('excluding');
         my @operator = $query->param('operator');
         my @value = $query->param('value');
-    
+        my $orderby   = $query->param('orderby');
+        
         $resultsperpage= $query->param('resultsperpage');
         $resultsperpage = 19 if(!defined $resultsperpage);
     
         # builds tag and subfield arrays
         my @tags;
     
-        my ($results,$total) = authoritysearch($dbh, \@tags,\@and_or,
+        my ($results,$total) = SearchAuthorities( \@tags,\@and_or,
                                             \@excluding, \@operator, \@value,
-                                            $startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
-    
+                                            $startfrom*$resultsperpage, $resultsperpage,$authtypecode, $orderby);
+
+       # Getting the $b if it exists
+       foreach my $_ (@$results) {
+               if ($_->{reported_tag} =~ m/^\$b/) {
+                   $_->{to_report} = substr($_->{reported_tag}, 2);
+           }
+       }
+
         ($template, $loggedinuser, $cookie)
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tmpl",
                     query => $query,
@@ -214,21 +180,28 @@ my ($input) = @_;
         } else {
             $to = (($startfrom+1)*$resultsperpage);
         }
+        my $link="../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;authtypecode=EDITORS&and_or=$and_or&amp;marclist=$marclist&amp;operator=$operator&amp;orderby=$orderby&amp;excluding=$excluding&amp;".join("&amp;",map {"value=".$_} @value)."&amp;op=do_search&amp;type=intranet&amp;index=$index";
+        warn "$link ,".getnbpages($total, $resultsperpage);
         $template->param(result => $results) if $results;
-        $template->param(index => $query->param('index'));
+        $template->param('index' => $query->param('index'));
         $template->param(startfrom=> $startfrom,
                                 displaynext=> $displaynext,
                                 displayprev=> $displayprev,
                                 resultsperpage => $resultsperpage,
                                 startfromnext => $startfrom+1,
                                 startfromprev => $startfrom-1,
-                                index => $index,
                                 total=>$total,
                                 from=>$from,
                                 to=>$to,
                                 numbers=>\@numbers,
                                 authtypecode =>$authtypecode,
                                 resultstring =>$value[0],
+                                pagination_bar => pagination_bar(
+                                    $link,
+                                    getnbpages($total, $resultsperpage),
+                                    $startfrom,
+                                    'startfrom'
+                                ),
                                 );
     } else {
         ($template, $loggedinuser, $cookie)