Skip to content

Commit

Permalink
Cleaned up dangling references to Gemini. Should have been part of #39.
Browse files Browse the repository at this point in the history
  • Loading branch information
mjordan committed Jul 2, 2021
1 parent 38a2e8e commit 99055c3
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion config/install/islandora_riprap.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ riprap_local_directory: /path/to/riprap
riprap_local_settings_file: /path/to/riprap/settings.yml
execute_riprap_in_cron: 0
number_of_events: 10
gemini_rest_endpoint: http://localhost:8000/gemini
use_drupal_urls: 0
log_riprap_warnings: 1
use_sample_failed_fixity_events: 0
Expand Down
1 change: 0 additions & 1 deletion src/Controller/IslandoraRiprapMediaEventsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public function __construct() {
$this->number_of_events = $config->get('number_of_events') ?: 10;
$this->use_drupal_urls = $config->get('use_drupal_urls') ?: FALSE;
$this->show_warnings = !$config->get('show_riprap_warnings') ? $config->get('show_riprap_warnings') : TRUE;
$this->gemini_endpoint = $config->get('gemini_rest_endpoint') ?: 'http://localhost:8000/gemini';
}

/**
Expand Down
3 changes: 0 additions & 3 deletions src/Plugin/Form/IslandoraRiprapSettingsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
->set('riprap_local_settings_file', rtrim($form_state->getValue('riprap_local_settings_file'), '/'))
->set('execute_riprap_in_cron', $form_state->getValue('execute_riprap_in_cron'))
->set('number_of_events', $form_state->getValue('number_of_events'))
->set('gemini_rest_endpoint', rtrim($form_state->getValue('gemini_rest_endpoint'), '/'))
->set('use_drupal_urls', $form_state->getValue('use_drupal_urls'))
->set('log_riprap_warnings', $form_state->getValue('log_riprap_warnings'))
->set('use_sample_failed_fixity_events', $form_state->getValue('use_sample_failed_fixity_events'))
Expand Down Expand Up @@ -249,8 +248,6 @@ public function generateRiprapConfig(array $values) {
drupal_content_types: ['{$values['fixity_content_type']}']
drupal_media_tags: ['/taxonomy/term/{$values['fixity_terms']}']
use_fedora_urls: true
gemini_endpoint: '{$values['gemini_rest_endpoint']}'
gemini_auth_header: 'Bearer islandora'
# Can be a maximum of 50.
jsonapi_page_size: 50
# The number of resources to check in one Riprap run; if absent, will use
Expand Down
3 changes: 1 addition & 2 deletions src/Riprap/IslandoraRiprapUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class IslandoraRiprapUtils {
*/
public function __construct() {
$this->config = \Drupal::config('islandora_riprap.settings');
$this->gemini_endpoint = $this->config->get('gemini_rest_endpoint') ?: 'http://localhost:8000/gemini';
$this->riprap = \Drupal::service('islandora_riprap.riprap');
}

Expand Down Expand Up @@ -61,7 +60,7 @@ public function getFileUuid($mid) {
}

/**
* Get a Fedora URL for a File entity from Gemini.
* Get a Fedora URL for a File entity.
*
* @param string $mid
* The Meida entity's ID.
Expand Down

0 comments on commit 99055c3

Please sign in to comment.