Project

General

Profile

« Previous | Next » 

Revision 5059

use keyword field for both assessments and assessment items
remove unused query options that were in place for the mock up UI
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=4387

View differences:

lib/style/skins/first/index.jsp
62 62
			var otherField = document.getElementById("otherField").value;
63 63
			var otherValue = document.getElementById("otherValue").value;
64 64
			//keywords
65
			var keywordThesaurus1 = document.getElementById("keywordThesaurus1").value;
65
			//var keywordThesaurus1 = document.getElementById("keywordThesaurus1").value;
66 66
			var keyword1 = document.getElementById("keyword1").value;
67 67

  
68 68
			
......
75 75
			searchTerms[otherField] = otherValue;
76 76
			//TODO: implement thesaurus matching (compound INTERSECTION)
77 77
			searchTerms["keyword"] = keyword1;
78
			searchTerms["fieldentry"] = keyword1;
78 79
			
79 80
			var operator = "UNION";
80 81
			if (document.getElementById("all").checked) {
......
97 98
					false, 
98 99
					true);
99 100
			
100
			//alert("itemQueryString=" + itemQueryString);
101
			alert("itemQueryString=" + itemQueryString);
101 102

  
102 103
			loadAssessments = function(transport) {
103 104
				
......
187 188
						
188 189
						<table>
189 190
							<tr>
190
								<td nowrap="nowrap">Question contains: </td>
191
								<td><input disabled="disabled" readonly="readonly" name="question" id="question" type="text" size="14"/></td>
192
							</tr>
193
							<tr>
194 191
								<td>Institution: </td>
195 192
								<td><input name="institution" id="institution" type="text" size="14"/></td>
196 193
							</tr>
......
238 235
								<td><input name="otherValue" id="otherValue" type="text" size="14"/></td>
239 236
							</tr>
240 237
							<tr>
241
								<td colspan="2"><input type="button" value="+"/></td>
242
							</tr>
243
							<tr>
244
								<td colspan="2">Keywords</td>
245
							</tr>
246
							<tr>
247 238
								<td>
248
									<select id="keywordThesaurus1" name="keywordThesaurus1">
249
										<option value=""></option>
250
										<option value="keywordThesaurus">NBII</option>
251
										<option value="keywordThesaurus">Bloom</option>
252
									</select>
239
									Keyword:
253 240
								</td>
254 241
								<td><input name="keyword1" id="keyword1" type="text" size="14"/></td>
255 242
							</tr>
256
							<tr>
257
								<td colspan="2"><input type="button" value="+"/></td>
258
							</tr>
259 243
							
260 244
						</table>
261 245
					</td>

Also available in: Unified diff