X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-export.pl;h=002c88e4ec3bc675396782caf2a496407dfc188c;hb=afccbfcce7192c6e1fcd73f137135cb5289c3d3d;hp=f9d3c253d39b658be7716430bb21dc664278ac14;hpb=9a54047b6d10eb4b553ad29c6130a1e276252fe5;p=koha.git

diff --git a/opac/opac-export.pl b/opac/opac-export.pl
index f9d3c253d3..002c88e4ec 100755
--- a/opac/opac-export.pl
+++ b/opac/opac-export.pl
@@ -13,11 +13,9 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -31,61 +29,70 @@ use C4::Auth;
 use C4::Ris;
 
 my $query = new CGI;
-my $op=$query->param("op");
-my $format=$query->param("format");
-if ($op eq "export") {
-	my $biblionumber = $query->param("bib");
-	my $dbh=C4::Context->dbh;
-	my $sth;
-	if ($biblionumber) {
-		$sth=$dbh->prepare("SELECT marc FROM biblioitems WHERE biblionumber =?");
-		$sth->execute($biblionumber);
-	}
-    my $error;
-	while (my ($marc) = $sth->fetchrow) {
-		if ($marc){
+my $op=$query->param("op")||''; #op=export is currently the only use
+my $format=$query->param("format")||'utf8';
+my $biblionumber = $query->param("bib")||0;
+$biblionumber = int($biblionumber);
+my ($marc, $error)= ('','');
 
-			if ($format =~ /endnote/) {
-				$marc = marc2endnote($marc);
-				$format = 'endnote';
-			}
-			elsif ($format =~ /marcxml/) {
-				$marc = marc2marcxml($marc);
-			}
-			elsif ($format=~ /mods/) {
-				$marc = marc2modsxml($marc);
-			}
- 			elsif ($format =~ /ris/) {
- 				$marc = marc2ris(MARC::Record->new_from_usmarc($marc));
- 			}
-			elsif ($format =~ /bibtex/) {
-				$marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
-			}elsif ($format =~ /dc/) {
-                ($error,$marc) = marc2dcxml($marc,1);
-				$format = "dublin-core.xml";
-			}
-			elsif ($format =~ /marc8/) {
-				($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8");
-                if (! $error){
-                    $marc = $marc->as_usmarc();
-                }
-			}
-			elsif ($format =~ /utf8/) {
-				#default
-			}
-            if ($error){
-                print $query->header();
-                print $query->start_html();
-                print "<h1>An error occured </h1>";
-                print $error;
-                print $query->end_html();
-            }
-            else {
-                print $query->header(
-				-type => 'application/octet-stream',
-                -attachment=>"bib-$biblionumber.$format");
-                print $marc;
-            }
-		}
-	}
+$marc = GetMarcBiblio($biblionumber, 1) if $biblionumber;
+if(!$marc) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+elsif ($format =~ /endnote/) {
+    $marc = marc2endnote($marc);
+    $format = 'endnote';
+}
+elsif ($format =~ /marcxml/) {
+    $marc = marc2marcxml($marc);
+    $format = 'marcxml';
+}
+elsif ($format=~ /mods/) {
+    $marc = marc2modsxml($marc);
+    $format = 'mods';
+}
+elsif ($format =~ /ris/) {
+    $marc = marc2ris($marc);
+    $format = 'ris';
+}
+elsif ($format =~ /bibtex/) {
+    $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber);
+    $format = 'bibtex';
+}
+elsif ($format =~ /dc/) {
+    ($error,$marc) = marc2dcxml($marc,1);
+    $format = "dublin-core.xml";
+}
+elsif ($format =~ /marc8/) {
+    ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8");
+    $marc = $marc->as_usmarc() unless $error;
+    $format = 'marc8';
+}
+elsif ($format =~ /utf8/) {
+    C4::Charset::SetUTF8Flag($marc,1);
+    $marc = $marc->as_usmarc();
+    $format = 'utf8';
+}
+elsif ($format =~ /marcstd/) {
+    C4::Charset::SetUTF8Flag($marc,1);
+    ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
+    $format = 'marcstd';
+}
+else {
+    $error= "Format $format is not supported.";
+}
+
+if ($error){
+    print $query->header();
+    print $query->start_html();
+    print "<h1>An error occurred </h1>";
+    print $query->escapeHTML("$error");
+    print $query->end_html();
+}
+else {
+    print $query->header(
+      -type => 'application/octet-stream',
+      -attachment=>"bib-$biblionumber.$format");
+    print $marc;
 }