[Koha-cvs] CVS: koha/C4 Output.pm,1.6.2.9,1.6.2.10

[Steve Tonnesen]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv16735/C4

Modified Files:
      Tag: rel-1-2
        Output.pm 
Log Message:
Applying patch from Matt Kraai to pick F or NF based on presense of a dewey
number when adding a book via marcimport.pl


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** Output.pm   26 Jun 2002 07:21:28 -0000      1.6.2.9
--- Output.pm   27 Jun 2002 17:41:26 -0000      1.6.2.10
***************
*** 478,481 ****
--- 478,482 ----
                $descfieldname, # column name of descriptive field
                $showkey,       # flag to show key in description
+               $default,       # optional default key
        )address@hidden;
        my $selectclause;       # return value
***************
*** 503,506 ****
--- 504,512 ----
            if ($showkey || ! $desc ) { $desc="$key - $desc"; }
            $selectclause.="<option value='$key'>$desc\n";
+           $selectclause.="<option";
+           if (defined $default && $default eq $key) {
+               $selectclause.=" selected";
+           }
+           $selectclause.=" value='$key'>$desc\n";
            print "<PRE>Sel=$selectclause </PRE>\n" if $debug; 
        }