Project

General

Profile

« Previous | Next » 

Revision 3650

handle special case for searching both SANParks and SAEON (but not all of KNB)

View differences:

lib/style/skins/sanparks/searchPathQuery.js
28 28
	queryString += "</queryterm>";
29 29
	
30 30
	queryString += "<querygroup operator='UNION'>";
31
	queryString += "<queryterm casesensitive='false' searchmode='contains'>";
32 31
	
33
	queryString += "<value>" + organizationScope + "</value>";
32
	for (var i = 0; i < organizationScope.length; i++) {
33
		queryString += "<queryterm casesensitive='false' searchmode='contains'>";
34
		queryString += "<value>" + organizationScope[i] + "</value>";
35
		queryString += "<pathexpr>placekey</pathexpr>";
36
		queryString += "</queryterm>";
37
		
38
		queryString += "<queryterm casesensitive='false' searchmode='contains'>";
39
		queryString += "<value>" + organizationScope[i] + "</value>";
40
		queryString += "<pathexpr>keyword</pathexpr>";
41
		queryString += "</queryterm>";
42
	}
34 43
	
35
	queryString += "<pathexpr>placekey</pathexpr>";
36
	queryString += "</queryterm>";
37
	queryString += "<queryterm casesensitive='false' searchmode='contains'>";
38
	
39
	queryString += "<value>" + organizationScope + "</value>";
40
	
41
	queryString += "<pathexpr>keyword</pathexpr>";
42
	queryString += "</queryterm>";
43 44
	queryString += "</querygroup>";
44 45
	
45 46
	queryString += "</querygroup>";
......
58 59
	var anyfieldField = document.getElementById("anyfield");
59 60
	//alert('anyfieldField=' + anyfieldField);
60 61
	var organizationScopeField = document.getElementById("organizationScope");
61
	//alert('organizationScopeField=' + organizationScopeField);
62
	//alert('organizationScopeField=' + organizationScopeField.value);
62 63
	
64
	//make the array
65
	var orgArray = new Array();
66
	orgArray[0] = organizationScopeField.value;
67
	//if "All", include multiple entries
68
	if (organizationScopeField.value == '') {
69
		orgArray[0] = "SANParks, South Africa";
70
		orgArray[1] = "SAEON, South Africa";
71
	}
72
	
63 73
	queryField.value = 
64 74
		generateQueryString(
65
			organizationScopeField.value,
75
			orgArray,
66 76
			anyfieldField.value);
67 77
	
68 78
	//alert(queryField.value);
lib/style/skins/saeon/searchPathQuery.js
28 28
	queryString += "</queryterm>";
29 29
	
30 30
	queryString += "<querygroup operator='UNION'>";
31
	queryString += "<queryterm casesensitive='false' searchmode='contains'>";
32 31
	
33
	queryString += "<value>" + organizationScope + "</value>";
32
	for (var i = 0; i < organizationScope.length; i++) {
33
		queryString += "<queryterm casesensitive='false' searchmode='contains'>";
34
		queryString += "<value>" + organizationScope[i] + "</value>";
35
		queryString += "<pathexpr>placekey</pathexpr>";
36
		queryString += "</queryterm>";
37
		
38
		queryString += "<queryterm casesensitive='false' searchmode='contains'>";
39
		queryString += "<value>" + organizationScope[i] + "</value>";
40
		queryString += "<pathexpr>keyword</pathexpr>";
41
		queryString += "</queryterm>";
42
	}
34 43
	
35
	queryString += "<pathexpr>placekey</pathexpr>";
36
	queryString += "</queryterm>";
37
	queryString += "<queryterm casesensitive='false' searchmode='contains'>";
38
	
39
	queryString += "<value>" + organizationScope + "</value>";
40
	
41
	queryString += "<pathexpr>keyword</pathexpr>";
42
	queryString += "</queryterm>";
43 44
	queryString += "</querygroup>";
44 45
	
45 46
	queryString += "</querygroup>";
......
58 59
	var anyfieldField = document.getElementById("anyfield");
59 60
	//alert('anyfieldField=' + anyfieldField);
60 61
	var organizationScopeField = document.getElementById("organizationScope");
61
	//alert('organizationScopeField=' + organizationScopeField);
62
	//alert('organizationScopeField=' + organizationScopeField.value);
62 63
	
64
	//make the array
65
	var orgArray = new Array();
66
	orgArray[0] = organizationScopeField.value;
67
	//if "All", include multiple entries
68
	if (organizationScopeField.value == '') {
69
		orgArray[0] = "SANParks, South Africa";
70
		orgArray[1] = "SAEON, South Africa";
71
	}
72
	
63 73
	queryField.value = 
64 74
		generateQueryString(
65
			organizationScopeField.value,
75
			orgArray,
66 76
			anyfieldField.value);
67 77
	
68 78
	//alert(queryField.value);

Also available in: Unified diff