From 0d326d278b025b9c87dbac7bef6c5cafa2bc7630 Mon Sep 17 00:00:00 2001 From: BennyKJohnson Date: Mon, 1 Aug 2016 17:38:08 +1000 Subject: [PATCH] Fixed CKModifyOperation --- Sources/CKModifyRecordsOperation.swift | 11 ++++++++--- Sources/CKPredicateReader.swift | 4 +--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Sources/CKModifyRecordsOperation.swift b/Sources/CKModifyRecordsOperation.swift index e5d48bd..5b074e8 100755 --- a/Sources/CKModifyRecordsOperation.swift +++ b/Sources/CKModifyRecordsOperation.swift @@ -137,7 +137,7 @@ public class CKModifyRecordsOperation: CKDatabaseOperation { if let recordIDsToDelete = recordIDsToDelete { let deleteOperations = recordIDsToDelete.map({ (recordID) -> [String: AnyObject] in let operationDictionary: [String: AnyObject] = [ - "operationType": "delete".bridge(), + "operationType": "forceDelete".bridge(), "record":(["recordName":recordID.recordName.bridge()] as [String: AnyObject]).bridge() ] @@ -209,7 +209,7 @@ public class CKModifyRecordsOperation: CKDatabaseOperation { #else request["operations"] = operationsDictionary() #endif - + urlSessionTask = CKWebRequest(container: operationContainer).request(withURL: url, parameters: request) { (dictionary, error) in // Check if cancelled @@ -242,7 +242,12 @@ public class CKModifyRecordsOperation: CKDatabaseOperation { let error = NSError(domain: CKErrorDomain, code: CKErrorCode.PartialFailure.rawValue, userInfo: [NSLocalizedDescriptionKey: recordFetchError.reason]) self.perRecordCompletionBlock?(nil, error) } else { - fatalError("Couldn't resolve record or record fetch error dictionary") + + if let recordName = recordDictionary["recordName"], result = recordDictionary["deleted"] { + + } else { + fatalError("Couldn't resolve record or record fetch error dictionary") + } } } } diff --git a/Sources/CKPredicateReader.swift b/Sources/CKPredicateReader.swift index 8334cf2..1bcc65c 100755 --- a/Sources/CKPredicateReader.swift +++ b/Sources/CKPredicateReader.swift @@ -237,9 +237,7 @@ struct CKPredicateReader { currentIndex += source.step continue } - - print(source.takeString(begin: chunkIndex, end: currentIndex)) - + switch ascii { case "\"": currentIndex = index