Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test

Author: s-paquette

Vagrantfile

@@ -2,8 +2,6 @@
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
 
-  config.vagrant.plugins = ["vagrant-vbguest"]
-
   config.vm.provider "virtualbox" do |vb|
      # Display the VirtualBox GUI when booting the machine
      # vb.gui = true

idc/settings.py

@@ -182,6 +182,8 @@
 if IS_APP_ENGINE:
     print("[STATUS] AppEngine Flex detected.", file=sys.stdout)
     SITE_ID = int(os.environ.get('SITE_ID', '3'))
+else:
+    print("[STATUS] AppEngine not detected, so site ID is set to local or development platform")
 
 
 BQ_MAX_ATTEMPTS             = int(os.environ.get('BQ_MAX_ATTEMPTS', '10'))

idc/settings_unit_test.py

@@ -99,12 +99,12 @@
 DB_SOCKET = DATABASES['default']['HOST'] if 'cloudsql' in DATABASES['default']['HOST'] else None
 
 IS_DEV = (os.environ.get('IS_DEV', 'False') == 'True')
-IS_APP_ENGINE_FLEX = os.getenv('GAE_INSTANCE', '').startswith(APP_ENGINE_FLEX)
-IS_APP_ENGINE = os.getenv('SERVER_SOFTWARE', '').startswith(APP_ENGINE)
+# AppEngine var is set in the app.yaml so this should be false for CI and local dev apps
+IS_APP_ENGINE = bool(os.getenv('IS_APP_ENGINE', 'False') == 'True')
 
 # If this is a GAE-Flex deployment, we don't need to specify SSL; the proxy will take
 # care of that for us
-if 'DB_SSL_CERT' in os.environ and not IS_APP_ENGINE_FLEX:
+if 'DB_SSL_CERT' in os.environ and not IS_APP_ENGINE:
     DATABASES['default']['OPTIONS'] = {
         'ssl': {
             'ca': os.environ.get('DB_SSL_CA'),
@@ -116,7 +116,7 @@
 # Default to localhost for the site ID
 SITE_ID = 3
 
-if IS_APP_ENGINE_FLEX or IS_APP_ENGINE:
+if IS_APP_ENGINE:
     print("[STATUS] AppEngine Flex detected.", file=sys.stdout)
     SITE_ID = 4
 

idc/views.py

@@ -814,7 +814,6 @@ def explore_data_page(request, filter_path=False, path_filters=None):
         if ref:
             request.session.create()
 
-
         is_dicofdic = (req.get('is_dicofdic', "False").lower() == "true")
         source = req.get('data_source_type', DataSource.SOLR)
         versions = json.loads(req.get('versions', '[]'))
@@ -823,7 +822,8 @@ def explore_data_page(request, filter_path=False, path_filters=None):
 
         fields = json.loads(req.get('fields', '[]'))
         order_docs = json.loads(req.get('order_docs', '[]'))
-        counts_only = (req.get('counts_only', "False").lower() == "true")
+        counts_only = (req.get('counts_only', "true").lower() == "true")
+        print("Explore data page call, counts only: {}".format(counts_only))
         with_related = (req.get('with_clinical', "True").lower() == "true")
         with_derived = (req.get('with_derived', "True").lower() == "true")
         collapse_on = req.get('collapse_on', 'SeriesInstanceUID')

static/js/image_search.js

@@ -121,7 +121,7 @@ require([
         $('#search_def_stats').html(isFiltered ? "Gathering cohort statistics...": " ");
         ndic = {
             'totals': JSON.stringify(["PatientID", "StudyInstanceUID", "SeriesInstanceUID"]),
-            'counts_only': 'False',
+            'counts_only': 'True',
             'is_json': 'True',
             'is_dicofdic': 'True',
             'data_source_type': ($("#data_source_type option:selected").val() || 'S'),