API Search

iOSClient/Networking/OCNetworking.m

@@ -457,16 +457,25 @@
             }
             // ------------------------
             
-            NSString *serverUrl = [NSString stringWithFormat:@"%@/files/%@/", dav, _activeUser];
+            NSString *serverUrl = [NSString stringWithFormat:@"%@/files/%@", dav, _activeUser];
             serverUrl = [itemDto.filePath stringByReplacingOccurrencesOfString:serverUrl withString:@""];
             
+            /* TRIM */
+            if ([serverUrl hasPrefix:@"/"])
+                serverUrl = [serverUrl substringFromIndex:1];
+            if ([serverUrl hasSuffix:@"/"])
+                serverUrl = [serverUrl substringToIndex:[serverUrl length] - 1];
+            /*      */
+            
+            serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addServerUrl:serverUrl];
+            
             NSString *directoryID = [CCCoreData addDirectory:serverUrl date:[NSDate date] permissions:itemDto.permissions activeAccount:_metadataNet.account];
 
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
     
         if ([self.delegate respondsToSelector:@selector(searchSuccess:metadatas:)])
-            [self.delegate searchSuccess:_metadataNet metadatas:nil];
+            [self.delegate searchSuccess:_metadataNet metadatas:metadatas];
         
         [self complete];
         

iOSClient/Utility/CCUtility.m

@@ -436,6 +436,7 @@
     NSString *result;
     
     if (serverUrl == nil || addServerUrl == nil) return nil;
+    if ([addServerUrl isEqualToString:@""]) return serverUrl;
     
     if ([serverUrl isEqualToString:@"/"]) result = [serverUrl stringByAppendingString:addServerUrl];
     else result = [NSString stringWithFormat:@"%@/%@", serverUrl, addServerUrl];
@@ -750,7 +751,7 @@
 
 + (CCMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath activeAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser
 {
-    CCMetadata *metadata = [[CCMetadata alloc] init];
+    CCMetadata *metadata = [CCMetadata new];
     
     metadata.account = activeAccount;
     metadata.cryptated = NO;