From 3daecc30cd95f6ba3e43844e24e711da0f5859b5 Mon Sep 17 00:00:00 2001 From: kenstir Date: Wed, 14 Oct 2015 22:52:23 -0400 Subject: [PATCH] * indicate item type in search results, e.g. "ebook" or "lpbook" * this requires an extra round-trip using the PCRUD service, which in turn requires an extra round of special-case parsing of what looks like Data::Dumper formatted output --- .../src/Android/core/libs/opensrf2_android.jar | Bin 55229 -> 55407 bytes .../Android/core/res/layout/search_result_item.xml | 29 ++++--- Open-ILS/src/Android/core/res/values/styles.xml | 2 +- .../org/evergreen_ils/globals/GlobalConfigs.java | 2 +- .../evergreen_ils/searchCatalog/RecordInfo.java | 3 +- .../evergreen_ils/searchCatalog/SearchCatalog.java | 93 +++++++-------------- .../searchCatalog/SearchCatalogListView.java | 3 + Open-ILS/src/Android/cwmars_app/fetch_idl.sh | 2 +- 8 files changed, 54 insertions(+), 80 deletions(-) diff --git a/Open-ILS/src/Android/core/libs/opensrf2_android.jar b/Open-ILS/src/Android/core/libs/opensrf2_android.jar index 71af946c4db86e76890ae7a9e33a6dc13ebcff10..11940e01033fa6c269a0f935d7cc48ded416f90a 100644 GIT binary patch delta 3361 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 axZhRGK*BhLt+bEn==&dbYIKMI delta 3153 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 diff --git a/Open-ILS/src/Android/core/res/layout/search_result_item.xml b/Open-ILS/src/Android/core/res/layout/search_result_item.xml index 3629f7d39b..93f8399b06 100644 --- a/Open-ILS/src/Android/core/res/layout/search_result_item.xml +++ b/Open-ILS/src/Android/core/res/layout/search_result_item.xml @@ -18,14 +18,12 @@ android:src="@drawable/address_book" android:padding="4dip" /> - - - + - + /> + + + - /> -