瀏覽代碼

search API

Marino Faggiana 8 年之前
父節點
當前提交
54c4c4158e

+ 3 - 10
Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -627,12 +627,6 @@
     path = [NSString stringWithFormat:@"%@/remote.php/dav", path];
     path = [NSString stringWithFormat:@"%@/remote.php/dav", path];
     path = [path encodeString:NSUTF8StringEncoding];
     path = [path encodeString:NSUTF8StringEncoding];
     
     
-    //fileName = [fileName stringByAppendingString:@"%25"];
-    
-    //fileName = [fileName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    
-    //fileName = [fileName encodeString:NSUTF8StringEncoding];
-    
     OCWebDAVClient *request = [OCWebDAVClient new];
     OCWebDAVClient *request = [OCWebDAVClient new];
     request = [self getRequestWithCredentials:request];
     request = [self getRequestWithCredentials:request];
     
     
@@ -642,17 +636,16 @@
             
             
             NSData *responseData = (NSData*) responseObject;
             NSData *responseData = (NSData*) responseObject;
             
             
-            OCXMLParser *parser = [[OCXMLParser alloc]init];
+            OCXMLSearchParser *parser = [OCXMLSearchParser new];
             [parser initParserWithData:responseData];
             [parser initParserWithData:responseData];
-            NSMutableArray *directoryList = [parser.directoryList mutableCopy];
+            NSMutableArray *searchList = [parser.searchList mutableCopy];
             
             
             //Return success
             //Return success
-            successRequest(response, directoryList, request.redirectedServer, token);
+            successRequest(response, searchList, request.redirectedServer, token);
         }
         }
         
         
     } failure:^(NSHTTPURLResponse *response, id responseData, NSError *error, NSString *token) {
     } failure:^(NSHTTPURLResponse *response, id responseData, NSError *error, NSString *token) {
         
         
-        NSLog(@"Failure");
         failureRequest(response, error, token, request.redirectedServer);
         failureRequest(response, error, token, request.redirectedServer);
     }];
     }];
 }
 }

+ 2 - 2
Libraries external/OCCommunicationLib/OCCommunicationLib/OCWebDavClient/Parsers/OCXMLSearchParser.h

@@ -8,13 +8,13 @@
     
     
     NSMutableString *_xmlChars;
     NSMutableString *_xmlChars;
     NSMutableDictionary *_xmlBucket;
     NSMutableDictionary *_xmlBucket;
-    NSMutableArray *_directoryList;
+    NSMutableArray *_searchList;
     OCFileDto *_currentFile;
     OCFileDto *_currentFile;
     BOOL isNotFirstFileOfList;
     BOOL isNotFirstFileOfList;
     
     
 }
 }
 
 
-@property(nonatomic,strong) NSMutableArray *directoryList;
+@property(nonatomic,strong) NSMutableArray *searchList;
 @property(nonatomic,strong) OCFileDto *currentFile;
 @property(nonatomic,strong) OCFileDto *currentFile;
 
 
 - (void)initParserWithData: (NSData*)data;
 - (void)initParserWithData: (NSData*)data;

+ 2 - 2
Libraries external/OCCommunicationLib/OCCommunicationLib/OCWebDavClient/Parsers/OCXMLSearchParser.m

@@ -5,7 +5,7 @@
 
 
 @implementation OCXMLSearchParser
 @implementation OCXMLSearchParser
 
 
-@synthesize directoryList=_directoryList;
+@synthesize searchList=_directoryList;
 @synthesize currentFile=_currentFile;
 @synthesize currentFile=_currentFile;
 
 
 /*
 /*
@@ -14,7 +14,7 @@
  */
  */
 - (void)initParserWithData: (NSData*)data{
 - (void)initParserWithData: (NSData*)data{
     
     
-    _directoryList = [[NSMutableArray alloc]init];
+    _searchList = [NSMutableArray new];
     
     
     NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
     NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
     [parser setDelegate:self];
     [parser setDelegate:self];