[Koha-bugs] [Bug 24143] buildQuery should disable Query* on identifier search

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24143

Magnus Enger <magnus at libriotech.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |magnus at libriotech.no
             Status|Needs Signoff               |Failed QA

--- Comment #9 from Magnus Enger <magnus at libriotech.no> ---
1. There is a conflict: 

$ git bz apply 24143

Bug 24143 - buildQuery should disable Query* on identifier search

97323 - Bug 24143: Disable QueryXXX when searching on a identifier.
109186 - Bug 24143: Disable QueryXXX when searching on an authority number

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 24143: Disable QueryXXX when searching on a identifier.
Using index info to reconstruct a base tree...
M       C4/Search.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Search.pm
CONFLICT (content): Merge conflict in C4/Search.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 24143: Disable QueryXXX when searching on a
identifier.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-24143-Disable-QueryXXX-when-searching-on-a-ide-M7wS8V.patch

2. I think I fixed the conflict, but testing showed no difference. Here is how
I tested: 

- Find a record with an ISBN
- Add the same ISBN to another record, but change the last digit
- Search for the original ISBN and get both the original record and the record
with the slightly changed ISBN as result
- Apply the patch, restart_all and reindex (should not be necessary?)
- Same result

So maybe a rebase and a test plan? :-)

-- 
You are receiving this mail because:
You are watching all bug changes.