anchor.diff:  	            	}
   				
   
  -<<<<<<< HEAD
   	            	if (searchKey == null && searchLocation == null) {
   	            		out.println("All records with sensor type "+searchSType+" from "+fdate+" to "+tdate+":");
   	            	}
  -=======
  -				 if(op1 == "a"){
  -				    	sqlString = sqlString + "ORDER BY ar.date_created DESC, i.date_created DESC, sd.date_created DESC";
  -				 }
  -				 else if(op1 == "b")){
  -				    	sqlString = sqlString + "ORDER BY ar.date_created ASE, i.date_created ASE, sd.date_created ASE";
  -				 }
  ->>>>>>> f553d6a5fa074fe7571283318b7c32a20544b99e
   
   	            	if (searchKey == null){
   	            		out.println("All records with sensor type "+searchSType+" and "+searchLocation+" from "+fdate+" to "+tdate+":");
  
positive.code: 		    out.println("<TABLE>");
  			out.println("<TR>");
  			out.println("<TD><B><I><font color=HotPink>Search keys:&nbsp;&nbsp;&nbsp;</TD>");
  <<<<<<< HEAD
  			out.println("<TD><INPUT TYPE='text' NAME='search_key' VALUE=''>");
  			out.println("</TR>");
  			out.println("<TR>");
              out.println("<TD><B><I><font color=HotPink>Location:&nbsp;</TD>");
              out.println("<TD><INPUT TYPE='text' NAME='search_location' VALUE=''></TD>");
  =======
  			out.println("<TD><INPUT TYPE='text' NAME='search_key' VALUE=''></TD>");
  			out.println("</TR>");
  			out.println("<TR>");
              out.println(" <TD><B><I><font color=HotPink>Location:&nbsp;</TD>");
              out.println(" <TD><INPUT TYPE='text' NAME='search_location' VALUE=''></TD>");
  >>>>>>> f553d6a5fa074fe7571283318b7c32a20544b99e
  			out.println("</TR>");
  			out.println("<TR>");
              out.println(" <TD><B><I><font color=HotPink>Sensor type:&nbsp;</TD>");
  
negative.code:             out.println(" <TR>");
  			out.println("<TD><B><I><font color=HotPink>Time period:</font></I></B></TD>");
  			out.println("<TD><label for='from'><font color=HotPink>&nbsp;From</font></label>");
              out.println(" <INPUT TYPE='text' class='from' NAME='from'></TD>");
  			out.println("<TD><label for='to'><font color=HotPink >To</font></label>");
              out.println(" <INPUT TYPE='text' class='to' NAME='to'><font color=HotPink >*</font></TD>");
  