filter out copies and org-units that are more likely to cause early exit from circ...

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

diff --git a/contrib/evergreen/eg_batch.py b/contrib/evergreen/eg_batch.py
index 0dcc301..4213945 100755 (executable)
--- a/contrib/evergreen/eg_batch.py
+++ b/contrib/evergreen/eg_batch.py
@@ -16,7 +16,7 @@ class BatchMethodTask(eg_tasks.AbstractMethodTask):
         self.method = method
 
     def run(self, **kw):
-        log.log_info("Batch call: %s %s" % (self.method, osrf.json.to_json(kw['params'])))
+        log.log_info("Batch call: %s %s" % (self.method, osrf.json.to_json(kw['params'])[1:-1]))
         return self.run_method(*kw['params'])
 
 

diff --git a/contrib/evergreen/eg_data.py b/contrib/evergreen/eg_data.py
index 1f9df69..38aff58 100644 (file)
--- a/contrib/evergreen/eg_data.py
+++ b/contrib/evergreen/eg_data.py
@@ -28,7 +28,7 @@ class DataMethodTask(eg_tasks.AbstractMethodTask):
         self.method = method
 
     def run(self, **kw):
-        log.log_info("Data Method: %s %s" % (self.method, osrf.json.to_json(kw['params'])))
+        log.log_info("Data Method: %s %s" % (self.method, osrf.json.to_json(kw['params'])[1:-1]))
         return self.run_method(*kw['params'])
 
 
@@ -58,7 +58,19 @@ class DataManager(object):
         if not self.data.get(PROP_COPY_ID) or not self.data.get(PROP_COPY_BARCODE):
 
             copies = DataMethodTask(pcrud, method % 'acp').start(
-                params = [auth, {'deleted' : 'f', 'id' : {'>' : 0}}, {'limit' : thread_count}])
+                params = [
+                    auth,
+                    {
+                        'deleted':'f',
+                        'id' : {'>' : 0},
+                        'holdable' : 't',
+                        'circulate' : 't',
+                        '+acpl':{'holdable':'t'},
+                        '+ccs':{'holdable':'t'}
+                    },
+                    {'limit' : thread_count, 'join': {'acpl' : {}, 'ccs' : {}}}
+                ]
+            )
 
             if not self.data.get(PROP_COPY_ID):
                 self.insert_prop_data(PROP_COPY_ID, [obj.id() for obj in copies])
@@ -76,13 +88,17 @@ class DataManager(object):
         if not self.data.get(PROP_ORG_ID) or not self.data.get(PROP_ORG_SHORTNAME):
 
             org_units = DataMethodTask(pcrud, method % 'aou').start(
-                params = [auth, {'id' : {'>' : 0}}, {'limit' : thread_count}])
+                params = [
+                    auth,
+                    {'id' : {'>' : 0}, '+aout':{'can_have_vols' : 't', 'can_have_users' : 't'}},
+                    {'limit' : thread_count, 'join' : 'aout'}
+                ]
+            )
 
             if not self.data.get(PROP_ORG_ID):
                 self.insert_prop_data(PROP_ORG_ID, [obj.id() for obj in org_units])
 
             if not self.data.get(PROP_ORG_SHORTNAME):
-
                 self.insert_prop_data(PROP_ORG_SHORTNAME, [obj.shortname() for obj in org_units])