X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FCsv.pm;h=2cd6430cdff92ed9cc23a92e03722aaf86f7f819;hb=0e80c75aee02157b1fc4121ecf3b039f6f797b7b;hp=a53fcb91dfe1b273134e4591123a119761ddbc9c;hpb=5429c5f497fe426b6905b5ef9693f4e42afff5d7;p=koha.git

diff --git a/C4/Csv.pm b/C4/Csv.pm
index a53fcb91df..2cd6430cdf 100644
--- a/C4/Csv.pm
+++ b/C4/Csv.pm
@@ -4,90 +4,51 @@ package C4::Csv;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 #
 
+#use strict;
+#use warnings; FIXME - Bug 2505
+
 use C4::Context;
-use vars qw($VERSION @ISA @EXPORT);
+use vars qw(@ISA @EXPORT);
 
-# set the version for version checking
-$VERSION = 3.00;
 
 @ISA = qw(Exporter);
 
 # only export API methods
 
 @EXPORT = qw(
-  &GetCsvProfiles
-  &GetCsvProfile
-  &GetCsvProfilesLoop
   &GetMarcFieldsForCsv
 );
 
 
-# Returns all informations about csv profiles
-sub GetCsvProfiles {
-    my $dbh = C4::Context->dbh;
-    my $query = "SELECT * FROM export_format";
-
-    $sth = $dbh->prepare($query);
-    $sth->execute;
-
-    $sth->fetchall_arrayref({});
-
-}
-
-# Returns all informations about a given csv profile
-sub GetCsvProfile {
-    my ($id) = @_;
-    my $dbh = C4::Context->dbh;
-    my $query = "SELECT * FROM export_format WHERE export_format_id=?";
-
-    $sth = $dbh->prepare($query);
-    $sth->execute($id);
-
-    return ($sth->fetchrow_hashref);
-}
-
 # Returns fields to extract for the given csv profile
 sub GetMarcFieldsForCsv {
 
     my ($id) = @_;
     my $dbh = C4::Context->dbh;
-    my $query = "SELECT marcfields FROM export_format WHERE export_format_id=?";
+    my $query = "SELECT content FROM export_format WHERE export_format_id=?";
 
     $sth = $dbh->prepare($query);
     $sth->execute($id);
 
-    return ($sth->fetchrow_hashref)->{marcfields};
+    return ($sth->fetchrow_hashref)->{content};
     
  
 }
 
-# Returns informations aboout csv profiles suitable for html templates
-sub GetCsvProfilesLoop {
-   # List of existing profiles
-    my $dbh = C4::Context->dbh;
-    my $sth;
-    my $query = "SELECT export_format_id, profile FROM export_format";
-    $sth = $dbh->prepare($query);
-    $sth->execute();
-    return $sth->fetchall_arrayref({});
-
-}
-
-
 
 1;