### Eclipse Workspace Patch 1.0
#P d1_mercury_ui
Index: src/main/webapp/searchform.html
===================================================================
--- src/main/webapp/searchform.html (revision 8333)
+++ src/main/webapp/searchform.html (working copy)
@@ -43,9 +43,9 @@
-
+
Index: src/main/webapp/scripts/default.js
===================================================================
--- src/main/webapp/scripts/default.js (revision 9236)
+++ src/main/webapp/scripts/default.js (working copy)
@@ -64,8 +64,8 @@
var term6attribute = searchForm['term6attribute'].value = "datasource";
// Term7 place keyword
- var term7 = searchForm['term7'].value = dwr.util.getValue("placeKey");
- var term7att = searchForm['term7attribute'].value = "placeKey";
+ // var term7 = searchForm['term7'].value = dwr.util.getValue("placeKey");
+ // var term7att = searchForm['term7attribute'].value = "placeKey";
// Term8 datetype keyword
var term8 = searchForm['term8'].value = dwr.util.getValue("datetype");
@@ -105,7 +105,7 @@
alert("You have not entered End date");
}
var tempTerm3 = t3.replace(/,/g,"");
- if (t1.trim() == "" && t2.trim() == "" && tempTerm3.trim() == "" && t4.trim() == "" && t5.trim() == "" && term7.trim() =="") {
+ if (t1.trim() == "" && t2.trim() == "" && tempTerm3.trim() == "" && t4.trim() == "" && t5.trim() == "") {
alert("No query has been entered!");
} else {
msg = "SOLR - VARIABLES: Field Name(Type) = Value ";
@@ -157,7 +157,7 @@
var sources = dwr.util.getValue("sources");
var dateType = dwr.util.getValue("datetype");
var format = dwr.util.getValue("formats");
- var placeString = dwr.util.getValue("placeKey");
+ var placeString = "";
//Simple ON
if (simpleWord != "") {
var simpleOn = true;