some code formating and make blocks disapper if there are no results

roblib_search.module

@@ -6,31 +6,6 @@
  */
 
 
-/**
- * Implements hook_boot().
- * @global type $conf
- */
-function roblib_search_boot() {
-/* below is an example from islandora_solr module for internationalization
- *  global $conf;
-
-  // Allow i18n, by using multilingual variables.
-  if (module_exists('i18n')) {
-    $vars = array(
-      'islandora_solr_facets',
-      'islandora_solr_result_fields',
-      'islandora_solr_searchterms'
-    );
-
-    if (isset($conf['i18n_variables']) && is_array($conf['i18n_variables'])) {
-      $conf['i18n_variables'] = array_merge($vars, $conf['i18n_variables']);
-    }
-    else {
-      $conf['i18n_variables'] = $vars;
-    }
-  }*/
-}
-
 /**
  * Implements hook_menu().
  */
@@ -42,7 +17,6 @@ function roblib_search_menu() {
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
   );
-  
   $items['admin/roblib_search/configure'] = array(
     'title' => 'Global Configuration',
     'description' => 'Configure global Roblib search settings.',
@@ -51,15 +25,12 @@ function roblib_search_menu() {
     'page arguments' => array('roblib_search_config_form'),
     'type' => MENU_NORMAL_ITEM,
   );
-  
-  
   return $items;
 }
 
 
 function roblib_search_config_form($form, &$form_state) {
 
-  //variable_get('roblib_search_panel_page','/roblib/panel');
   $form['roblib_search_panel_page'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the roblib search panel page'),
@@ -68,7 +39,6 @@ function roblib_search_config_form($form, &$form_state) {
     '#required' => TRUE,
   );
 
-
   return system_settings_form($form);
 }
 
@@ -105,14 +75,14 @@ function roblib_search_block_info() {
     // info: The name of the block.
     'info' => t('Roblib Global Search Form'),
     // Block caching options (per role, per user, etc.)
-    'cache' => DRUPAL_CACHE_PER_ROLE, // default
+    // Default.
+    'cache' => DRUPAL_CACHE_PER_ROLE,
   );
 
   return $blocks;
 }
 
 function roblib_search_block_view($delta = '') {
-  //The $delta parameter tells us which block is being requested.
   switch ($delta) {
     case 'roblib_search_form':
       // The subject is displayed at the top of the block. Note that it
@@ -128,10 +98,11 @@ function roblib_search_block_view($delta = '') {
 }
 
 /**
- * Roblib search simple search form submit
+ * Roblib search simple search form submit.
  *
- * @param type $form
+ * @param array $form
  * @param array $form_state
+ *
  */
 function roblib_search_simple_form_submit($form, &$form_state) {
   global $base_url;
@@ -145,8 +116,8 @@ function roblib_search_simple_form_submit($form, &$form_state) {
 /**
  * Roblib search simple search form
  *
- * @param type $form
+ * @param array $form
- * @param type $form_state
+ * @param array $form_state
  * @return array
  */
 function roblib_search_simple_form($form, &$form_state) {
@@ -161,7 +132,8 @@ function roblib_search_simple_form($form, &$form_state) {
     '#type' => 'container',
     '#attributes' => array(
       'class' => array(
-        'container-inline')
+        'container-inline'
+      )
     )
   );
   $form['simple']["roblib_search_simple_search_query"] = array(

targets/cufts/js/cufts_results.js

@@ -3,8 +3,9 @@ Drupal.behaviors.roblib_search_cufts = {
         url = settings.roblib_search_cufts.search_url;
         jQuery.getJSON(url, function(data) {
             var items = [];
-            if (data.length < 1) {
+            if (data.journals.length < 1) {
                 jQuery('#' + 'roblib-search-content-cufts').empty().append('No Results');
+                jQuery('.' + 'pane-roblib-search-cufts-roblib-search-cufts-results').hide();
             } else {
                 jQuery.each(data.journals, function(key, val) {
                     var item_str = '<div class ="roblib-search-row">';

targets/eds/js/eds_results.js

@@ -3,8 +3,9 @@ Drupal.behaviors.roblib_search_eds = {
         $url = settings.roblib_search_eds.search_url;
         jQuery.getJSON($url, function(data) {
             var items = [];     
-            if(data.length < 1){
+            if(data.records.length < 1){
                 jQuery('#' + 'roblib-search-content-eds').empty().append('No Results');
+                jQuery('.' + 'pane-roblib-search-eds-roblib-search-eds-results').hide();
             } else {
                 jQuery.each(data.records, function(key, val) {
                     

targets/evergreen/js/evergreen_results.js

@@ -3,8 +3,9 @@ Drupal.behaviors.roblib_search_evergreen = {
         url = settings.roblib_search_evergreen.search_url;
         jQuery.getJSON(url, function(data) {
             var items = [];
-            if(data.length < 1){
+            if(data.numberOfRecords < 1){
                 jQuery('#' + 'roblib-search-content-evergreen').empty().append('No Results');
+                jQuery('.pane-roblib-search-evergreen-roblib-search-evergreen-results').hide();
             } else {
                 jQuery.each(data, function(key, val) {
                     

targets/solr_site/js/solr_site_results.js

@@ -3,8 +3,9 @@ Drupal.behaviors.roblib_search_solr_site = {
         url = settings.roblib_search_solr_site.search_url;
         jQuery.getJSON(url, function(data) {
             var items = [];
-            if (data.length < 1) {
+            if (data.response.docs.length < 1) {
                 jQuery('#' + 'roblib-search-content-solr-site').empty().append('No Results');
+                jQuery('.' + 'pane-roblib-search-solr-site-roblib-search-solr-site-results').hide();
             } else {
                 jQuery.each(data.response.docs, function(key, val) {
                     items.push('<div class ="roblib-search-row">\n\
@@ -14,7 +15,6 @@ Drupal.behaviors.roblib_search_solr_site = {
                 var number = parseInt(data.rows);
                 jQuery('#' + 'roblib-search-content-solr-site').empty();
                 items = showMoreItems(items, number);
-
             }
         });
     }

targets/solr_site/roblib_search_solr_site.module

@@ -5,30 +5,6 @@
  * Implementation of Roblib search for searching several targets.
  */
 
-/**
- * Implements hook_boot().
- * @global type $conf
- */
-function roblib_search_solr_site_boot() {
-  /* below is an example from islandora_solr module for internationalization
-   *  global $conf;
-
-    // Allow i18n, by using multilingual variables.
-    if (module_exists('i18n')) {
-    $vars = array(
-    'islandora_solr_facets',
-    'islandora_solr_result_fields',
-    'islandora_solr_searchterms'
-    );
-
-    if (isset($conf['i18n_variables']) && is_array($conf['i18n_variables'])) {
-    $conf['i18n_variables'] = array_merge($vars, $conf['i18n_variables']);
-    }
-    else {
-    $conf['i18n_variables'] = $vars;
-    }
-    } */
-}
 
 /**
  * Implements hook_menu().
@@ -165,17 +141,16 @@ function roblib_search_solr_site_get_results($query) {
   );
   $url = url($solr_url . '/select', array('query' => $data));
   $results = drupal_http_request($url);
+  if($results->code != '200'){
+    return "";
+  }
   $temp = substr($results->data, 1);
-  $out = '{"rows":"'.$num_results.'",'.$temp;
+  //$out = '{"rows":"' . $num_results . '",' . $results->data;
-  return $out;
+  return $results->data;
 }
 
 /**
  * Implements hook_help().
- *
- * @param type $path
- * @param type $arg
- * @return type
  */
 function roblib_search_solr_site_help($path, $arg) {
   switch ($path) {