[Koha-cvs] CVS: koha/C4 Output.pm,1.26,1.27

[Andrew Arensburger]

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

Modified Files:
        Output.pm 
Log Message:
Replaced &requireDBI with C4::Context->dbh, thus making the "use
Database" statement unnecessary.
Fixed POD up a bit.


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Output.pm   11 Oct 2002 03:14:03 -0000      1.26
--- Output.pm   11 Oct 2002 12:40:50 -0000      1.27
***************
*** 28,33 ****
  use C4::Context;
  use C4::Database;
- use C4::Search; #for getting the systempreferences
-       # FIXME - Get rid of this, and use C4::Context->preference
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 28,31 ----
***************
*** 763,767 ****
  
    $str = &mkform2($action,
!       $fieldname => 
"$fieldpos\t$required\t$label\t$fieldtype\t$value0\t$value1\t...",
        ...
        );
--- 761,766 ----
  
    $str = &mkform2($action,
!       $fieldname =>
!         "$fieldpos\t$required\t$label\t$fieldtype\t$value0\t$value1\t...",
        ...
        );
***************
*** 1028,1031 ****
--- 1027,1031 ----
        my (
                $dbh,           # DBI handle
+                               # FIXME - Obsolete argument
                $tablename,     # name of table containing list of choices
                $keyfieldname,  # column name of code to use in option list
***************
*** 1042,1046 ****
        my $debug=0;
  
!       requireDBI($dbh,"getkeytableselectoptions");
  
        if ( $showkey ) {
--- 1042,1046 ----
        my $debug=0;
  
!       $dbh = C4::Context->dbh;
  
        if ( $showkey ) {