remove the default record format to allow none at all

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10368 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example
index 59ead0c..9be8ab7 100644 (file)
--- a/Open-ILS/examples/opensrf.xml.example
+++ b/Open-ILS/examples/opensrf.xml.example
@@ -142,7 +142,7 @@ vim:et:ts=4:sw=4:
                     <host>z3950.loc.gov</host>
                     <port>7090</port>
                     <db>Voyager</db>
-                    <!-- fetch the full record with no holdings. FI is the default -->
+                    <!-- fetch the full record with no holdings. FI is the most common choice -->
                     <record_format>FI</record_format> 
 
                     <!-- Record transmission format from the server.  Supported -->

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
index cadada8..97810d1 100755 (executable)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
@@ -258,10 +258,12 @@ sub process_results {
        my $offset      = shift || 0;
     my $service = shift;
 
+    my $rformat = $services{$service}->{record_format};
     my $tformat = $services{$service}->{transmission_format} || $output;
-    my $rformat = $services{$service}->{record_format} || 'FI';
-       $results->option(elementSetName => $rformat);
-    $logger->info("z3950: using record format '$rformat'");
+
+    $results->option(elementSetName => $rformat);
+    $results->option(preferredRecordSyntax => $tformat);
+    $logger->info("z3950: using record format '$rformat' and transmission format '$tformat'");
 
        my @records;
        my $res = {};