Clean up moredetail.pl and updateitem.pl

[koha_fer] / catalogue / ISBDdetail.pl

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 8650df6..4b70d0f 100755 (executable)
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -48,38 +48,6 @@ use C4::Serials;    # CountSubscriptionFromBiblionumber
 
 #---- Internal function
 
-sub get_authorised_value_desc ($$$$$$$) {
-    my ( $itemtype, $tagslib, $tag, $subfield, $value, $framework, $dbh ) = @_;
-
-    #---- branch
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-        return GetBranchDetail($value)->{branchname};
-    }
-
-    #---- itemtypes
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-        my $itemtypedef = getitemtypeinfo($itemtype);
-        return $itemtypedef->{description};
-    }
-
-    #---- "true" authorized value
-    my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-    if ( $category ne "" ) {
-        my $sth =
-          $dbh->prepare(
-"select lib from authorised_values where category = ? and authorised_value = ?"
-          );
-        $sth->execute( $category, $value );
-        my $data = $sth->fetchrow_hashref;
-        return $data->{'lib'};
-    }
-    else {
-        return $value;    # if nothing is found return the original value
-    }
-}
-# ------
-
 
 my $query = new CGI;
 my $dbh = C4::Context->dbh;
@@ -96,7 +64,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name => "catalogue/ISBDdetail.tmpl",
         query         => $query,
         type          => "intranet",
-        debug         => 1,
+       authnotrequired => 0,
+       flagsrequired   => { catalogue => 1 },
     }
 );
 
@@ -110,6 +79,10 @@ my $res;
 #     $bloc =~ s/\n//g;
 my $bloc = $ISBD;
 my $blocres;
+
+my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$itemtype);
+# @big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
+
 foreach my $isbdfield ( split /#/, $bloc ) {
 
     #         $isbdfield= /(.?.?.?)/;
@@ -126,7 +99,9 @@ foreach my $isbdfield ( split /#/, $bloc ) {
    #         warn "ERROR IN ISBD DEFINITION at : $isbdfield" unless $fieldvalue;
    #             warn "FV : $fieldvalue";
         my $hasputtextbefore = 0;
-        foreach my $field ( $record->field($fieldvalue) ) {
+        my @fieldslist = $record->field($fieldvalue);
+        @fieldslist= sort {$a->subfield($holdingbrtagsubf) cmp $b->subfield($holdingbrtagsubf)} @fieldslist if ($fieldvalue eq $holdingbrtagf);
+        foreach my $field ( @fieldslist ) {
             my $calculated = $analysestring;
             my $tag        = $field->tag();
             if ( $tag < 10 ) {
@@ -136,13 +111,11 @@ foreach my $isbdfield ( split /#/, $bloc ) {
                 for my $i ( 0 .. $#subf ) {
                     my $subfieldcode  = $subf[$i][0];
                     my $subfieldvalue =
-                      get_authorised_value_desc( $itemtype,$tagslib, $tag, $subf[$i][0],
-                        $subf[$i][1], '', $dbh );
+                      GetAuthorisedValueDesc( $tag, $subf[$i][0],
+                        $subf[$i][1], $itemtype,$tagslib);
                     my $tagsubf = $tag . $subfieldcode;
-                    $calculated =~
-s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
+                    $calculated =~s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
                 }
-
                 # field builded, store the result
                 if ( $calculated && !$hasputtextbefore )
                 {    # put textbefore if not done
@@ -170,7 +143,9 @@ $res =~ s/\n/<br\/>/g;
 
 # remove empty ()
 $res =~ s/\(\)//g;
-
+# count of item linked with biblio
+my $itemcount = GetItemsCount($biblionumber);
+$template->param( count => $itemcount);
 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
  
 if ($subscriptionsnumber) {
@@ -185,6 +160,7 @@ if ($subscriptionsnumber) {
 $template->param (
     ISBD                => $res,
     biblionumber        => $biblionumber,
+       isbdview => 1,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;