Attachment 78771 Details for Bug 10662 – Bug 10662: Incorrect conditions cause incorrect messages and missing links

[patch] Bug 10662: Incorrect conditions cause incorrect messages and missing links

Bug-10662-Incorrect-conditions-cause-incorrect-mes.patch (text/plain), 3.62 KB, created by Ed Veal on 2018-09-14 22:23:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Veal

Created: 2018-09-14 22:23:56 UTC

Size: 3.62 KB

patch

obsolete

>From 6df08a0418d9c515a8745be84f313c05145482f8 Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Wed, 12 Sep 2018 19:00:52 +0000
>Subject: [PATCH] Bug 10662: Incorrect conditions cause incorrect messages and
> missing links
>
>Signed-off-by: Ed Veal <eveal@mckinneytexas.org>
>---
> C4/Context.pm                                                       | 2 +-
> Koha/OAI/Harvester/Import/Record.pm                                 | 3 ++-
> .../prog/en/modules/tools/oai-pmh-harvester/dashboard.tt            | 6 +++---
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Context.pm b/C4/Context.pm
>index 35231d7..0376cd0 100644
>--- a/C4/Context.pm
>+++ b/C4/Context.pm
>@@ -777,7 +777,7 @@ sub triplestore {
>     my $triplestore = ( $context->{triplestore} && $context->{triplestore}->{$name} ) ? $context->{triplestore}->{$name} : undef;
>     if ( ! $triplestore ){
>         my $config_file = $context->config('triplestore_config');
>-        if ( -f $config_file ){
>+        if ( $config_file && -f $config_file ){
>             my $config = YAML::LoadFile($config_file);
>             if ($config && $name){
>                 my $new_triplestore = $self->_new_triplestore($config,$name);
>diff --git a/Koha/OAI/Harvester/Import/Record.pm b/Koha/OAI/Harvester/Import/Record.pm
>index 6f2b545..f0ad3d5 100755
>--- a/Koha/OAI/Harvester/Import/Record.pm
>+++ b/Koha/OAI/Harvester/Import/Record.pm
>@@ -319,7 +319,8 @@ sub import_record {
>                 rdf_type => $rdf_type, #NOTE: RDF
>             });
> 
>-            if ($import_record->isa('Koha::Import::MARCXML')){
>+            #FIXME: This is too hard-coded...
>+            if ($import_record->isa('Koha::OAI::Harvester::Import::MARCXML')){
>                 if ($linked_id){
>                     #Link Koha record ID to OAI-PMH details for this record type,
>                     #if linkage doesn't already exist.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/dashboard.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/dashboard.tt
>index 5e4e3c4..3f6d174 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/dashboard.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/dashboard.tt
>@@ -141,7 +141,7 @@
>                             </li>
>                         </ul>
>                         <div id="submitted_requests">
>-                            [% IF ( result.start.defined ) %]
>+                            [% IF ( result.defined("start") ) %]
>                                 <div class="alert">
>                                     [% IF ( result.start ) %]
>                                         <span>Start succeeded</span>
>@@ -149,7 +149,7 @@
>                                         <span>Start failed</span>
>                                     [% END %]
>                                 </div>
>-                            [% ELSIF ( result.stop.defined ) %]
>+                            [% ELSIF ( result.defined("stop") ) %]
>                                  <div class="alert">
>                                     [% IF ( result.stop ) %]
>                                         <span>Stop succeeded</span>
>@@ -157,7 +157,7 @@
>                                         <span>Stop failed</span>
>                                     [% END %]
>                                 </div>
>-                            [% ELSIF ( result.delete.defined ) %]
>+                            [% ELSIF ( result.defined("delete") ) %]
>                                  <div class="alert">
>                                     [% IF ( result.delete ) %]
>                                         <span>Delete succeeded</span>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 10662: 20757 | 20758 | 21954 | 42446 | 42447 | 42448 | 44792 | 44793 | 47675 | 48096 | 49832 | 50254 | 50980 | 51510 | 51511 | 51512 | 51514 | 51562 | 51563 | 51564 | 51565 | 51705 | 53258 | 53259 | 53260 | 53361 | 53362 | 64444 | 64445 | 64446 | 64479 | 64480 | 64481 | 65016 | 65017 | 65018 | 65019 | 68508 | 71008 | 71009 | 71010 | 71011 | 71012 | 71013 | 71014 | 71015 | 78569 | 78570 | 78571 | 78572 | 78573 | 78574 | 78575 | 78576 | 78577 | 78583 | 78601 | 78617 | 78754 | 78756 | 78758 | 78760 | 78762 | 78764 | 78767 | 78769 | 78771 | 78859 | 78860 | 78914 | 78956 | 79039 | 79045 | 81783 | 81784 | 81786 | 81789 | 81790 | 81855 | 81856 | 81861 | 81862 | 81863 | 81864 | 81902 | 82219 | 84318 | 84319 | 84320 | 84321 | 84322 | 85152 | 85224 | 85225 | 85226 | 85227 | 85228 | 85229 | 99739 | 99740 | 99741 | 99742 | 99743 | 99744 | 99745