Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / opac / opac-export.pl

diff --git a/opac/opac-export.pl b/opac/opac-export.pl
index 6023d78..402d1fe 100755 (executable)
--- a/opac/opac-export.pl
+++ b/opac/opac-export.pl
@@ -35,11 +35,25 @@ my $biblionumber = $query->param("bib")||0;
 $biblionumber = int($biblionumber);
 my $error = q{};
 
+# Determine logged in user's patron category.
+# Blank if not logged in.
+my $userenv = C4::Context->userenv;
+my $borcat = q{};
+if ($userenv) {
+    my $borrowernumber = $userenv->{'number'};
+    if ($borrowernumber) {
+        my $borrower = Koha::Patrons->find( { borrowernumber => $borrowernumber } );
+        $borcat = $borrower ? $borrower->categorycode : $borcat;
+    }
+}
+
 my $include_items = ($format =~ /bibtex/) ? 0 : 1;
 my $marc = $biblionumber
     ? GetMarcBiblio({
         biblionumber => $biblionumber,
-        embed_items  => $include_items })
+        embed_items  => $include_items,
+        opac         => 1,
+        borcat       => $borcat })
     : undef;
 
 if(!$marc) {
@@ -78,7 +92,7 @@ elsif ($format =~ /bibtex/) {
     $marc = marc2bibtex($marc,$biblionumber);
     $format = 'bibtex';
 }
-elsif ($format =~ /dc$/) {
+elsif ($format =~ /^(dc|oaidc|srwdc|rdfdc)$/i ) {
     # TODO: Dublin Core leaks fields marked hidden by framework.
     $marc = marc2dcxml($marc, undef, $biblionumber, $format);
     $format = "dublin-core.xml";
@@ -130,6 +144,13 @@ else {
             -charset    => 'utf-8',
             -attachment =>  "bib-$biblionumber.txt"
         );
+    }
+    elsif ( $format eq 'ris' ) {
+        print $query->header(
+            -type => 'text/plain',
+            -charset => 'utf-8',
+            -attachment => "bib-$biblionumber.$format"
+        );
     } else {
         binmode STDOUT, ':encoding(UTF-8)';
         print $query->header(