r4562 - trunk/lib/style/skins/first

[leinfelder at ecoinformatics.org]

Author: leinfelder
Date: 2008-11-16 08:08:11 -0800 (Sun, 16 Nov 2008)
New Revision: 4562

Modified:
   trunk/lib/style/skins/first/index.jsp
   trunk/lib/style/skins/first/search.js
Log:
added "generic" search term picklist
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=3520

Modified: trunk/lib/style/skins/first/index.jsp
===================================================================
--- trunk/lib/style/skins/first/index.jsp	2008-11-13 23:20:40 UTC (rev 4561)
+++ trunk/lib/style/skins/first/index.jsp	2008-11-16 16:08:11 UTC (rev 4562)
@@ -59,12 +59,15 @@
 			var instructor = document.getElementById("instructor").value;
 			var course = document.getElementById("course").value;
 			var year = document.getElementById("year").value;
+			var otherField = document.getElementById("otherField").value;
+			var otherValue = document.getElementById("otherValue").value;
 			var searchTerms = new Object();
 			searchTerms["anyValue"] = searchString;
 			searchTerms["institution/organizationName"] = institution;
 			searchTerms["instructor/individualName/surName"] = instructor;
 			searchTerms["course/lom/general/title/string"] = course;
 			searchTerms["course/year"] = year;
+			searchTerms[otherField] = otherValue;
 			
 			var operator = "UNION";
 			if (document.getElementById("all").checked) {
@@ -139,6 +142,17 @@
 								<td>Year: </td>
 								<td><input name="year" id="year" type="text" size="4"/></td>
 							</tr>
+							<tr>
+								<td>
+									<select id="otherField" name="otherValue">
+										<option value="assessment/@title">Assessment Title</option>
+										<option value="assessment/@type">Assessment Type</option>
+										<option value="assessment/duration">Assessment Duration</option>
+										<option value="course/term">Course Term</option>
+									</select>
+								</td>
+								<td><input name="otherValue" id="otherValue" type="text" size="14"/></td>
+							</tr>
 						</table>
 					</td>
 					<td valign="bottom" class="borderbottom">

Modified: trunk/lib/style/skins/first/search.js
===================================================================
--- trunk/lib/style/skins/first/search.js	2008-11-13 23:20:40 UTC (rev 4561)
+++ trunk/lib/style/skins/first/search.js	2008-11-16 16:08:11 UTC (rev 4562)
@@ -388,14 +388,17 @@
                          
     for (var i in searchTerms) {
     	var key = i;
-    	var value = searchTerms[i];                        
-		queryString +=
-			"<queryterm searchmode=\"contains\" casesensitive=\"false\">";
-			if (key != "anyValue") {
-				queryString += "<pathexpr>" + key + "</pathexpr>";
-			}	
-	      	queryString += "<value>" + value + "</value>";
-	    queryString +="</queryterm>";
+    	var value = searchTerms[i];
+    	//only if we have a value  
+    	if (value.length > 0) {                   
+			queryString +=
+				"<queryterm searchmode=\"contains\" casesensitive=\"false\">";
+				if (key != "anyValue") {
+					queryString += "<pathexpr>" + key + "</pathexpr>";
+				}	
+		      	queryString += "<value>" + value + "</value>";
+		    queryString +="</queryterm>";
+		}
     }
     
 	queryString +=