From 126e5e0f4b4c0204ff638a2afc250bea6f7d3958 Mon Sep 17 00:00:00 2001
From: Tim Levett <levett@wisc.edu>
Date: Wed, 27 Jan 2016 09:20:55 -0600
Subject: [PATCH 1/2] cleanup some wisc.edu search stuff

---
 .../src/main/webapp/my-app/search/controllers.js    |  7 +++++--
 .../my-app/search/partials/search-results.html      |  2 +-
 .../src/main/webapp/my-app/search/services.js       | 13 +++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js b/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js
index a399a1752..9ac60ee5e 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js
+++ b/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js
@@ -47,7 +47,7 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
       
       var recalcTotalCount = function(){
         //all results are set to arrays by the time this is called.
-        $scope.totalCount = $scope.googleResults.length + $scope.myuwResults.length;
+        $scope.totalCount = $scope.googleResultsEstimatedCount.length + $scope.myuwResults.length;
       }
       
       var initWiscEduSearch = function(){
@@ -66,6 +66,7 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
         $scope.sortParameter = ['-rating','-userRated'];
         $scope.myuwResults = [];
         $scope.googleResults = [];
+        $scope.googleResultsEstimatedCount = 0;
         recalcTotalCount();
         $scope.searchResultLimit = 20;
         $scope.showAll = false;
@@ -78,7 +79,9 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
         });
       };
       init();
-      initWiscEduSearch();
+      if(googleCustomSearchService.googleSearchEnabled()){
+        initWiscEduSearch();
+      }
     }]);
 
     return app;
diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html b/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html
index 17abc2e17..0b4d2918a 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html
@@ -45,7 +45,7 @@ <h4><a href="{{::portlet.maxUrl}}" target="{{::portlet.target}}">{{ portlet.name
     </div>
   </div>
   <!--wisc.edu results-->
-  <div id="wisc-edu-results" class='search-results-container'>
+  <div id="wisc-edu-results" class='search-results-container' ng-show="googleResults && googleResults.length > 0">
     <h4 class='header'>Wisc.edu</h4>
     <hr>
     <loading-gif data-object='googleResults'></loading-gif>
diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/services.js b/angularjs-portal-home/src/main/webapp/my-app/search/services.js
index 0df60d1b9..ba5e3e653 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/search/services.js
+++ b/angularjs-portal-home/src/main/webapp/my-app/search/services.js
@@ -7,7 +7,7 @@ define(['angular', 'jquery'], function(angular, $) {
     app.factory('googleCustomSearchService', ['$http', 'miscService', 'SERVICE_LOC', function($http, miscService, SERVICE_LOC){
       
       function googleSearch(term) {
-        return $http.get(SERVICE_LOC.googleSearchURL + "?q=" + term).then(
+        return $http.get(SERVICE_LOC.googleSearchURL + "&q=" + term).then(
           function(response){
             return response.data;
           },
@@ -17,8 +17,17 @@ define(['angular', 'jquery'], function(angular, $) {
         )
       }
       
+      function googleSearchEnabled() {
+        if(SERVICE_LOC.googleSearchURL) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+      
       return {
-        googleSearch : googleSearch
+        googleSearch : googleSearch,
+        googleSearchEnabled : googleSearchEnabled
       };
       
       

From 3c2791c30a1907178f8a82839d446b0d8d0139c2 Mon Sep 17 00:00:00 2001
From: Tim Levett <levett@wisc.edu>
Date: Wed, 27 Jan 2016 09:24:56 -0600
Subject: [PATCH 2/2] mocking out the first variable in gcsURL

---
 angularjs-portal-home/src/main/webapp/js/app-config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angularjs-portal-home/src/main/webapp/js/app-config.js b/angularjs-portal-home/src/main/webapp/js/app-config.js
index 449318f68..2bbf6cb0c 100644
--- a/angularjs-portal-home/src/main/webapp/js/app-config.js
+++ b/angularjs-portal-home/src/main/webapp/js/app-config.js
@@ -31,7 +31,7 @@ define(['angular'], function(angular) {
             'notificationsURL' : '/web/staticFeeds/notifications.json',
             'groupURL' : '/portal/api/groups',
             'kvURL' : '/storage/',
-            'googleSearchURL' : '/web/staticFeeds/gcs.json'
+            'googleSearchURL' : '/web/staticFeeds/gcs.json?firstVariablemock=true'
         })
         .constant('NAMES', {
             'title' : 'MyUW',