http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|oleonard@myacpl.org |srdjan@catalyst.net.nz Status|NEW |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 --- Comment #1 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 46017 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46017&action=edit Bug 15434: search-xlate.inc - search criteria definition table Collected search criteria and limit labels in search-xlate.inc, so it can be used gor both making search criteria selects and displaying back selections on the result screen. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 --- Comment #3 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Right, I can see a problem with separating "phrase". Will rework. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #46017|0 |1 is obsolete| | --- Comment #5 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 46103 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46103&action=edit Bug 15434: Search criteria definition table Collected search criteria and limit labels in opac-bottom.inc, so it can be used for both making search criteria selects and displaying back selections on the result screen. *-opac-bootstrap.po translation files need to be changed: * references to opac-advanced-search.tt need to be updated to opac-bottom.inc * messages and translations need  -s removed -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 --- Comment #8 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- As far as I can see it is a bug either in * modules/svc/suggestion.tt, line 37, that composes query as q=[indexed query], or in * C4::Search::parseQuery() that cannot deal with that kind of query I think that buildQuery() actually builds an invalid query, but I'd certainly need an authoritative opinion. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Nicole C. Engard <nengard@gmail.com> --- Applying: Bug 15434: Search criteria definition table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc Failed to merge in the changes. Patch failed at 0001 Bug 15434: Search criteria definition table 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-15434-Search-criteria-definition-table-QMpnoE.patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 --- Comment #11 from Nicole C. Engard <nengard@gmail.com> --- That new patch doesn't apply either :( Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15434: Search criteria definition table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: koha-tmpl/opac-tmpl/bootstrap/js/search.js Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 15434: Search criteria definition table 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-15434-Search-criteria-definition-table-K9mxpF.patch 08:10 ~/kohaclone (bug15434-qa %|AM u=)$ -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #12 from David Cook <dcook@prosentient.com.au> --- (In reply to Srdjan Jankovic from comment #8)

As far as I can see it is a bug either in * modules/svc/suggestion.tt, line 37, that composes query as q=[indexed query], or in * C4::Search::parseQuery() that cannot deal with that kind of query

I think that buildQuery() actually builds an invalid query, but I'd certainly need an authoritative opinion.

I used to know the answer to this one but I can't remember now. That said: 1) buildQuery() is terribad 2) I think there might be some Javascript which adds the "su-br, su-na, su-rl" stuff and I recall it also being terribad. The whole of search needs an overhaul... The other thing with this patch is that it doesn't include all CCL qualifiers, so hand-made queries will still show as the codes instead of the descriptions. Of course, providing descriptive labels for all CCL qualifiers is probably outside the scope of this bug... -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 --- Comment #14 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- (In reply to Nicole C. Engard from comment #11)

That new patch doesn't apply either :(

Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15434: Search criteria definition table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: koha-tmpl/opac-tmpl/bootstrap/js/search.js Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 15434: Search criteria definition table 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-15434-Search-criteria-definition-table-K9mxpF.patch 08:10 ~/kohaclone (bug15434-qa %|AM u=)$

Not sure why. I'm getting no errors: srdjan@srdjan:~/koha/dev (bug_15434_wr251001)$ git checkout kc/master Note: checking out 'kc/master'. ... srdjan@srdjan:~/koha/dev ((e7e1da8...))$ git bz apply 15434 Bug 15434 - Make search results breadcrumbs human readable 46674 - Bug 15434: Search criteria definition table Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15434: Search criteria definition table srdjan@srdjan:~/koha/dev ((084446e...))$ Maybe your tree was not clean for some reason? Can you please check git status after checking out master, maybe there are some leftovers? That sometimes happens to me when changing branches. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.