[open-ils-commits] r10368 - in trunk/Open-ILS: examples src/perlmods/OpenILS/Application/Search

[svn at svn.open-ils.org]

Author: miker
Date: 2008-08-14 15:43:08 -0400 (Thu, 14 Aug 2008)
New Revision: 10368

Modified:
   trunk/Open-ILS/examples/opensrf.xml.example
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
remove the default record format to allow none at all

Modified: trunk/Open-ILS/examples/opensrf.xml.example
===================================================================
--- trunk/Open-ILS/examples/opensrf.xml.example	2008-08-14 18:26:31 UTC (rev 10367)
+++ trunk/Open-ILS/examples/opensrf.xml.example	2008-08-14 19:43:08 UTC (rev 10368)
@@ -142,7 +142,7 @@
                     <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 -->

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-08-14 18:26:31 UTC (rev 10367)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-08-14 19:43:08 UTC (rev 10368)
@@ -258,11 +258,13 @@
 	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 = {};
 	my $count = $$res{count} = $results->size;