more python style tweaks. removed some unnecessary cruft from hold placement script

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

diff --git a/contrib/evergreen/eg_bib_search.py b/contrib/evergreen/eg_bib_search.py
index d7e6b09..8fbb201 100644 (file)
--- a/contrib/evergreen/eg_bib_search.py
+++ b/contrib/evergreen/eg_bib_search.py
@@ -9,7 +9,7 @@ class BibSearchScript(Script):
     def run(self):
 
         dm = eg_data.DataManager()
-        org_id = dm.getThreadData(eg_data.PROP_ORG_IDS) or 1
+        org_id = dm.get_thread_data(eg_data.PROP_ORG_IDS) or 1
 
         search_args = {
             'org_unit' : org_id,

diff --git a/contrib/evergreen/eg_checkin.py b/contrib/evergreen/eg_checkin.py
index fc5ff15..f2f947f 100644 (file)
--- a/contrib/evergreen/eg_checkin.py
+++ b/contrib/evergreen/eg_checkin.py
@@ -13,7 +13,7 @@ class CheckinScript(Script):
     def run(self):
 
         dm = DataManager()
-        copyBarcode = dm.getThreadData(PROP_COPY_BARCODES)
+        copyBarcode = dm.get_thread_data(PROP_COPY_BARCODES)
 
         evt = doCheckin(copyBarcode)
         if not evt: return False

diff --git a/contrib/evergreen/eg_checkout.py b/contrib/evergreen/eg_checkout.py
index 0664078..3b49ecb 100644 (file)
--- a/contrib/evergreen/eg_checkout.py
+++ b/contrib/evergreen/eg_checkout.py
@@ -16,8 +16,8 @@ class CheckoutScript(Script):
     def run(self):
 
         dm = DataManager()
-        patronID = dm.getThreadData(PROP_PATRON_IDS)
-        copyBarcode = dm.getThreadData(PROP_COPY_BARCODES, True)
+        patronID = dm.get_thread_data(PROP_PATRON_IDS)
+        copyBarcode = dm.get_thread_data(PROP_COPY_BARCODES, True)
 
         evt = doCheckout(copyBarcode, patronID)
         if not evt: return False

diff --git a/contrib/evergreen/eg_checkout_roundtrip.py b/contrib/evergreen/eg_checkout_roundtrip.py
index 3e376c5..2535056 100644 (file)
--- a/contrib/evergreen/eg_checkout_roundtrip.py
+++ b/contrib/evergreen/eg_checkout_roundtrip.py
@@ -16,8 +16,8 @@ class CheckoutRoundtripScript(Script):
     def run(self):
 
         dm = DataManager()
-        patronID = dm.getThreadData(PROP_PATRON_IDS)
-        copyBarcode = dm.getThreadData(PROP_COPY_BARCODES, True)
+        patronID = dm.get_thread_data(PROP_PATRON_IDS)
+        copyBarcode = dm.get_thread_data(PROP_COPY_BARCODES, True)
 
         evt = doCheckout(copyBarcode, patronID)
         if not evt: return False

diff --git a/contrib/evergreen/eg_data.py b/contrib/evergreen/eg_data.py
index 17dbe97..d454fc4 100644 (file)
--- a/contrib/evergreen/eg_data.py
+++ b/contrib/evergreen/eg_data.py
@@ -58,7 +58,7 @@ class DataManager(object):
         self.data[prop] = v
         log_debug("DataManager set property %s => %s" % (prop, str(v)))
 
-    def getThreadData(self, prop, noSharing=False):
+    def get_thread_data(self, prop, noSharing=False):
         ''' If the caller is requesting array-based data, we want to de-multiplex(?) 
             the requested data based on the currently running thread.  In other
             words, each thread should have its own view into the array of data

diff --git a/contrib/evergreen/eg_renew.py b/contrib/evergreen/eg_renew.py
index b96a204..ee27650 100644 (file)
--- a/contrib/evergreen/eg_renew.py
+++ b/contrib/evergreen/eg_renew.py
@@ -16,7 +16,7 @@ class RenewScript(Script):
     def run(self):
 
         dm = DataManager()
-        copyBarcode = dm.getThreadData(PROP_COPY_BARCODES, True)
+        copyBarcode = dm.get_thread_data(PROP_COPY_BARCODES, True)
 
         evt = doRenew(copyBarcode)
         if not evt: return False

diff --git a/contrib/evergreen/eg_title_hold.py b/contrib/evergreen/eg_title_hold.py
index e11fc88..bf30c74 100644 (file)
--- a/contrib/evergreen/eg_title_hold.py
+++ b/contrib/evergreen/eg_title_hold.py
@@ -5,29 +5,18 @@ from eg_workflow import *
 
 eg_utils.init()
 
-
 class CreateTitleHoldScript(Script):
 
-    def on_thread_init(self, scriptThread):
-        # collect all of the holds the current thread user already has
-        # so any new holds can be cancelled after the thread is complete
-        eg_utils.init_thread()
-        dm = DataManager()
-        patronID = dm.getThreadData(PROP_PATRON_IDS)
-
-
     def run(self):
         
         dm = DataManager()
-        titleID = dm.getThreadData(PROP_TITLE_IDS)
-        pickupLib = dm.getThreadData(PROP_ORG_IDS)
-        patronID = dm.getThreadData(PROP_PATRON_IDS)
+        title_id = dm.get_thread_data(PROP_TITLE_IDS)
+        pickup_lib = dm.get_thread_data(PROP_ORG_IDS)
+        patron_id = dm.get_thread_data(PROP_PATRON_IDS)
 
-        hold_id = doTitleHold(titleID, patronID, pickupLib)
+        hold_id = doTitleHold(title_id, patron_id, pickup_lib)
         if hold_id:
             doTitleHoldCancel(hold_id)
 
-
-
 ScriptManager.go(CreateTitleHoldScript())
 

diff --git a/contrib/evergreen/eg_user_transactions.py b/contrib/evergreen/eg_user_transactions.py
index 5a7011f..bcc72d1 100644 (file)
--- a/contrib/evergreen/eg_user_transactions.py
+++ b/contrib/evergreen/eg_user_transactions.py
@@ -25,7 +25,7 @@ class BibSearchScript(Script):
     def run(self):
 
         dm = eg_data.DataManager()
-        user_id = dm.getThreadData(eg_data.PROP_PATRON_IDS)
+        user_id = dm.get_thread_data(eg_data.PROP_PATRON_IDS)
 
         for type in types:
             log_info('Loading patron(%s) transactions with %s' % (int(user_id),  type))

diff --git a/contrib/evergreen/eg_workflow.py b/contrib/evergreen/eg_workflow.py
index c795197..a7e5cc4 100644 (file)
--- a/contrib/evergreen/eg_workflow.py
+++ b/contrib/evergreen/eg_workflow.py
@@ -91,7 +91,7 @@ def doTitleHold(titleID, patronID, pickupLib):
     if not doTitleHoldPermit(titleID, patronID, pickupLib):
         return
 
-    evt = et_tasks.TitleHoldTask().start(title_id=titleID, patron_id=patronID, pickup_lib=pickupLib)
+    evt = eg_tasks.TitleHoldTask().start(title_id=titleID, patron_id=patronID, pickup_lib=pickupLib)
     
     log_info("title task returned %s" % str(evt))