(bug #3053) extract ISBD view generator, and permit to display valuecode in ISBD...

[koha.git] / catalogue / ISBDdetail.pl

diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 250fda6..d9eea6d 100755 (executable)
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -54,10 +54,6 @@ my $query = new CGI;
 my $dbh = C4::Context->dbh;
 
 my $biblionumber = $query->param('biblionumber');
-my $itemtype     = &GetFrameworkCode($biblionumber);
-my $tagslib      = &GetMarcStructure( 1, $itemtype );
-
-my $record = GetMarcBiblio($biblionumber);
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -70,117 +66,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $ISBD = C4::Context->preference('ISBD');
-
 # my @blocs = split /\@/,$ISBD;
 # my @fields = $record->fields();
-my $res;
-
-# foreach my $bloc (@blocs) {
-#     $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 =~ /(\d\d\d)([^\|])?\|(.*)\|(.*)\|(.*)/;
-    my $fieldvalue    = $1;
-    my $subfvalue = $2;
-    my $textbefore    = $3;
-    my $analysestring = $4;
-    my $textafter     = $5;
-
-    #         warn "==> $1 / $2 / $3 / $4";
-    #         my $fieldvalue=substr($isbdfield,0,3);
-    if ( $fieldvalue > 0 ) {
-        my $hasputtextbefore = 0;
-        my @fieldslist = $record->field($fieldvalue);
-        @fieldslist = sort {$a->subfield($holdingbrtagsubf) cmp $b->subfield($holdingbrtagsubf)} @fieldslist if ($fieldvalue eq $holdingbrtagf);
-
-        #         warn "ERROR IN ISBD DEFINITION at : $isbdfield" unless $fieldvalue;
-        #             warn "FV : $fieldvalue";
-        if ($subfvalue ne ""){
-          foreach my $field ( @fieldslist ) {
-            foreach my $subfield ($field->subfield($subfvalue)){
-              warn $fieldvalue."$subfvalue";    
-              my $calculated = $analysestring;
-              my $tag        = $field->tag();
-              if ( $tag < 10 ) {
-              }
-              else {
-                my $subfieldvalue =
-                GetAuthorisedValueDesc( $tag, $subfvalue,
-                  $subfield, '', $tagslib );
-                my $tagsubf = $tag . $subfvalue;
-                $calculated =~
-                      s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
-#                 $calculated =~s#/cgi-bin/koha/[^/]+/([^.]*.pl\?.*)$#opac-$1#g;
-            
-                # field builded, store the result
-                if ( $calculated && !$hasputtextbefore )
-                {    # put textbefore if not done
-                $blocres .= $textbefore;
-                $hasputtextbefore = 1;
-                }
-            
-                # remove punctuation at start
-                $calculated =~ s/^( |;|:|\.|-)*//g;
-                $blocres .= $calculated;
-                            
-              }         
-            }          
-          }
-          $blocres .= $textafter if $hasputtextbefore;  
-        } else {    
-        foreach my $field ( @fieldslist ) {
-          my $calculated = $analysestring;
-          my $tag        = $field->tag();
-          if ( $tag < 10 ) {
-          }
-          else {
-            my @subf = $field->subfields;
-            for my $i ( 0 .. $#subf ) {
-            my $subfieldcode  = $subf[$i][0];
-            my $subfieldvalue =
-            GetAuthorisedValueDesc( $tag, $subf[$i][0],
-              $subf[$i][1], '', $tagslib );
-            my $tagsubf = $tag . $subfieldcode;
-            $calculated =~
-        s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
-#         $calculated =~s#/cgi-bin/koha/[^/]+/([^.]*.pl\?.*)$#opac-$1#g;
-            }
-        
-            # field builded, store the result
-            if ( $calculated && !$hasputtextbefore )
-            {    # put textbefore if not done
-            $blocres .= $textbefore;
-            $hasputtextbefore = 1;
-            }
-        
-            # remove punctuation at start
-            $calculated =~ s/^( |;|:|\.|-)*//g;
-            $blocres .= $calculated;
-          }
-        }
-        $blocres .= $textafter if $hasputtextbefore;
-        }       
-    }
-    else {
-        $blocres .= $isbdfield;
-    }
-}
-$res .= $blocres;
-
-# }
-$res =~ s/\{(.*?)\}//g;
-$res =~ s/\\n/\n/g;
-$res =~ s/\n/<br\/>/g;
+my $res = GetISBDView($biblionumber);
 
-# remove empty ()
-$res =~ s/\(\)//g;
 # count of item linked with biblio
 my $itemcount = GetItemsCount($biblionumber);
 $template->param( count => $itemcount);