From 3cd40ef875936454738da571241f1ca9079e2de7 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Thu, 1 Oct 2015 16:56:16 -0300 Subject: [PATCH 1/2] Introduce new flag to force use of iTQL queries, when applicable. --- includes/admin.form.inc | 6 ++++++ islandora.install | 1 + 2 files changed, 7 insertions(+) diff --git a/includes/admin.form.inc b/includes/admin.form.inc index 5db13f73..a60e3ae0 100644 --- a/includes/admin.form.inc +++ b/includes/admin.form.inc @@ -80,6 +80,12 @@ function islandora_repository_admin(array $form, array &$form_state) { '#description' => t('Larger sites may experience a notable performance improvement when disabled due to how breadcrumbs are constructed.'), '#default_value' => variable_get('islandora_render_drupal_breadcrumbs', TRUE), ), + 'islandora_risearch_use_itql_for_walking' => array( + '#type' => 'checkbox', + '#title' => t('Use iTQL For Transitive Queries'), + '#description' => t('Sparql is the preferred language for querying the resource index; however, the implementation of Sparql in Mulgara may not completely support transitive queries. On by default to maintain legacy behaviour.'), + '#default_value' => variable_get('islandora_risearch_use_itql_for_walking', TRUE), + ), ), 'islandora_namespace' => array( '#type' => 'fieldset', diff --git a/islandora.install b/islandora.install index a2151767..f7181407 100644 --- a/islandora.install +++ b/islandora.install @@ -54,6 +54,7 @@ function islandora_uninstall() { 'islandora_render_drupal_breadcrumbs', 'islandora_namespace_restriction_enforced', 'islandora_pids_allowed', + 'islandora_risearch_use_itql_for_walking', ); array_walk($variables, 'variable_del'); } From 5a998a8b76d0832762cf072175ad2769ad43bb5b Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Tue, 6 Oct 2015 11:22:44 -0300 Subject: [PATCH 2/2] Change variable name and related documentation. --- includes/admin.form.inc | 8 ++++---- islandora.install | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/admin.form.inc b/includes/admin.form.inc index a60e3ae0..9f64cb6d 100644 --- a/includes/admin.form.inc +++ b/includes/admin.form.inc @@ -80,11 +80,11 @@ function islandora_repository_admin(array $form, array &$form_state) { '#description' => t('Larger sites may experience a notable performance improvement when disabled due to how breadcrumbs are constructed.'), '#default_value' => variable_get('islandora_render_drupal_breadcrumbs', TRUE), ), - 'islandora_risearch_use_itql_for_walking' => array( + 'islandora_risearch_use_itql_when_necessary' => array( '#type' => 'checkbox', - '#title' => t('Use iTQL For Transitive Queries'), - '#description' => t('Sparql is the preferred language for querying the resource index; however, the implementation of Sparql in Mulgara may not completely support transitive queries. On by default to maintain legacy behaviour.'), - '#default_value' => variable_get('islandora_risearch_use_itql_for_walking', TRUE), + '#title' => t('Use iTQL for particular queries'), + '#description' => t('Sparql is the preferred language for querying the resource index; however, some features in the implementation of Sparql in Mulgara may not work properly. If you are using the default triple store with Fedora this should be left on to maintain legacy behaviour.'), + '#default_value' => variable_get('islandora_risearch_use_itql_when_necessary', TRUE), ), ), 'islandora_namespace' => array( diff --git a/islandora.install b/islandora.install index f7181407..075e81a2 100644 --- a/islandora.install +++ b/islandora.install @@ -54,7 +54,7 @@ function islandora_uninstall() { 'islandora_render_drupal_breadcrumbs', 'islandora_namespace_restriction_enforced', 'islandora_pids_allowed', - 'islandora_risearch_use_itql_for_walking', + 'islandora_risearch_use_itql_when_necessary', ); array_walk($variables, 'variable_del'); }