From 7da3ecffb94c845942200812776cf5dee434ed2a Mon Sep 17 00:00:00 2001
From: Ben Ostrowsky <ben@shellz.esilibrary.com>
Date: Wed, 22 Jun 2011 19:02:34 +0000
Subject: [PATCH] Provides a method for choosing the initially selected indexes
 for three rows in advanced search, and sets these to title, author, and
 keyword respectively.

My initial attempt is replaced here by a more elegant and tidy version from Thomas Berezansky.

Signed-off-by: Ben Ostrowsky <ben@shellz.esilibrary.com>
---
 Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml | 10 +++++-----
 .../web/opac/skin/default/xml/advanced/advanced_global.xml     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml b/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
index f5c5ca7dd9..19d003bef9 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
@@ -6,11 +6,11 @@
 
 		<!-- select the search class -->
 		<select name='type' style='margin-right: 7px;'>
-			<option value='keyword' selected='selected'>&common.keyword;</option>
-			<option value='title'>&common.title;</option>
-			<option value='author'>&common.author;</option>
-			<option value='subject'>&common.subject;</option>
-			<option value='series'>&common.series;</option>
+			<option value='keyword'<!--#if expr="$QUERY_STRING=keyword" --> selected='selected' <!--#endif -->>&common.keyword;</option>
+			<option value='title'<!--#if expr="$QUERY_STRING=title" --> selected='selected' <!--#endif -->>&common.title;</option>
+			<option value='author'<!--#if expr="$QUERY_STRING=author" --> selected='selected' <!--#endif -->>&common.author;</option>
+			<option value='subject'<!--#if expr="$QUERY_STRING=subject" --> selected='selected' <!--#endif -->>&common.subject;</option>
+			<option value='series'<!--#if expr="$QUERY_STRING=series" --> selected='selected' <!--#endif -->>&common.series;</option>
 		</select>
 	
 		<!-- select how to treat the text -->
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index 865aa59ff8..c5a58c998d 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -24,11 +24,11 @@
 					</script>
 
 					<!--#set var="adv_global_row_id" value="adv_global_trow"-->
-					<!--#include virtual="adv_global_row.xml"-->
+					<!--#include virtual="adv_global_row.xml?title"-->
 
 					<!--#set var="adv_global_row_id" value=""-->
-					<!--#include virtual="adv_global_row.xml"-->
-					<!--#include virtual="adv_global_row.xml"-->
+					<!--#include virtual="adv_global_row.xml?author"-->
+					<!--#include virtual="adv_global_row.xml?keyword"-->
 
 					<!-- add a new row -->
 					<tr id='adv_global_addrow'>
-- 
2.11.0