Update search fields

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchGet.java

@@ -72,12 +72,12 @@ private void addFields() {
 		author.addAttribute("label", AUTHOR_FIELD_LABEL);
 
 		Element rpp = x.addElement("field");
-		rpp.addAttribute("type", "fixed-single");
+		rpp.addAttribute("type", "fixed");
 		rpp.addAttribute("var", "rpp");
 		rpp.addAttribute("label", RPP_FIELD_LABEL);
 
 		Element page = x.addElement("field");
-		page.addAttribute("type", "fixed-single");
+		page.addAttribute("type", "fixed");
 		page.addAttribute("var", "page");
 		page.addAttribute("label", PAGE_FIELD_LABEL);
 	}

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchSet.java

@@ -229,7 +229,7 @@ private void addReportedFields(Element x) {
 
 		reported.addElement("field").addAttribute("var", "entry")
 				.addAttribute("label", "Item")
-				.addAttribute("type", "http://www.w3.org/2005/Atom");
+				.addAttribute("type", "xml");
 	}
 
 	private void extractFieldValues() {
@@ -285,11 +285,6 @@ private Integer getValueAsNumber(Element field)
 
 	private void sendErrorResponse(PacketError.Type type,
 			PacketError.Condition condition) throws InterruptedException {
-		// try {
-		// throw new Exception();
-		// } catch ( Exception e ) {
-		// e.printStackTrace();
-		// }
 		responseIq.setType(IQ.Type.error);
 		PacketError error = new PacketError(condition, type);
 		responseIq.setError(error);

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchGetTest.java

@@ -285,7 +285,7 @@ public void testReturnsDataFormResultsPerPageElement() throws Exception {
 				.element("query")
 				.element("x")
 				.elements("field").get(3);
-	    Assert.assertEquals("fixed-single", formType.attributeValue("type"));
+	    Assert.assertEquals("fixed", formType.attributeValue("type"));
 	    Assert.assertEquals("rpp", formType.attributeValue("var"));
 	    Assert.assertEquals(SearchGet.RPP_FIELD_LABEL, formType.attributeValue("label"));
 
@@ -309,7 +309,7 @@ public void testReturnsDataFormPageElement() throws Exception {
 				.element("query")
 				.element("x")
 				.elements("field").get(4);
-	    Assert.assertEquals("fixed-single", formType.attributeValue("type"));
+	    Assert.assertEquals("fixed", formType.attributeValue("type"));
 	    Assert.assertEquals("page", formType.attributeValue("var"));
 	    Assert.assertEquals(SearchGet.PAGE_FIELD_LABEL, formType.attributeValue("label"));
 	}

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchSetTest.java

@@ -396,7 +396,7 @@ public void testReturnsDataInExpectedFormat() throws Exception {
 
 		Assert.assertEquals("entry", fields.get(2).attributeValue("var"));
 		Assert.assertEquals("Item", fields.get(2).attributeValue("label"));
-		Assert.assertEquals("http://www.w3.org/2005/Atom", fields.get(2)
+		Assert.assertEquals("xml", fields.get(2)
 				.attributeValue("type"));
 
 		List<Element> items = x.elements("item");