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

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-15 15:45:54 -0400 (Thu, 15 May 2008)
New Revision: 9625

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Evergreen/conf/lib_ips.txt
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
Merged revisions 9616,9622 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9616 | erickson | 2008-05-15 10:21:44 -0400 (Thu, 15 May 2008) | 1 line
  
  new pines lib range
........
  r9622 | erickson | 2008-05-15 15:20:15 -0400 (Thu, 15 May 2008) | 1 line
  
  adding explicit return undef to prevent return of trailing "1"
........



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

Modified: branches/acq-experiment/Evergreen/conf/lib_ips.txt
===================================================================
--- branches/acq-experiment/Evergreen/conf/lib_ips.txt	2008-05-15 19:45:28 UTC (rev 9624)
+++ branches/acq-experiment/Evergreen/conf/lib_ips.txt	2008-05-15 19:45:54 UTC (rev 9625)
@@ -435,3 +435,4 @@
 LBRLS-UNAD  168.13.30.1 168.13.30.255
 LBRLS-SCH   168.13.33.1 168.13.33.255
 LBRLS-BYRM  168.13.27.1 168.13.27.255
+HALL-SSP    168.12.222.1 168.12.222.255

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-05-15 19:45:28 UTC (rev 9624)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-05-15 19:45:54 UTC (rev 9625)
@@ -199,6 +199,7 @@
 	}
 
 	$logger->debug("z3950: Search Complete");
+    return undef;
 }