fix #151--support OTHER (not NULL) EvalResult.Type for responses with no X-Primitive header

Author: sammefford

src/main/java/com/marklogic/client/impl/JerseyServices.java

@@ -3642,7 +3642,7 @@ public EvalResult.Type getType() {
 			}
 			String xPrimitive = content.getHeader("X-Primitive");
 			if ( xPrimitive == null ) {
-				return EvalResult.Type.NULL;
+				return EvalResult.Type.OTHER;
 			} else if ( "string".equals(xPrimitive) || "untypedAtomic".equals(xPrimitive) ) {
 				return EvalResult.Type.STRING;
 			} else if ( "boolean".equals(xPrimitive) ) {
@@ -3691,6 +3691,8 @@ public EvalResult.Type getType() {
 				return EvalResult.Type.QNAME;
 			} else if ( "time".equals(xPrimitive) ) {
 				return EvalResult.Type.TIME;
+			} else if ( "null".equals(xPrimitive) ) {
+				return EvalResult.Type.NULL;
 			}
 			return EvalResult.Type.OTHER;
 		}

src/test/java/com/marklogic/client/test/EvalTest.java

@@ -57,7 +57,7 @@ public class EvalTest {
     @BeforeClass
     public static void beforeClass() {
         Common.connectEval();
-        System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
+        //System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
     }
     @AfterClass
     public static void afterClass() {
@@ -326,6 +326,9 @@ private void runAndTest(ServerEvaluationCall call)
             result = results.next();
             assertEquals("myCtsQuery should be Type.OTHER", EvalResult.Type.OTHER, result.getType());
             assertEquals("myCtsQuery should be Format.TEXT", Format.TEXT, result.getFormat());
+            result = results.next();
+            assertEquals("myFunction should be Type.OTHER", EvalResult.Type.OTHER, result.getType());
+            assertEquals("myFunction should be Format.TEXT", Format.TEXT, result.getFormat());
         } finally { results.close(); }
     }
 

src/test/resources/evaltest.xqy

@@ -33,11 +33,12 @@ let $myAttribute             := $myElement/@*
 let $myComment               := $myComment/comment() 
 let $myProcessingInstruction := $myProcessingInstruction/processing-instruction() 
 let $myCtsQuery := cts:word-query('a') 
+let $myFunction := xdmp:functions()[2]
 return (
     $test:myString, $myArray, $myObject, $myAnyUri, 
     $myBinary, $myBase64Binary, $myHexBinary, $myDuration, $myQName,
     $myDocument, $myAttribute, $myComment, $myElement, $myProcessingInstruction, $myText, 
     $myBool, $myInteger, $myBigInteger, $myDecimal, $myDouble, $myFloat,
     $myGDay, $myGMonth, $myGMonthDay, $myGYear, $myGYearMonth, $myDate, $myDateTime, $myTime,
-    $myNull, $myCtsQuery
+    $myNull, $myCtsQuery, $myFunction
 )