From: artunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Wed, 9 Mar 2011 21:24:41 +0000 (+0000)
Subject: quick fix for odd multiple copy scenario, workaround for empty ldap-agent file
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=909f79b8d134dd3983ba5ba2e1b6c242edee2b1c;p=Syrup.git

quick fix for odd multiple copy scenario, workaround for empty ldap-agent file

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@1260 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/conifer/integration/uwindsor.py b/conifer/integration/uwindsor.py
index ef175fa..d568327 100644
--- a/conifer/integration/uwindsor.py
+++ b/conifer/integration/uwindsor.py
@@ -202,7 +202,7 @@ def _item_status(bib_id):
 						# 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)'
diff --git a/conifer/integration/uwindsor_fuzzy_lookup.py b/conifer/integration/uwindsor_fuzzy_lookup.py
index 4b804a0..81fec8b 100755
--- a/conifer/integration/uwindsor_fuzzy_lookup.py
+++ b/conifer/integration/uwindsor_fuzzy_lookup.py
@@ -15,7 +15,8 @@ ATTRS = ["uid", "sn", "eduPersonNickname", "employeeType",
 # 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