updated cufts target and evergreen target now does ajax

targets/cufts/roblib_search_cufts.module

@@ -200,7 +200,8 @@ function roblib_search_cufts_help($path, $arg) {
     case 'admin/help#roblib_search_cufts':
       return t(
               '<p>
-         provides a target for the Roblib search module
+         provides a target for the Roblib search module.  This target uses javascript 
+         to render the results. 
          </p>'
       );
   }

targets/cufts/theme/roblib-search-cufts.tpl.php

@@ -17,7 +17,7 @@
  */
 ?>
 
-<div class ="roblib-search-content-cufts" id="roblib-search-content-cufts"> 
+<div class ="roblib-search-content cufts" id="roblib-search-content-cufts"> 
   <img src="<?php print $spinner_path; ?>"/> 
   
 </div>

targets/evergreen/js/evergreen_results.js

@@ -0,0 +1,23 @@
+Drupal.behaviors.roblib_search_evergreen = {
+    attach: function(context, settings) { 
+        $url = settings.roblib_search_evergreen.search_url;
+        jQuery.getJSON($url, function(data) {
+            var items = [];     
+            if(data.length < 1){
+                jQuery('#' + 'roblib-search-content-evergreen').empty().append('No Results');     
+            } else {
+                jQuery.each(data, function(key, val) {
+                    items.push('<div class ="roblib-search-row">');
+                    items.push('<div class="roblib-title evergreen">');
+                    items.push('<a href = "'+val.url+'">'+val.title+'</a></div>');
+                    items.push('</div>');
+                });     
+            }            
+            jQuery('#' + 'roblib-search-content-evergreen').empty().append(items.join(''));
+        });
+    }
+  
+}
+
+
+

targets/evergreen/roblib_search_evergreen.module

@@ -45,10 +45,17 @@ function roblib_search_evergreen_menu() {
     'type' => MENU_NORMAL_ITEM,
   );
 
+  $items['roblib_search/evergreen/ajax/%'] = array(
+    'title' => 'evergreen ajax',
+    'page callback' => 'roblib_search_evergreen_ajax',
+    'page arguments' => array(3),
+    'type' => MENU_CALLBACK,
+    'access arguments' => array('search roblib evergreen'),
+  );
+
   return $items;
 }
 
-
 function roblib_search_evergreen_config_form($form, &$form_state) {
   /*
    * $url = variable_get('roblib_search_evergreen_url', 'http://137.149.200.52');
@@ -123,7 +130,6 @@ function roblib_search_evergreen_theme() {
   );
 }
 
-
 function roblib_search_evergreen_block_info() {
 
   $blocks['roblib_search_evergreen_results'] = array(
@@ -146,23 +152,27 @@ function roblib_search_evergreen_block_view($delta = '') {
       $block['subject'] = t('Evergreen Results');
       // The content of the block is typically generated by calling a custom
       // function.
-      $block['content'] = roblib_search_evergreen_get_results();
+      $block['content'] = theme('roblib_search_evergreen', array('results' => NULL));
       break;
   }
   return $block;
 }
 
-function roblib_search_evergreen_get_results() {
-  drupal_add_css(drupal_get_path('module', 'roblib_search_evergreen') . '/css/roblib_search_evergreen.theme.css');
-
-  // Url parameters.
-  if (isset($_GET['roblib_query'])) {
-    $query = $_GET['roblib_query'];
-  }
-  else {
-    return '';
+function roblib_search_evergreen_ajax($query) {
+  $output = roblib_search_evergreen_get_results($query);
+  print $output;
+  exit();
 }
 
+/**
+ * 
+ * @param string $query
+ * @return string
+ *   json 
+ */
+function roblib_search_evergreen_get_results($query) {
+  drupal_add_css(drupal_get_path('module', 'roblib_search_evergreen') . '/css/roblib_search_evergreen.theme.css');
+
   $url = variable_get('roblib_search_evergreen_url', 'http://137.149.200.52');
   $url_suffix = variable_get('roblib_search_evergreen_search_suffix', '/opac/extras/sru?version=1.1&operation=searchRetrieve&query=');
   $number_of_records = variable_get('roblib_search_evergreen_num_results', '5');
@@ -175,9 +185,16 @@ function roblib_search_evergreen_get_results() {
     $output = 'Error retrieving Evergreen results ' . $results->status_message;
   }
 
-  return theme('roblib_search_evergreen', array('results' => $output));
+  return json_encode($output);
 }
 
+/**
+ * 
+ * @param string $results
+ *    results in marcxml
+ * @return array $output
+ *    information we want from the xml stored in an array
+ */
 function roblib_search_evergreen_parse_results($results) {
   $xml = $results->data;
   if (!isset($xml)) {

targets/evergreen/theme/roblib-search-evergreen.tpl.php

@@ -17,13 +17,8 @@
  */
 ?>
 
-<div class ="roblib-search-content-evergreen">  
-   <?php foreach($results as $result): ?>
-    <div class ="roblib-search-row">
+<div class ="roblib-search-content evergreen" id="roblib-search-content-evergreen"> 
+  <img src="<?php print $spinner_path; ?>"/> 
   
-  <div class="rolib-title evergreen"><a href = "<?php print $result['url']; ?>"><?php print $result['title']; ?></a>
-  </div>
-    </div>
-  <?php endforeach; ?>
- <div class ="roblib-search-more">Search the Catalog</div>
 </div>
+<div class ="roblib-search-more">Search all Results</div>

targets/evergreen/theme/theme.inc

@@ -6,6 +6,19 @@
  */
 
 function roblib_search_evergreen_preprocess_roblib_search_evergreen(&$variables) {
-  //not yet implemented
+    global $base_url;
+   if (!isset($query)) {
+    if (isset($_GET['roblib_query'])) {
+      $query = $_GET['roblib_query'];
+    }
+    else {
+      return '';
+    }
+  }
+  $spinner_path = $base_url . '/' . drupal_get_path('module', 'roblib_search') . '/img/'.'spinner.gif';
+  $variables['spinner_path'] = $spinner_path;
+  $search_url = $base_url .'/roblib_search/evergreen/ajax/'.urlencode($query);
+  drupal_add_js(drupal_get_path('module', 'roblib_search_evergreen') . '/js/evergreen_results.js');
+  drupal_add_js(array('roblib_search_evergreen' => array('search_url' => $search_url)), array('type' => 'setting'));
 }
 ?>