svn commit: r1636574 - /chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m

[psutter]

Author: psutter
Date: Tue Nov  4 13:08:55 2014
New Revision: 1636574

URL: http://svn.apache.org/r1636574
Log:
fix for https://issues.apache.org/jira/browse/CMIS-864 Browser Binding: 
exception & error response message not parsed

Modified:
    chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m
URL: 
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m?rev=1636574&r1=1636573&r2=1636574&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m 
(original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m Tue 
Nov  4 13:08:55 2014
@@ -18,6 +18,7 @@
  */
 
 #import "CMISHttpResponse.h"
+#import "CMISDictionaryUtil.h"
 
 @interface CMISHttpResponse ()
 
@@ -64,10 +65,32 @@
 
 - (NSString*)exception
 {
+    NSString *exception = [self responseValueForKey:@"exception"];
+    return exception;
+}
+
+
+- (NSString*)errorMessage
+{
+    NSString *message = [self responseValueForKey:@"message"];
+    return message;
+}
+
+- (NSString*)responseValueForKey:(NSString *)key
+{
+    NSString *value = [self jsonResponseValueForKey:key];
+    if (!value) {
+        value = [self atomResponseValueForKey:key];
+    }
+    return value;
+}
+
+- (NSString*)atomResponseValueForKey:(NSString *)key
+{
     NSString *responseString = self.responseString;
     if (responseString) {
-        NSRange begin = [responseString rangeOfString:@"<!--exception-->"];
-        NSRange end   = [responseString rangeOfString:@"<!--/exception-->"];
+        NSRange begin = [responseString rangeOfString:[NSString 
stringWithFormat:@"<!--%@-->", key]];
+        NSRange end   = [responseString rangeOfString:[NSString 
stringWithFormat:@"<!--/%@-->", key]];
         
         if (begin.location != NSNotFound &&
             end.location != NSNotFound &&
@@ -80,22 +103,21 @@
     return nil;
 }
 
-
-- (NSString*)errorMessage
+- (NSString*)jsonResponseValueForKey:(NSString *)key
 {
     NSString *responseString = self.responseString;
     if (responseString) {
-        NSRange begin = [responseString rangeOfString:@"<!--message-->"];
-        NSRange end   = [responseString rangeOfString:@"<!--/message-->"];
+        NSError *serialisationError = nil;
         
-        if (begin.location != NSNotFound &&
-            end.location != NSNotFound &&
-            begin.location < end.location) {
-            
-            return [responseString 
substringWithRange:NSMakeRange(begin.location + begin.length,
-                                                                  end.location 
- begin.location - begin.length)];
+        NSData *responseStringData = [responseString 
dataUsingEncoding:NSUTF8StringEncoding];
+        id jsonDictionary = [NSJSONSerialization 
JSONObjectWithData:responseStringData options:0 error:&serialisationError];
+        
+        if (!serialisationError) {
+            NSString *message = [jsonDictionary cmis_objectForKeyNotNull:key];
+            return message;
         }
     }
+    
     return nil;
 }