From: Ian Walls To: koha-patches@lists.koha-community.org Date: Tue, 1 Mar 2011 17:01:01 -0500 Message-Id: <1299016861-17608-1-git-send-email-ian.walls@bywatersolutions.com> X-Mailer: git-send-email 1.5.6.5 Cc: =?utf-8?q?St=C3=A9phane=20Delaune?= Subject: [Koha-patches] [PATCH] [SIGNED OFF] Bug 5595: (MT #5757)adding additional attributes support on patrons's search X-BeenThere: koha-patches@lists.koha-community.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches submitted to Koha List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: koha-patches-bounces@lists.koha-community.org Errors-To: koha-patches-bounces@lists.koha-community.org RnJvbTogU3TDqXBoYW5lIERlbGF1bmUgPHN0ZXBoYW5lLmRlbGF1bmVAYmlibGlicmUuY29tPgoK UmVzdG9yZXMgYWJpbGl0eSB0byBzZWFyY2ggb24gZXh0ZW5kZWQgYm9ycm93ZXIgYXR0cmlidXRl cyB0aGF0IGFyZSBjb25maWd1cmVkIHRvIGJlIHNlYXJjaGFibGUKClNpZ25lZC1vZmYtYnk6IElh biBXYWxscyA8aWFuLndhbGxzQGJ5d2F0ZXJzb2x1dGlvbnMuY29tPgotLS0KIEM0L01lbWJlcnMu cG0gICAgICAgICAgICB8ICAgMzggKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0KIEM0L01lbWJlcnMvQXR0cmlidXRlcy5wbSB8ICAgMTAgKysrKystLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9D NC9NZW1iZXJzLnBtIGIvQzQvTWVtYmVycy5wbQppbmRleCBmYWZjOTliLi4zYTQ4OTljIDEwMDY0 NAotLS0gYS9DNC9NZW1iZXJzLnBtCisrKyBiL0M0L01lbWJlcnMucG0KQEAgLTI3OCwyMiArMjc4 LDMwIEBAIEM8JnNlYXJjaHR5cGU+IGlzIGEgc3RyaW5nIHRlbGxpbmcgdGhlIHR5cGUgb2Ygc2Vh cmNoIHlvdSB3YW50IHRvZG8gOiBzdGFydF93aXRoCiA9Y3V0CiAKIHN1YiBTZWFyY2ggewotICAg IG15ICgkZmlsdGVyLCRvcmRlcmJ5LCAkbGltaXQsICRjb2x1bW5zX291dCwgJHNlYXJjaF9vbl9m aWVsZHMsJHNlYXJjaHR5cGUpID0gQF87Ci0JbXkgQGZpbHRlcnM7Ci0JaWYgKHJlZigkZmlsdGVy KSBlcSAiQVJSQVkiKXsKLQkJcHVzaCBAZmlsdGVycyxAJGZpbHRlcjsKLQl9Ci0JZWxzZSB7Ci0J CXB1c2ggQGZpbHRlcnMsJGZpbHRlcjsKLQl9Ci0gICAgaWYgKEM0OjpDb250ZXh0LT5wcmVmZXJl bmNlKCdFeHRlbmRlZFBhdHJvbkF0dHJpYnV0ZXMnKSkgewotCQlteSAkbWF0Y2hpbmdfcmVjb3Jk cyA9IEM0OjpNZW1iZXJzOjpBdHRyaWJ1dGVzOjpTZWFyY2hJZE1hdGNoaW5nQXR0cmlidXRlKCRm aWx0ZXIpOwotCQlwdXNoIEBmaWx0ZXJzLEAkbWF0Y2hpbmdfcmVjb3JkczsKLSAgICB9Ci0JJHNl YXJjaHR5cGV8fD0ic3RhcnRfd2l0aCI7Ci0JbXkgJGRhdGE9U2VhcmNoSW5UYWJsZSgiYm9ycm93 ZXJzIixcQGZpbHRlcnMsJG9yZGVyYnksJGxpbWl0LCRjb2x1bW5zX291dCwkc2VhcmNoX29uX2Zp ZWxkcywkc2VhcmNodHlwZSk7Ci0KLSAgICByZXR1cm4gKCAkZGF0YSApOworICAgIG15ICggJGZp bHRlciwgJG9yZGVyYnksICRsaW1pdCwgJGNvbHVtbnNfb3V0LCAkc2VhcmNoX29uX2ZpZWxkcywg JHNlYXJjaHR5cGUgKSA9IEBfOworICAgIG15IEBmaWx0ZXJzOworICAgIG15ICVmaWx0ZXJzbWF0 Y2hpbmdfcmVjb3JkOworICAgIG15IEBmaW5hbGZpbHRlcjsKKyAgICBpZiAoIHJlZigkZmlsdGVy KSBlcSAiQVJSQVkiICkgeworICAgICAgICBwdXNoIEBmaWx0ZXJzLCBAJGZpbHRlcjsKKyAgICB9 IGVsc2UgeworICAgICAgICBwdXNoIEBmaWx0ZXJzLCAkZmlsdGVyOworICAgIH0KKyAgICBpZiAo IEM0OjpDb250ZXh0LT5wcmVmZXJlbmNlKCdFeHRlbmRlZFBhdHJvbkF0dHJpYnV0ZXMnKSApIHsK KyAgICAgICAgbXkgJG1hdGNoaW5nX3JlY29yZHMgPSBDNDo6TWVtYmVyczo6QXR0cmlidXRlczo6 U2VhcmNoSWRNYXRjaGluZ0F0dHJpYnV0ZSgkZmlsdGVyKTsKKyAgICAgICAgaWYoc2NhbGFyKEAk bWF0Y2hpbmdfcmVjb3Jkcyk+MCkgeworCQkJZm9yZWFjaCBteSAkbWF0Y2hpbmdfcmVjb3JkIChA JG1hdGNoaW5nX3JlY29yZHMpIHsKKwkJCQkkZmlsdGVyc21hdGNoaW5nX3JlY29yZHskJG1hdGNo aW5nX3JlY29yZFswXX09MTsKKwkJCX0KKwkJCWZvcmVhY2ggbXkgJGsgKGtleXMoJWZpbHRlcnNt YXRjaGluZ19yZWNvcmQpKSB7CisJCQkJcHVzaCBAZmlsdGVycywgeyJib3Jyb3dlcm51bWJlciI9 PiRrfTsKKwkJCX0KKwkJfQorICAgIH0KKyAgICAkc2VhcmNodHlwZSB8fD0gInN0YXJ0X3dpdGgi OworCXB1c2ggQGZpbmFsZmlsdGVyLCBcQGZpbHRlcnM7CisJbXkgJGRhdGEgPSBTZWFyY2hJblRh YmxlKCAiYm9ycm93ZXJzIiwgXEBmaW5hbGZpbHRlciwgJG9yZGVyYnksICRsaW1pdCwgJGNvbHVt bnNfb3V0LCAkc2VhcmNoX29uX2ZpZWxkcywgJHNlYXJjaHR5cGUgKTsKKyAgICByZXR1cm4gKCRk YXRhKTsKIH0KIAogPWhlYWQyIEdldE1lbWJlckRldGFpbHMKZGlmZiAtLWdpdCBhL0M0L01lbWJl cnMvQXR0cmlidXRlcy5wbSBiL0M0L01lbWJlcnMvQXR0cmlidXRlcy5wbQppbmRleCA3MGMzNGI0 Li5iODliMDNhIDEwMDY0NAotLS0gYS9DNC9NZW1iZXJzL0F0dHJpYnV0ZXMucG0KKysrIGIvQzQv TWVtYmVycy9BdHRyaWJ1dGVzLnBtCkBAIC0xMDIsMTcgKzEwMiwxNyBAQCBzdWIgR2V0Qm9ycm93 ZXJBdHRyaWJ1dGVzIHsKIAogc3ViIFNlYXJjaElkTWF0Y2hpbmdBdHRyaWJ1dGV7CiAgICAgbXkg JGZpbHRlciA9IHNoaWZ0OwotCi0gICAgbXkgJGRiaCA9IEM0OjpDb250ZXh0LT5kYmgoKTsKKwlt eSAkZmluYWxmaWx0ZXI9JCRmaWx0ZXJbMF07CisgICAgbXkgJGRiaCAgID0gQzQ6OkNvbnRleHQt PmRiaCgpOwogICAgIG15ICRxdWVyeSA9IHFxewogU0VMRUNUIGJvcnJvd2VybnVtYmVyCiBGUk9N IGJvcnJvd2VyX2F0dHJpYnV0ZXMKIEpPSU4gYm9ycm93ZXJfYXR0cmlidXRlX3R5cGVzIFVTSU5H IChjb2RlKQogV0hFUkUgc3RhZmZfc2VhcmNoYWJsZSA9IDEKLUFORCBhdHRyaWJ1dGUgbGlrZSA/ fTsKK0FORCBhdHRyaWJ1dGUgbGlrZSAiJSRmaW5hbGZpbHRlciUifTsKICAgICBteSAkc3RoID0g JGRiaC0+cHJlcGFyZV9jYWNoZWQoJHF1ZXJ5KTsKLSAgICAkc3RoLT5leGVjdXRlKCRmaWx0ZXIp OwotCXJldHVybiAkc3RoLT5mZXRjaGFsbF9hcnJheXJlZjsKKyAgICAkc3RoLT5leGVjdXRlKCk7 CisgICAgcmV0dXJuICRzdGgtPmZldGNoYWxsX2FycmF5cmVmOwogfQogCiA9aGVhZDIgQ2hlY2tV bmlxdWVuZXNzCi0tIAoxLjUuNi41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpLb2hhLXBhdGNoZXMgbWFpbGluZyBsaXN0CktvaGEtcGF0Y2hlc0BsaXN0 cy5rb2hhLWNvbW11bml0eS5vcmcKaHR0cDovL2xpc3RzLmtvaGEtY29tbXVuaXR5Lm9yZy9jZ2kt YmluL21haWxtYW4vbGlzdGluZm8va29oYS1wYXRjaGVzCndlYnNpdGUgOiBodHRwOi8vd3d3Lmtv aGEtY29tbXVuaXR5Lm9yZy8KZ2l0IDogaHR0cDovL2dpdC5rb2hhLWNvbW11bml0eS5vcmcvCmJ1 Z3MgOiBodHRwOi8vYnVncy5rb2hhLWNvbW11bml0eS5vcmcv