EDS target module can now be enabled and blocks and form display

modules/roblib_search_eds/roblib_search_eds.info.yml

@@ -0,0 +1,9 @@
+name: Roblib Search EDS
+type: module
+configure: roblib_search_eds.settings
+description: Implements the Roblib Search EDS book and article results
+package: Roblib Search
+core_version_requirement: ^8.9 || ^9
+dependancies:
+  - roblib_search
+  - ebsco

modules/roblib_search_eds/roblib_search_eds.module

@@ -60,7 +60,7 @@ function roblib_search_eds_info($type = 'Articles') {
 /**
  * Implements hook_permission().
  */
-function roblib_search_eds_permission() {
+/*function roblib_search_eds_permission() {
   return array(
     'search roblib eds' => array(
       'title' => t('Search the eds target'),
@@ -71,36 +71,26 @@ function roblib_search_eds_permission() {
       'description' => t('Administer settings for the Roblib eds search client.'),
     ),
   );
-}
+}*/
+
 
 /**
  * Implements hook_theme().
  */
-function roblib_search_eds_theme() {
-  // set path
-  $path = drupal_get_path('module', 'roblib_search_eds');
-  $file = 'theme.inc';
-
-  return array(
-    // results page
-    'roblib_search_eds' => array(
-      'path' => $path . '/theme',
-      'file' => $file,
-      'template' => 'roblib-search-eds',
-      'variables' => array('results' => NULL),
-    ),
-    'roblib_search_eds_articles' => array(
-      'path' => $path . '/theme',
-      'file' => $file,
-      'template' => 'roblib-search-eds-articles',
-      'variables' => array('results' => NULL),
-    ),
-  );
+function roblib_search_eds_theme($existing, $type, $theme, $path) {
+  return [
+    'roblib_search_eds_books' => [
+      'variables' => ['query' => NULL],
+    ],
+    'roblib_search_eds_articles' => [
+      'variables' => ['query' => NULL],
+    ],
+  ];
 }
 
 
 
-function roblib_search_eds_block_info() {
+/*function roblib_search_eds_block_info() {
 
   $blocks['roblib_search_eds_results'] = array(
     // info: The name of the block.
@@ -113,9 +103,9 @@ function roblib_search_eds_block_info() {
     'cache' => DRUPAL_CACHE_PER_ROLE,
   );
   return $blocks;
-}
+}*/
 
-function roblib_search_eds_block_view($delta = '') {
+/*function roblib_search_eds_block_view($delta = '') {
   switch ($delta) {
     case 'roblib_search_eds_results':
       $block['subject'] = t('Books & Media');
@@ -129,9 +119,9 @@ function roblib_search_eds_block_view($delta = '') {
 
   }
   return $block;
-}
+}*/
 
-function roblib_search_eds_ajax($query) {
+/*function roblib_search_eds_ajax($query) {
   print roblib_search_eds_get_results($query, 'Books');
   exit();
 }
@@ -139,7 +129,7 @@ function roblib_search_eds_ajax($query) {
 function roblib_search_eds_articles($query) {
   print roblib_search_eds_get_results($query, 'Articles');
   exit();
-}
+}*/
 
 /**
  *

modules/roblib_search_eds/roblib_search_eds.routing.yml

@@ -0,0 +1,8 @@
+roblib_search_eds.settings:
+  path: '/admin/config/system/roblib_search_eds_settings'
+  defaults:
+    _form: '\Drupal\roblib_search_eds\Form\EdsSettingsForm'
+    _title: 'Roblib Search EDS Settings Form'
+  requirements:
+    _permission: 'administer site configuration'
+    

modules/roblib_search_eds/src/Controller/RoblibSearchEdsController.php

@@ -16,10 +16,7 @@ class RoblibSearchEdsController extends ControllerBase {
    *   A renderable array.
    */
   public function articleResults($query = NULL) {
-     return [
-      '#theme' => 'roblib_search_results',
-      '#query' => $query,
-    ];
+    
   }
   
   /**
@@ -30,7 +27,7 @@ class RoblibSearchEdsController extends ControllerBase {
    */
   public function bookResults($query = NULL) {
      return [
-      '#theme' => 'roblib_search_results',
+      '#theme' => 'roblib_search_eds_books',
       '#query' => $query,
     ];
   }

modules/roblib_search_eds/src/Form/EdsSettingsForm.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\roblib_search_eds\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Settings form for module
+ *
+ * @author ppound
+ */
+class EdsSettingsForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'roblib_search_eds_settings_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $config = \Drupal::config('roblib_search_eds.settings');
+    $form['eds_rest_url'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS Rest endpoint'),
+      '#default_value' => $config->get('eds_rest_url'),
+      '#description' => t('The base EDS URL, for example https://eds-api.ebscohost.com/edsapi/rest'),
+      '#required' => TRUE,
+    );
+    $form['eds_auth_url'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS Auth endpoint'),
+      '#default_value' => $config->get('eds_auth_url'),
+      '#description' => t('The EDS Auth endpoint, for example https://eds-api.ebscohost.com/Authservice/rest'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_user'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS user'),
+      '#default_value' => $config->get('eds_user'),
+      '#description' => t('EDS user, for example username'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_pass'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS password'),
+      '#default_value' => $config->get('eds_pass'),
+      '#description' => t('EDS password, for example password'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_guest'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS Guest access'),
+      '#default_value' => $config->get('eds_guest'),
+      '#description' => t('EDS Guest access, y = guest access, n = not a guest'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_article_profile'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS Article profile'),
+      '#default_value' => $config->get('eds_article_profile'),
+      '#description' => t('EDS profile, for example edsapi'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_book_profile'] = array(
+      '#type' => 'textfield',
+      '#title' => t('EDS Book profile'),
+      '#default_value' => $config->get('eds_book_profile'),
+      '#description' => t('EDS Book profile, for example apilite'),
+      '#required' => TRUE,
+    );
+
+    $form['eds_num_results'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Number of results to return'),
+      '#default_value' => $config->get('eds_num_results'),
+      '#description' => t('The number of results to display in the Bento box, usurally 5'),
+      '#required' => TRUE,
+    );
+    $form['eds_article_limiters'] = array(
+      '#type' => 'textarea',
+      '#title' => t('The limiters for Article searches'),
+      '#default_value' => $config->get('eds_article_limiters'),
+      '#description' => t('Specify the Publication Types to use as limiters for Article searches.  Formatted similar to
+     AND (PT Article OR PT Magazines OR PT News OR PT Academic Journals OR PT Conference Materials)'),
+      '#required' => TRUE,
+    );
+    $form['eds_book_limiters'] = array(
+      '#type' => 'textarea',
+      '#title' => t('The limiters for Books and Media searches'),
+      '#default_value' => $config->get('eds_book_limiters'),
+      '#description' => t('Specify the Publication Types to use as limiters for Article searches.  Formatted similar to
+     AND (PT Book OR PT Video OR PT Audio'),
+      '#required' => TRUE,
+    );
+     $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => t('Save'),
+      '#button_type' => 'primary',
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $config = \Drupal::configFactory()->getEditable('roblib_search_eds.settings');
+    $config->set('eds_rest_url', $form_state->getValue('eds_rest_url'))->save();
+    $config->set('eds_auth_url', $form_state->getValue('eds_auth_url'))->save();
+    $config->set('eds_user', $form_state->getValue('eds_user'))->save();
+    $config->set('eds_pass', $form_state->getValue('eds_pass'))->save();
+    $config->set('eds_guest', $form_state->getValue('eds_guest'))->save();
+    $config->set('eds_article_profile', $form_state->getValue('eds_article_profile'))->save();
+    $config->set('eds_book_profile', $form_state->getValue('eds_book_profile'))->save();
+    $config->set('eds_num_results', $form_state->getValue('eds_num_results'))->save();
+    $config->set('eds_article_limiters', $form_state->getValue('eds_article_limiters'))->save();
+    $config->set('eds_book_limiters', $form_state->getValue('eds_book_limiters'))->save();
+  }
+
+}

modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsArticles.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\roblib_search_eds\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides EDS Article search results.
+ *
+ * @Block(
+ *   id = "roblib_search_eds_articles_block",
+ *   admin_label = @Translation("Roblib Search EDS Articles Block"),
+ *   category = @Translation("Roblib Search"),
+ * )
+ */
+class RoblibSearchEdsArticles extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+   return [
+      '#theme' => 'roblib_search_eds_articles',
+      '#query' => $query,
+    ];
+  }
+}

modules/roblib_search_eds/src/Plugin/Block/RoblibSearchEdsBooks.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\roblib_search_eds\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides EDS book search results.
+ *
+ * @Block(
+ *   id = "roblib_search_eds_books_block",
+ *   admin_label = @Translation("Roblib Search EDS Books Block"),
+ *   category = @Translation("Roblib Search"),
+ * )
+ */
+class RoblibSearchEdsBooks extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+   return [
+      '#theme' => 'roblib_search_eds_books',
+      '#query' => $query,
+    ];
+  }
+}

modules/roblib_search_eds/templates/roblib-search-eds-articles.html.twig

@@ -0,0 +1,12 @@
+
+<div class ="roblib-search-more" id="roblib-search-eds-article-more"></div>
+<div class ="roblib-search-content eds-article" id="roblib-search-content-eds-articles">
+ 
+
+</div>
+
+<div id="roblib-eds-articles-more-results" class="roblib-eds-more-button button"></div>
+<div id="roblib-eds-articles-toc" class="roblib-bento-toc moveme-please"></div>
+
+
+

modules/roblib_search_eds/templates/roblib-search-eds-books.html.twig

@@ -1,13 +1,6 @@
-<?php
-
-/**
- * @file roblib-search-eds.tpl.php
- *
- */
-?>
 <div class ="roblib-search-more" id="roblib-search-eds-more"></div>
 <div class ="roblib-search-content eds" id="roblib-search-content-eds">
-  <img src="<?php print (empty($spinner_path) ? ' ' : $spinner_path); ?>"/>
+  
 
 </div>
 <div id="roblib-eds-books-more-results" class="roblib-eds-more-button button"></div>

roblib_search.module

@@ -5,46 +5,6 @@
  * Implementation of Roblib search for searching several targets.
  */
 
-
-/**
- * Implements hook_menu().
- */
-function roblib_search_menu() {
-
-  $items['admin/roblib_search'] = array(
-    'title' => 'Roblib search',
-    'description' => 'Configure global Roblib search settings.',
-    '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.',
-    'access arguments' => array('administer site configuration'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('roblib_search_config_form'),
-    'type' => MENU_NORMAL_ITEM,
-  );
-  return $items;
-}
-
-/**
- * Implements hook_block_info().
- */
-function roblib_search_block_info() {
-
-  $blocks['roblib_search_form'] = array(
-    'info' => t('Roblib Global Search Form'),
-    'cache' => DRUPAL_CACHE_PER_ROLE,
-  );
-  $blocks['roblib_search_other'] = array(
-    'info' => t('Roblib Search Other Sources'),
-    'cache' => DRUPAL_CACHE_PER_ROLE,
-  );
-
-  return $blocks;
-}
-
 /**
  * Implements hook_theme().
  */
@@ -67,22 +27,6 @@ function roblib_search_theme($existing, $type, $theme, $path) {
   drupal_add_css(drupal_get_path('module', 'roblib_search') . '/css/jquery.qtip.min.css');
 }*/
 
-/**
- * Implements hook_block_view().
- */
-function roblib_search_block_view($delta = '') {
-  switch ($delta) {
-    case 'roblib_search_form':
-      $block['subject'] = t('Bento Search');
-      $block['content'] = drupal_get_form('roblib_search_simple_form');
-      break;
-
-    case 'roblib_search_other':
-      $block['subject'] = t('Other Sources');
-      $block['content'] = theme('roblib_search_other_sources', array('results' => NULL));
-  }
-  return $block;
-}
 
 /**
  * Implements hook_help().

src/Plugin/Block/RoblibSearchBoxBlock.php

@@ -5,7 +5,7 @@ namespace Drupal\roblib_search\Plugin\Block;
 use Drupal\Core\Block\BlockBase;
 
 /**
- * Provides a 'Hello' Block.
+ * Provides a search form.
  *
  * @Block(
  *   id = "roblib_search_box",

targets/eds/Form/RoblibSearchEdsSettingsForm.php

@@ -1,133 +0,0 @@
-<?php
-
-namespace Drupal\roblib_search\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Settings form for module
- *
- * @author ppound
- */
-class RoblibSearchEdsSettingsForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'roblib_search_eds_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = \Drupal::config('roblib_search_eds.settings');
-    $form['eds_rest_url'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS Rest endpoint'),
-    '#default_value' => $config->get('eds_rest_url'),
-    '#description' => t('The base EDS URL, for example https://eds-api.ebscohost.com/edsapi/rest'),
-    '#required' => TRUE,
-  );
-  $form['eds_auth_url'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS Auth endpoint'),
-    '#default_value' => $config->get('eds_auth_url'),
-    '#description' => t('The EDS Auth endpoint, for example https://eds-api.ebscohost.com/Authservice/rest'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_user'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS user'),
-    '#default_value' => $config->get('eds_user'),
-    '#description' => t('EDS user, for example username'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_pass'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS password'),
-    '#default_value' => $config->get('eds_pass'),
-    '#description' => t('EDS password, for example password'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_guest'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS Guest access'),
-    '#default_value' => $config->get('eds_guest'),
-    '#description' => t('EDS Guest access, y = guest access, n = not a guest'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_article_profile'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS Article profile'),
-    '#default_value' => $config->get('eds_article_profile'),
-    '#description' => t('EDS profile, for example edsapi'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_book_profile'] = array(
-    '#type' => 'textfield',
-    '#title' => t('EDS Book profile'),
-    '#default_value' => $config->get('eds_book_profile'),
-    '#description' => t('EDS Book profile, for example apilite'),
-    '#required' => TRUE,
-  );
-
-  $form['eds_num_results'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Number of results to return'),
-    '#default_value' => $config->get('eds_num_results'),
-    '#description' => t('The number of results to display in the Bento box, usurally 5'),
-    '#required' => TRUE,
-  );
-  $form['eds_article_limiters'] = array(
-    '#type' => 'textarea',
-    '#title' => t('The limiters for Article searches'),
-    '#default_value' => $config->get('eds_article_limiters'),
-    '#description' => t('Specify the Publication Types to use as limiters for Article searches.  Formatted similar to
-     AND (PT Article OR PT Magazines OR PT News OR PT Academic Journals OR PT Conference Materials)'),
-    '#required' => TRUE,
-  );
-  $form['eds_book_limiters'] = array(
-    '#type' => 'textarea',
-    '#title' => t('The limiters for Books and Media searches'),
-    '#default_value' => $config->get('eds_book_limiters'),
-    '#description' => t('Specify the Publication Types to use as limiters for Article searches.  Formatted similar to
-     AND (PT Book OR PT Video OR PT Audio'),
-    '#required' => TRUE,
-  );
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = \Drupal::configFactory()->getEditable('roblib_search_eds.settings');
-    $config->set('eds_rest_url', $form_state->getValue('eds_rest_url'))->save();
-    $config->set('eds_auth_url', $form_state->getValue('eds_auth_url'))->save();
-    $config->set('eds_user', $form_state->getValue('eds_user'))->save();
-    $config->set('eds_pass', $form_state->getValue('eds_pass'))->save();
-    $config->set('eds_guest', $form_state->getValue('eds_guest'))->save();
-    $config->set('eds_article_profile', $form_state->getValue('eds_article_profile'))->save();
-    $config->set('eds_book_profile', $form_state->getValue('eds_book_profile'))->save();
-    $config->set('eds_num_results', $form_state->getValue('eds_num_results'))->save();
-    $config->set('eds_article_limiters', $form_state->getValue('eds_article_limiters'))->save();
-    $config->set('eds_book_limiters', $form_state->getValue('eds_book_limiters'))->save();
-
-  }
-
-}

targets/eds/roblib_search_eds.info.yml

@@ -1,8 +0,0 @@
-name: Roblib Search EDS
-configure: admin/roblib_search/eds_search
-description: Implements the Roblib Search modules _roblib_search hook
-package: Roblib Search
-core_version_requirement: ^8.9 || ^9
-dependancies:
-  - roblib_search
-  - ebsco

targets/eds/roblib_search_eds.routing.yml

@@ -1,25 +0,0 @@
-roblib_search_eds.settings:
-  path: '/admin/config/system/roblib_search'
-  defaults:
-    _form: '\Drupal\roblib_search_eds\Form\RoblibSearchEdsSettingsForm'
-    _title: 'Roblib Search EDS Settings Form'
-  requirements:
-    _permission: 'administer site configuration'
-    
-roblib_search_eds.article_search:
-  path: '/roblib_search/eds/articles/{query}'
-  defaults:
-    _controller: '\Drupal\roblib_search_eds\Controller\RoblibSearchEdsController::articleResults'
-    _title: 'Roblib Search EDS Articles'
-    query: '[a-zA-Z\s]+'
-  requirements:
-    _permission: 'access content'
-    
-roblib_search_eds.book_search:
-  path: '/roblib_search/eds/book/{query}'
-  defaults:
-    _controller: '\Drupal\roblib_search_eds\Controller\RoblibSearchEdsController::bookResults'
-    _title: 'Roblib Search EDS Articles'
-    query: '[a-zA-Z\s]+'
-  requirements:
-    _permission: 'access content'

targets/eds/theme/roblib-search-eds-articles.tpl.php

@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file roblib-search-eds-article.tpl.php
- * Search ebscohost for articles
- *
- * Variables available:
- * - $variables: all array elements of $variables can be used as a variable. e.g. $base_url equals $variables['base_url']
- *
- *
- */
-?>
-<div class ="roblib-search-more" id="roblib-search-eds-article-more"></div>
-<div class ="roblib-search-content eds-article" id="roblib-search-content-eds-articles">
-  <img src="<?php print (empty($spinner_path) ? ' ' : $spinner_path); ?>"/>
-
-</div>
-
-<div id="roblib-eds-articles-more-results" class="roblib-eds-more-button button"></div>
-<div id="roblib-eds-articles-toc" class="roblib-bento-toc moveme-please"></div>
-<?php
-/**
- * Alternate way to create link back to ebscohost.
- <form action="" id = 'roblib-search-eds-articles' method="post" style="width: 375px; overflow: auto;" onsubmit="return ebscoHostSearchGo(this);">
-  <input id="ebscohosturl" name="ebscohosturl" type="hidden" value="https://search.ebscohost.com/login.aspx?direct=true&amp;site=ehost-live&amp;scope=site&amp;type=0&amp;custid=uprince&amp;profid=eds&amp;groupid=main&amp;mode=and&amp;cli0=RV&amp;clv0=N&amp;lang=en" />
-  <input id="ebscohostsearchsrc" name="ebscohostsearchsrc" type="hidden" value="url" /> <input id="ebscohostsearchmode" name="ebscohostsearchmode" type="hidden" value="+" />
-  <input id="ebscohostkeywords" name="ebscohostkeywords" type="hidden" value="" />
-      <div><input id="ebscohostsearchtext" name="ebscohostsearchtext" value="history" type="hidden" size="23" style="font-size: 9pt; padding-left: 5px; margin-left: 0px;" /> <input type="submit" value="Search" style="font-size: 9pt; padding-left: 5px;" /></div>
-    </div>
-
-</form>
-*/
-?>
-
-