[open-ils-commits] r10256 - in branches/acq-experiment: . Open-ILS/src/perlmods/OpenILS/Application/Search

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-08-04 21:58:38 -0400 (Mon, 04 Aug 2008)
New Revision: 10256

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
Merged revisions 10254 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r10254 | erickson | 2008-08-04 17:42:27 -0400 (Mon, 04 Aug 2008) | 1 line
  
  fixed syntax error in elseif.  fixed undefined reference to service
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-10252
   + /trunk:1-10255

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-08-05 00:01:23 UTC (rev 10255)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-08-05 01:58:38 UTC (rev 10256)
@@ -248,7 +248,7 @@
 	my $username = $$args{username} || "";
 	my $password = $$args{password} || "";
 
-    my $tformat = $services{$service}->{transmission_format} || $output;
+    my $tformat = $services{$args->{service}}->{transmission_format} || $output;
 
 	my $editor = new_editor(authtoken => $auth);
 	return $editor->event unless $editor->checkauth;
@@ -339,7 +339,7 @@
 
             if ($tformat eq 'usmarc') {
     			$marc		= MARC::Record->new_from_usmarc($rec->raw());
-            } else if ($tformat eq 'xml') {
+            } elsif ($tformat eq 'xml') {
     			$marc		= MARC::Record->new_from_xml($rec->raw());
             } else {
                 die "Unsupported record transmission format $tformat"