diff --git a/.github/workflows/gitlab-mirror.yml b/.github/workflows/gitlab-mirror.yml index 1c7a88c..6254d64 100644 --- a/.github/workflows/gitlab-mirror.yml +++ b/.github/workflows/gitlab-mirror.yml @@ -9,7 +9,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Mirror + trigger CI uses: SvanBoxel/gitlab-mirror-and-ci-action@master with: diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index d159169..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/advanced_search.info.yml b/advanced_search.info.yml index 0a63895..11e8f24 100644 --- a/advanced_search.info.yml +++ b/advanced_search.info.yml @@ -9,8 +9,3 @@ dependencies: - drupal:facets - drupal:facets_summary - drupal:search_api_solr - -# Information added by Drupal.org packaging script on 2024-09-14 -version: '2.1.1' -project: 'advanced_search' -datestamp: 1726285663 diff --git a/advanced_search.libraries.yml b/advanced_search.libraries.yml index a84df19..b1f5e24 100644 --- a/advanced_search.libraries.yml +++ b/advanced_search.libraries.yml @@ -9,7 +9,6 @@ advanced.search.admin: advanced.search.form: js: js/advanced_search.form.js: {} - js/advanced_search.entityFields.js: {} css: component: css/advanced_search.form.css: {} diff --git a/composer.json b/composer.json index 0feb3db..7ce28aa 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "islandora/advanced_search", + "name": "drupal/advanced_search", "type": "drupal-module", "description": "This module creates several blocks to support searching. It also enables the use of Ajax with search blocks, facets, and search results.", "keywords": [ @@ -13,6 +13,9 @@ "source": "https://github.com/digitalutsc/advanced_search/tree/islandora_lite" }, "minimum-stability": "dev", + "replace": { + "islandora/advanced_search": "self.version" + }, "repositories": { "drupal": { "type": "composer", diff --git a/conjuction_parantheses_correction.patch b/conjuction_parantheses_correction.patch deleted file mode 100644 index aa0957c..0000000 --- a/conjuction_parantheses_correction.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/AdvancedSearchQuery.php b/src/AdvancedSearchQuery.php -index af40fb7..b8c6eb7 100644 ---- a/src/AdvancedSearchQuery.php -+++ b/src/AdvancedSearchQuery.php -@@ -143,6 +143,7 @@ class AdvancedSearchQuery { - public function alterQuery(Request $request, SolariumQueryInterface &$solarium_query, DrupalQueryInterface $search_api_query) { - // Only apply if a Advanced Search Query was made. - $terms = $this->getTerms($request); -+ - if (!empty($terms)) { - $index = $search_api_query->getIndex(); - /** @var \Drupal\search_api_solr\Plugin\search_api\backend\SearchApiSolrBackend $backend */ -@@ -163,11 +164,10 @@ class AdvancedSearchQuery { - - if (!$isDismax) { - // To support negative queries we must first bring in all documents. -- $q[] = $this->negativeQuery($terms) ? "*:*" : ""; -+ $q = $this->negativeQuery($terms) ? "*:*" : ""; - } -- - $term = array_shift($terms); -- $q[] = $term->toSolrQuery($field_mapping); -+ $q = '(' . trim($term->toSolrQuery($field_mapping)); - - // New. - $fields_list[] = $term->toSolrFields($field_mapping); -@@ -180,8 +180,8 @@ class AdvancedSearchQuery { - - // For multiple conditions. - foreach ($terms as $term) { -- $q[] = $term->getConjunction(); -- $q[] = $term->toSolrQuery($field_mapping); -+ $q .= ')' . $term->getConjunction() . '('; -+ $q .= trim($term->toSolrQuery($field_mapping)); - - // New. - $fields_list[] = $term->toSolrFields($field_mapping); -@@ -193,8 +193,8 @@ class AdvancedSearchQuery { - } - - } -- $q = implode(' ', $q); - -+ $q .= ')'; - // Limit extra processing if Luncene Search is enable. - if ($isDismax) { - -@@ -257,7 +257,7 @@ class AdvancedSearchQuery { - foreach ($index->getFields() as $field_id => $field) { - $boostedFields[$field_id] = $field->getBoost(); - } -- -+ - $str_fields_with_boost = ""; - // Adding a boost number for each field) - foreach($query_fields as $solr_field) { -@@ -291,11 +291,9 @@ class AdvancedSearchQuery { - // make this field non-empty. - //$search_api_query->keys("advanced search"); - } -- - $solarium_query->setQuery($q); - } - } -- - /** - * Alters the given view to be recursive if applicable. - * diff --git a/css/advanced_search.form.css b/css/advanced_search.form.css index 43436d9..b9bc5ef 100644 --- a/css/advanced_search.form.css +++ b/css/advanced_search.form.css @@ -41,5 +41,5 @@ input.islandora-advanced-search-form__search { } [id^="edit-terms"] { - display: initial; + display: initial !important; } diff --git a/js/advanced_search.entityFields copy.js b/js/advanced_search.entityFields copy.js deleted file mode 100644 index d881dcb..0000000 --- a/js/advanced_search.entityFields copy.js +++ /dev/null @@ -1,189 +0,0 @@ -(function ($, Drupal, drupalSettings) { - - function toDropdown(field, i) { - let searchValueSelectId = 'edit-terms-' + i + '-value'; - let SearchValueFieldselector = "[id^='" + searchValueSelectId + "']"; - let $searchValueInputField = $(SearchValueFieldselector); - $searchValueInputField.hide(); - let $oldHelperField = $('#edit-terms-' + i + '-helper'); - $oldHelperField.remove(); - $searchValueInputField.after(''); - let $newHelperField = $('#edit-terms-' + i + '-helper'); - if (['agg__arch__transaktion', 'agg__all__transaktion'].includes(field)) { // Transaktion - $newHelperField.empty(); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - } else if (['agg__all__objektkategorie', 'agg__arch__objektkategorie', 'agg__obj__objektkategorie'].includes(field)) { // Objektkategorie - $newHelperField.empty(); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - } - $newHelperField.change(function () { - let selectedOption = $newHelperField.find('option:selected'); - $searchValueInputField.val(selectedOption.val()).text(selectedOption.text()); - }); - } - - Drupal.behaviors.advanceSearchEntityFields = { - attach: function attach(context, settings) { - let $searchSelectElement = $('[id^="edit-terms-0-search"]'); - let originalSearchSelectOptions = $searchSelectElement.find('option').clone(); - $searchSelectElement.empty(); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $searchSelectElement.append(''); - $(document).on('change', '.advanced-search-form--entity', function () { - let id = $(this).attr('id'); - let i = id.substring(11, 12); - let $select = $('#' + id); - let searchSelectId = 'edit-terms-' + i + '-search'; - let selector = "[id^='" + searchSelectId + "']"; - let $searchSelect = $(selector); - if ($select.val() === 'akteur') { // Akteur - $searchSelect.empty(); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - } - else if ($select.val() === 'b48556e79962e0a3c8d0041317c853b9') { // Archivalie - $searchSelect.empty(); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - } - else if ($select.val() === 'ba419826c9014f40126565bf413f7a59') { // Auktion - $searchSelect.empty(); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - } else if ($select.val() === 'b65c3a85d16724d84a5eb0d2268629a6') { // Objekt - $searchSelect.empty(); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - } else if ($select.val() === 'ueberall') { - $searchSelect.empty(); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - $searchSelect.append(''); - - } - }); - let urlParams = new URLSearchParams(window.location.search); - let params = {}; - let p = {}; - for (const param of urlParams) { - let key = param[0].split('['); - let value = param[1]; - let obj = p; - for (let i = 0; i < key.length - 1; i++) { - let k = key[i].replace(']', ''); - if (!obj.hasOwnProperty(k)) { - obj[k] = {}; - } - obj = obj[k]; - } - let lastKey = key[key.length - 1].replace(']', ''); - obj[lastKey] = value; - } - params = p; - $(document).on('change', '.advanced-search-form--select-field', function () { - let id = $(this).attr('id'); - let i = id.substring(11, 12); - let field = $(this).val(); - if (['agg__arch__transaktion', 'agg__all__transaktion', 'agg__all__objektkategorie', 'agg__arch__objektkategorie', 'agg__obj__objektkategorie'].includes(field)) { - let dropdown = toDropdown(field, i); - } else { - let searchValueSelectId = 'edit-terms-' + i + '-value'; - let SearchValueFieldselector = "[id^='" + searchValueSelectId + "']"; - let $searchValueInputField = $(SearchValueFieldselector); - $searchValueInputField.show(); - let $oldHelperField = $('#edit-terms-' + i + '-helper'); - $oldHelperField.remove(); - } - }); - } - }; - -})(jQuery, Drupal, drupalSettings); diff --git a/js/advanced_search.entityFields.js b/js/advanced_search.entityFields.js deleted file mode 100644 index 695a146..0000000 --- a/js/advanced_search.entityFields.js +++ /dev/null @@ -1,86 +0,0 @@ -(function ($, Drupal, drupalSettings) { - - function toDropdown(field, i) { - let searchValueSelectId = 'edit-terms-' + i + '-value'; - let SearchValueFieldselector = "[id^='" + searchValueSelectId + "']"; - let $searchValueInputField = $(SearchValueFieldselector); - $searchValueInputField.hide(); - let $oldHelperField = $('#edit-terms-' + i + '-helper'); - $oldHelperField.remove(); - $searchValueInputField.after(''); - let $newHelperField = $('#edit-terms-' + i + '-helper'); - if (['agg__arch__transaktion', 'agg__all__transaktion'].includes(field)) { // Transaktion - $newHelperField.empty(); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - } else if (['agg__all__objektkategorie', 'agg__arch__objektkategorie', 'agg__obj__objektkategorie'].includes(field)) { // Objektkategorie - $newHelperField.empty(); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - $newHelperField.append(''); - } - $newHelperField.change(function () { - let selectedOption = $newHelperField.find('option:selected'); - $searchValueInputField.val(selectedOption.val()).text(selectedOption.text()); - }); - } - - Drupal.behaviors.advanceSearchEntityFields = { - attach: function attach(context, settings) { - $(document).on('change', '.advanced-search-form--select-field', function () { - let id = $(this).attr('id'); - let i = id.substring(11, 12); - let field = $(this).val(); - if (['agg__arch__transaktion', 'agg__all__transaktion', 'agg__all__objektkategorie', 'agg__arch__objektkategorie', 'agg__obj__objektkategorie'].includes(field)) { - let dropdown = toDropdown(field, i); - } else { - let searchValueSelectId = 'edit-terms-' + i + '-value'; - let SearchValueFieldselector = "[id^='" + searchValueSelectId + "']"; - let $searchValueInputField = $(SearchValueFieldselector); - $searchValueInputField.show(); - let $oldHelperField = $('#edit-terms-' + i + '-helper'); - $oldHelperField.remove(); - } - }); - } - }; - -})(jQuery, Drupal, drupalSettings); diff --git a/js/advanced_search.form.js b/js/advanced_search.form.js index c0fc4f3..15998c6 100644 --- a/js/advanced_search.form.js +++ b/js/advanced_search.form.js @@ -137,7 +137,7 @@ $form.submit(function (e) { e.preventDefault(); e.stopPropagation(); - let inputs = $form.serializeArray(); + const inputs = $form.serializeArray(); const href = url(inputs, settings.advanced_search_form); /* digitalutsc added*/ @@ -168,10 +168,9 @@ $( this ).attr("href", new_link); } }); + window.history.pushState(null, document.title, href); - }); - } // Reset should trigger refresh of AJAX Blocks / Views. $form.find('input[data-drupal-selector = "edit-reset"]').mousedown(function (e) { @@ -182,19 +181,18 @@ /* reset the url after reset button clicked */ window.location.replace(href.split('?')[0]); }); - + // Handle the page summary $("#ajax-page-summary").hide(); $( document ).ajaxComplete(function( event, request, settings ) { - //$("#ajax-page-summary").hide(); - if (jQuery("#ajax-page-summary").length >0) { + + $("#ajax-page-summary").hide(); + if (jQuery("#ajax-page-summary").length >0) { $(".pager__summary").html($("#ajax-page-summary").html()); } else { $(".pager__summary").html(""); } - $('.boehler-js-disabled').removeClass('boehler-js-disabled'); - }); } } diff --git a/js/facets/facets-views-ajax.js b/js/facets/facets-views-ajax.js index 033219b..04fb0c0 100644 --- a/js/facets/facets-views-ajax.js +++ b/js/facets/facets-views-ajax.js @@ -28,6 +28,7 @@ temp = queries[i].split('='); params[temp[0]] = temp[1]; } + return params; }; @@ -53,15 +54,15 @@ }); } - // Update items_per_page links in pager - if (url.indexOf("items_per_page=") == -1) { + // Update items_per_page links in pager + if (url.indexOf("items_per_page=") == -1) { // append items_per_page $("a.pager__itemsperpage").each(function( index ) { var newUrl = url + "&items_per_page=" + $(this).html(); $(this).attr("href", newUrl); }); - } - else { + } + else { // replace existed items_per_page var params = parseQueryString(url.split("?")[1]); var newParams = []; @@ -75,7 +76,7 @@ } // check for items_per_page query - if (!key.startsWith("items_per_page")) { + if (!key.startsWith("items_per_page")) { newParams.push(key + "=" + params[key]); } } @@ -87,15 +88,15 @@ - // Update display mode links in pager - if (url.indexOf("display=") == -1) { + // Update display mode links in pager + if (url.indexOf("display=") == -1) { // append items_per_page $("a.pager__display").each(function( index ) { var newUrl = url + "&display=" + $(this).find(".display-mode").html().toLowerCase(); $(this).attr("href", newUrl); }); - } - else { + } + else { // replace existed display var params = parseQueryString(url.split("?")[1]); var newParams = []; @@ -109,7 +110,7 @@ } // check for display query - if (!key.startsWith("display")) { + if (!key.startsWith("display")) { newParams.push(key + "=" + params[key]); } } @@ -122,7 +123,7 @@ } - + // Replace filter, pager, summary, and facet blocks. var blocks = {}; $( @@ -190,7 +191,6 @@ var params = Drupal.Views.parseQueryString(href); // Remove the page if set as submitting the form should always take // the user to the first page (facets do the same). - console.log("params", params); delete params.page; // Include values from the form in the URL. $.each(exposed_form.serializeArray(), function () { diff --git a/src/AdvancedSearchQuery.php b/src/AdvancedSearchQuery.php index b8c6eb7..af40fb7 100644 --- a/src/AdvancedSearchQuery.php +++ b/src/AdvancedSearchQuery.php @@ -143,7 +143,6 @@ class AdvancedSearchQuery { public function alterQuery(Request $request, SolariumQueryInterface &$solarium_query, DrupalQueryInterface $search_api_query) { // Only apply if a Advanced Search Query was made. $terms = $this->getTerms($request); - if (!empty($terms)) { $index = $search_api_query->getIndex(); /** @var \Drupal\search_api_solr\Plugin\search_api\backend\SearchApiSolrBackend $backend */ @@ -164,10 +163,11 @@ class AdvancedSearchQuery { if (!$isDismax) { // To support negative queries we must first bring in all documents. - $q = $this->negativeQuery($terms) ? "*:*" : ""; + $q[] = $this->negativeQuery($terms) ? "*:*" : ""; } + $term = array_shift($terms); - $q = '(' . trim($term->toSolrQuery($field_mapping)); + $q[] = $term->toSolrQuery($field_mapping); // New. $fields_list[] = $term->toSolrFields($field_mapping); @@ -180,8 +180,8 @@ class AdvancedSearchQuery { // For multiple conditions. foreach ($terms as $term) { - $q .= ')' . $term->getConjunction() . '('; - $q .= trim($term->toSolrQuery($field_mapping)); + $q[] = $term->getConjunction(); + $q[] = $term->toSolrQuery($field_mapping); // New. $fields_list[] = $term->toSolrFields($field_mapping); @@ -193,8 +193,8 @@ class AdvancedSearchQuery { } } + $q = implode(' ', $q); - $q .= ')'; // Limit extra processing if Luncene Search is enable. if ($isDismax) { @@ -257,7 +257,7 @@ class AdvancedSearchQuery { foreach ($index->getFields() as $field_id => $field) { $boostedFields[$field_id] = $field->getBoost(); } - + $str_fields_with_boost = ""; // Adding a boost number for each field) foreach($query_fields as $solr_field) { @@ -291,9 +291,11 @@ class AdvancedSearchQuery { // make this field non-empty. //$search_api_query->keys("advanced search"); } + $solarium_query->setQuery($q); } } + /** * Alters the given view to be recursive if applicable. * diff --git a/src/AdvancedSearchQueryTerm.php b/src/AdvancedSearchQueryTerm.php index 103f4f4..586fa5b 100644 --- a/src/AdvancedSearchQueryTerm.php +++ b/src/AdvancedSearchQueryTerm.php @@ -19,7 +19,6 @@ class AdvancedSearchQueryTerm { // Used for serializing / deserializing query parameters. // These are also hard-coded in advanced_search.form.js. - const ENTITY_QUERY_PARAMETER = 'e'; const CONJUNCTION_QUERY_PARAMETER = 'c'; const FIELD_QUERY_PARAMETER = 'f'; const INCLUDE_QUERY_PARAMETER = 'i'; @@ -285,7 +284,7 @@ class AdvancedSearchQueryTerm { public function toSolrQuery(array $solr_field_mapping) { $terms = []; $query_helper = \Drupal::service('solarium.query_helper'); - $value = $query_helper->escapePhrase($this->value); + $value = $query_helper->escapePhrase(trim($this->value)); $config = \Drupal::config(SettingsForm::CONFIG_NAME); $isDismax = $config->get(SettingsForm::EDISMAX_SEARCH_FLAG); @@ -337,16 +336,16 @@ class AdvancedSearchQueryTerm { // If field fulltext title is selected. if (strpos($field, "fulltext_title") !== FALSE) { $isTitleSearch = TRUE; - if (strpos(trim($value), "AND") !== FALSE) { + if (strpos(trim($value), " AND ") !== FALSE) { // Handle keyword with 'Orientation AND games'. $keyword = str_replace('"', '', $value); - $keys = explode("AND", $keyword); + $keys = explode(" AND ", $keyword); $str = "("; $i = 0; foreach ($keys as $key) { if ($i != count($keys) - 1) { - $str .= $field . ':"' . $key . '"AND'; + $str .= $field . ':"' . $key . '" AND '; } else { $str .= $field . ':"' . $key . '")'; diff --git a/src/Form/AdvancedSearchForm.php b/src/Form/AdvancedSearchForm.php index 81d6ff8..1dc20c0 100644 --- a/src/Form/AdvancedSearchForm.php +++ b/src/Form/AdvancedSearchForm.php @@ -37,7 +37,6 @@ class AdvancedSearchForm extends FormBase { const OR_OP = 'OR'; // These are also hard-coded in advanced_search.form.js. - const ENTITY_FORM_FIELD = 'entity'; const CONJUNCTION_FORM_FIELD = 'conjunction'; const SEARCH_FORM_FIELD = 'search'; const INCLUDE_FORM_FIELD = 'include'; @@ -45,71 +44,6 @@ class AdvancedSearchForm extends FormBase { const AJAX_WRAPPER = 'advanced-search-ajax'; - const ACTOR_OPTIONS = [ - "agg__akt__anmerkung" => "Anmerkung", - "f20673c10d8d786816de3c4338d1c3ac" =>" Art der Institution", - "fb7ca3fb25fe824b40d6923e212ee7c4" => "Beruf/ Tätigkeit", - "agg__akt__name" => "Name" - ]; - - const PROPERTY_CARD_OPTIONS = [ - 'agg__arch__akteur' => 'Akteur', - 'agg_arch__anmerkung' => 'Anmerkung', - 'agg__arch__auktionstitel' => 'Auktionstitel', - 'f807d62b374606e52e8833118375ecb0' => 'Karteikarten-ID', - 'agg__arch__kue_herst' => 'Künster:in/ Hersteller:in', - 'agg__arch__objektkategorie' => 'Objektkategorie', - 'agg__arch__ort_reg' => 'Ort/ Region', - ]; - const AUCTION_OPTIONS = [ - 'agg__aukt__akt' => 'Akteur', - 'f11ead3fa212224b6e82ce5622c1d99c' => 'Anmerkung', - 'ff8fb361d19f1fb4030605f87cb995ff' => 'Auktionshaus', - 'f4394d15487b58f49c719cf850f57e3a' => 'Auktionskatalog', - 'f6230cbdc56e0f04a90424b248680c76' => 'Titel der Auktion', - ]; - - const OBJECT_OPTIONS = [ - 'agg__obj__anmerkung' => 'Anmerkung', - 'agg__obj__akt' => 'Akteur', - 'agg__obj__auktionshaus' => 'Auktionshaus', - 'agg__obj__auktionstitel' => 'Auktionstitel', - 'agg__obj__kue_herst' => 'Künstler:in/ Hersteller:in', - 'agg__obj__lotnummer' => 'Lotnummer', - 'fe03f1bcb9bf84f6fa8bf265090313c5' => 'Objekt-ID', - 'agg__obj__titel' => 'Objekttitel', - 'agg__obj__objektkategorie' => 'Objektkategorie', - 'agg__obj__ort_regi' => 'Ort/Region', - ]; - const ALL_OPTIONS = [ - 'all' => 'Keyword', - 'agg__all__akt' => 'Akteur', - 'agg__all__anmerkung' => 'Anmerkung', - 'f20673c10d8d786816de3c4338d1c3ac' => 'Art der Institution', - 'agg__all__auktionshaus' => 'Auktionshaus', - 'f4394d15487b58f49c719cf850f57e3a' => 'Auktionskatalog', - 'agg__all_auktionstitel' => 'Auktionstitel', - 'fb7ca3fb25fe824b40d6923e212ee7c4' => 'Beruf/ Tätigkeit', - 'fd4b844b736f2215421ead5b2fc0f5ef' => 'Fotonummer', - 'f807d62b374606e52e8833118375ecb0' => 'Karteikarten-ID', - 'agg__all__kue_herst' => 'Künstler:in/ Hersteller:in', - 'agg__obj__lotnummer' => 'Lotnummer', - 'fe03f1bcb9bf84f6fa8bf265090313c5' => 'Objekt-ID', - 'agg__all__objektkategorie' => 'Objektkategorie', - 'agg__all__objekttitel' => 'Objekttitel', - 'agg__all__ort_regi' => 'Ort/Region', - 'agg__all__transaktion' => 'Transaktion', - ]; - - // Define your options. - const ENTITY_OPTIONS = [ - 'ueberall' => self::ALL_OPTIONS, - 'akteur' => self::ACTOR_OPTIONS, - 'b48556e79962e0a3c8d0041317c853b9' => self::PROPERTY_CARD_OPTIONS, - 'ba419826c9014f40126565bf413f7a59' => self::AUCTION_OPTIONS, - 'b65c3a85d16724d84a5eb0d2268629a6' => self::OBJECT_OPTIONS, - ]; - /** * The current request. * @@ -238,7 +172,6 @@ class AdvancedSearchForm extends FormBase { */ protected function defaultTermValues(array $options) { return [ - self::ENTITY_FORM_FIELD => 'ueberall', self::CONJUNCTION_FORM_FIELD => self::AND_OP, // First item in list is default. self::SEARCH_FORM_FIELD => key($options), @@ -315,30 +248,6 @@ class AdvancedSearchForm extends FormBase { return NULL; } - protected function setSearchValue(&$term_value) { - switch ($term_value['entity']) { - case 'ueberall': - $term_value['search'] = 'all'; - break; - case 'akteur': - $term_value['search'] = 'agg__akt__name'; - break; - case 'b48556e79962e0a3c8d0041317c853b9': - $term_value['search'] = 'agg__arch__akteur'; - break; - case 'ba419826c9014f40126565bf413f7a59': - $term_value['search'] = 'f6230cbdc56e0f04a90424b248680c76'; - break; - case 'b65c3a85d16724d84a5eb0d2268629a6': - $term_value['search'] = 'agg__obj__titel'; - break; - default: - $term_value['search'] = 'all'; - } - - - } - /** * {@inheritdoc} */ @@ -357,7 +266,6 @@ class AdvancedSearchForm extends FormBase { 'query_parameter' => AdvancedSearchQuery::getQueryParameter(), 'recurse_parameter' => AdvancedSearchQuery::getRecurseParameter(), 'mapping' => [ - self::ENTITY_FORM_FIELD => AdvancedSearchQueryTerm::ENTITY_QUERY_PARAMETER, self::CONJUNCTION_FORM_FIELD => AdvancedSearchQueryTerm::CONJUNCTION_QUERY_PARAMETER, self::SEARCH_FORM_FIELD => AdvancedSearchQueryTerm::FIELD_QUERY_PARAMETER, self::INCLUDE_FORM_FIELD => AdvancedSearchQueryTerm::INCLUDE_QUERY_PARAMETER, @@ -376,56 +284,28 @@ class AdvancedSearchForm extends FormBase { // Either specified by the user in the request or use the default. $first = $i == 0; $term_value = !empty($term_values) ? array_shift($term_values) : $term_default_values; - $this->setSearchValue($term_value); $conjunction = $term_value[self::CONJUNCTION_FORM_FIELD] ?? $term_default_values[self::CONJUNCTION_FORM_FIELD]; - $entity = $term_value[self::ENTITY_FORM_FIELD] ?? $term_default_values[self::ENTITY_FORM_FIELD]; - $search_field_options = isset(self::ENTITY_OPTIONS[$entity]) ? self::ENTITY_OPTIONS[$entity] : self::ENTITY_OPTIONS['ueberall']; $term_elements[] = [ // Only show on terms after the first. self::CONJUNCTION_FORM_FIELD => $first ? NULL : [ '#type' => 'select', '#attributes' => [ 'aria-label' => $this->t("Select search condition"), - 'class' => [$block_class_prefix . '--conjunction'], ], '#options' => [ self::AND_OP => $this->t('and'), - #self::OR_OP => $this->t('or'), + self::OR_OP => $this->t('or'), ], '#default_value' => $conjunction, '#theme_wrappers' => [], ], - self::ENTITY_FORM_FIELD => [ - '#type' => 'select', - '#attributes' => [ - 'aria-label' => $this->t("Select Entity"), - 'class' => [$block_class_prefix . '--entity'], - ], - '#options' => [ - 'ueberall' => $this->t('Überall'), - 'akteur' => $this->t('Akteur'), - 'b48556e79962e0a3c8d0041317c853b9' => $this->t('Archivalie'), - 'ba419826c9014f40126565bf413f7a59' => $this->t('Auktion'), - 'b65c3a85d16724d84a5eb0d2268629a6' => $this->t('Objekt'), - ], - '#default_value' => $entity, - '#ajax' => [ - 'callback' => [$this, 'ajaxCallback'], - 'wrapper' => self::AJAX_WRAPPER, - 'progress' => [ - 'type' => 'throbber', - ], - ], - ], - self::SEARCH_FORM_FIELD => [ '#type' => 'select', '#attributes' => [ 'aria-label' => $this->t("Select search field"), - 'class' => [$block_class_prefix . '--select-field'], ], - '#options' => $search_field_options, - '#default_value' => $term_value['search'], + '#options' => $options, + '#default_value' => $term_value[self::SEARCH_FORM_FIELD], '#theme_wrappers' => [], ], self::INCLUDE_FORM_FIELD => [ @@ -434,8 +314,8 @@ class AdvancedSearchForm extends FormBase { 'aria-label' => $this->t("Select search operator"), ], '#options' => [ - self::IS_OP => $this->t('contains'), - #self::NOT_OP => $this->t('contains not'), + self::IS_OP => $this->t('is'), + self::NOT_OP => $this->t('is not'), ], '#default_value' => $term_value[self::INCLUDE_FORM_FIELD], // Show only when conjunction is 'AND' as 'OR NOT' is not supported @@ -570,32 +450,7 @@ class AdvancedSearchForm extends FormBase { * Callback for adding / removing terms from the search. */ public function ajaxCallback(array &$form, FormStateInterface $form_state) { - // Get the triggering element. - $trigger = $form_state->getTriggeringElement(); - // Determine the term index from the triggering element's name. - if (preg_match('/terms\[(\d+)\]\[entity\]/', $trigger['#name'], $matches)) { - $term_index = $matches[1]; - // Reset the SEARCH_FORM_FIELD based on the new ENTITY_FORM_FIELD. - $options = $form['ajax']['terms'][$term_index][self::SEARCH_FORM_FIELD]['#options']; - $default_search_value = key($options); - $form_state->setValue(['ajax','terms', $term_index, self::SEARCH_FORM_FIELD], $default_search_value); - } - - $form_state->clearErrors(); - - return $form['ajax']; - } - - /** - * {@inheritdoc} - */ - public function validateForm(array &$form, FormStateInterface $form_state) { - // Only validate if the search button is pressed. - $trigger = $form_state->getTriggeringElement(); - if ($trigger['#value'] !== $this->t('Search')) { - $form_state->clearErrors(); - return; - } + return $form['ajax']; } /** diff --git a/src/Plugin/Block/SearchResultsPagerBlock.php b/src/Plugin/Block/SearchResultsPagerBlock.php index 2dfa931..687822d 100644 --- a/src/Plugin/Block/SearchResultsPagerBlock.php +++ b/src/Plugin/Block/SearchResultsPagerBlock.php @@ -221,12 +221,14 @@ class SearchResultsPagerBlock extends BlockBase implements ContainerFactoryPlugi if ($config->get(SettingsForm::DISPLAY_LIST_FLAG) == 1) { $display_options['list'] = [ + 'icon' => 'fa-list', 'title' => $this->t('List'), ]; } if ($config->get(SettingsForm::DISPLAY_GRID_FLAG) == 1) { $display_options['grid'] = [ + 'icon' => 'fa-th', 'title' => $this->t('Grid'), ]; } @@ -238,7 +240,7 @@ class SearchResultsPagerBlock extends BlockBase implements ContainerFactoryPlugi 'query' => array_merge($query_parameters, ['display' => $display]), 'absolute' => TRUE, ]); - $text = "{$options['title']}"; + $text = "{$options['title']}"; $active = $active_display == $display; $items[] = [ '#type' => 'link',