[open-ils-commits] r1260 - servres/trunk/conifer/integration (artunit)

[svn at svn.open-ils.org]

Author: artunit
Date: 2011-03-09 16:24:41 -0500 (Wed, 09 Mar 2011)
New Revision: 1260

Modified:
   servres/trunk/conifer/integration/uwindsor.py
   servres/trunk/conifer/integration/uwindsor_fuzzy_lookup.py
Log:
quick fix for odd multiple copy scenario, workaround for empty ldap-agent file

Modified: servres/trunk/conifer/integration/uwindsor.py
===================================================================
--- servres/trunk/conifer/integration/uwindsor.py	2011-03-08 18:30:32 UTC (rev 1259)
+++ servres/trunk/conifer/integration/uwindsor.py	2011-03-09 21:24:41 UTC (rev 1260)
@@ -202,7 +202,7 @@
 						# way too wacky to sort out vols for this
 						if duetime < earliestdue and not bringfw:
 							earliestdue = duetime
-							dueinfo = time.strftime(DUE_FORMAT,earliestdue)
+							dueinfo = time.strftime(settings.DUE_FORMAT,earliestdue)
 							callno = callnum
 
 				alldisplay = callnum + ' (Available)'

Modified: servres/trunk/conifer/integration/uwindsor_fuzzy_lookup.py
===================================================================
--- servres/trunk/conifer/integration/uwindsor_fuzzy_lookup.py	2011-03-08 18:30:32 UTC (rev 1259)
+++ servres/trunk/conifer/integration/uwindsor_fuzzy_lookup.py	2011-03-09 21:24:41 UTC (rev 1260)
@@ -15,7 +15,8 @@
 # fetch server connection details from /etc/ldap-agent
 
 tmp = [line.strip() for line in file('/etc/ldap-agent')]
-SERVER, USER, PWD = tmp[:3]
+if tmp:
+    SERVER, USER, PWD = tmp[:3]
 
 # ---------------------------------------------------------------------------
 # filter construction