diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | settings.inc | 12 | ||||
| -rwxr-xr-x | solr_search.module | 5 |
3 files changed, 13 insertions, 7 deletions
@@ -1,4 +1,5 @@ # r_solr_search + This is used in R code search feature on R TBC website. ##### Requirements: @@ -7,5 +8,3 @@ This is used in R code search feature on R TBC website. ##### Author: > Prashant Sinalkar > FOSSEE, IIT Bombay - - diff --git a/settings.inc b/settings.inc index cd02e2c..90cbc0f 100755 --- a/settings.inc +++ b/settings.inc @@ -1,5 +1,5 @@ <?php - function tbc_solr_search_settings_form($form_state) { + function tbc_solr_search_settings_form($form, &$form_state) { $form['tbc_example_file_path'] = array( '#type' => 'textfield', @@ -16,7 +16,13 @@ '#required' => TRUE, '#default_value' => variable_get('tbc_solr_max_results', ''), ); - + $form['tbc_r_cloud_url'] = array( + '#type' => 'textfield', + '#title' => t('R on Cloud URL for post request'), + '#size' => 50, + '#required' => TRUE, + '#default_value' => variable_get('tbc_r_cloud_url', ''), + ); $form['submit'] = array( '#type' => 'submit', '#value' => t('Submit') @@ -29,6 +35,8 @@ variable_set('tbc_example_file_path', $form_state['values']['tbc_example_file_path']); variable_set('tbc_solr_max_results', $form_state['values']['tbc_solr_max_results']); + variable_set('tbc_r_cloud_url', $form_state['values']['tbc_r_cloud_url']); + drupal_set_message(t('Settings Updated Successfully!'), 'status'); } diff --git a/solr_search.module b/solr_search.module index 7574924..b945786 100755 --- a/solr_search.module +++ b/solr_search.module @@ -165,9 +165,8 @@ function add_all_books_to_solr_form_submit($form, &$form_state) function ajax_solr_search_result_callback($form, $form_state) { + $cloud_url = variable_get('tbc_r_cloud_url', ''); $output = ''; - //$key = ''; - //var_dump($form_state['values']['tbc_search_key']);die; $path = drupal_get_path('module', 'solr_search'); drupal_add_css($path . '/solr_search.css', 'module'); drupal_add_js($path . '/solr_search.js', 'module'); @@ -210,7 +209,7 @@ function ajax_solr_search_result_callback($form, $form_state) $output .= '<p><b>Book: </b>' . $doc->title . ' (' . $doc->author . ')</p>'; $output .= '<p><b>Chapter: </b>' . $doc->chapter[0] . '</p>'; $output .= '<p><b>Example: </b>' . $doc->example[0] . '</p>'; - $output .= '<p><b>Links: </b> <a href="' . base_path() . 'textbook-companion/download/book/' . $doc->book_id[0]. '"><span style="font-weight:bold;font-size:16px;">⤵</span> Download entire book</a> <a href="127.0.0.1/index?eid=' . $doc->id . '" target="_blank"><span style="font-weight:bold;font-size:20px;">»</span> View this example</a></p>'; + $output .= '<p><b>Links: </b> <a href="' . base_path() . 'textbook-companion/download/book/' . $doc->book_id[0]. '"><span style="font-weight:bold;font-size:16px;">⤵</span> Download entire book</a> <a href="'. $cloud_url.'?eid=' . $doc->id . '" target="_blank"><span style="font-weight:bold;font-size:20px;">»</span> View this example</a></p>'; $output .= '</li>'; } $output .= '<ol></div>'; |