#1200

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="30l-Wp-khL">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="30l-Wp-khL">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -37,23 +37,23 @@
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="08D-oc-nWS">
                                         <rect key="frame" x="0.0" y="0.0" width="51" height="31"/>
                                         <connections>
-                                            <action selector="valueChangedSwitchNewFiles:" destination="30l-Wp-khL" eventType="valueChanged" id="vG9-tl-Ybg"/>
+                                            <action selector="valueChangedSwitchAlreadyExistingFiles:" destination="30l-Wp-khL" eventType="valueChanged" id="fpu-dJ-1gZ"/>
                                         </connections>
                                     </switch>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ge9-Fi-Rb1">
                                         <rect key="frame" x="340" y="0.0" width="51" height="31"/>
                                         <connections>
-                                            <action selector="valueChangedSwitchAlreadyExistingFiles:" destination="30l-Wp-khL" eventType="valueChanged" id="yFJ-Ri-2WX"/>
+                                            <action selector="valueChangedSwitchNewFiles:" destination="30l-Wp-khL" eventType="valueChanged" id="phX-dq-KR0"/>
                                         </connections>
                                     </switch>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New files" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H7Y-Nu-nJ3">
-                                        <rect key="frame" x="0.0" y="36" width="63" height="24"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Already existing files" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H7Y-Nu-nJ3">
+                                        <rect key="frame" x="0.0" y="36" width="141" height="24"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Already existing files" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Tf-oD-aTF">
-                                        <rect key="frame" x="248" y="36" width="141" height="24"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New files" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Tf-oD-aTF">
+                                        <rect key="frame" x="326" y="36" width="63" height="24"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -146,12 +146,12 @@
                     <connections>
                         <outlet property="buttonCancel" destination="5Nf-YT-2uq" id="cvi-cr-h7O"/>
                         <outlet property="buttonContinue" destination="RU9-v6-zSl" id="IXK-i8-oyK"/>
-                        <outlet property="labelAlreadyExistingFiles" destination="3Tf-oD-aTF" id="3j2-bX-Bgx"/>
-                        <outlet property="labelNewFiles" destination="H7Y-Nu-nJ3" id="NXn-Ip-DVP"/>
+                        <outlet property="labelAlreadyExistingFiles" destination="H7Y-Nu-nJ3" id="0QL-q7-GR8"/>
+                        <outlet property="labelNewFiles" destination="3Tf-oD-aTF" id="DEw-1r-2JB"/>
                         <outlet property="labelSubTitle" destination="bXc-v3-Lun" id="oUd-Zb-Yxc"/>
                         <outlet property="labelTitle" destination="amb-pM-6dC" id="gEU-4f-4Zu"/>
-                        <outlet property="switchAlreadyExistingFiles" destination="ge9-Fi-Rb1" id="QNa-gi-Q0V"/>
-                        <outlet property="switchNewFiles" destination="08D-oc-nWS" id="JLR-fr-6eI"/>
+                        <outlet property="switchAlreadyExistingFiles" destination="08D-oc-nWS" id="VxI-9Q-9YY"/>
+                        <outlet property="switchNewFiles" destination="ge9-Fi-Rb1" id="zy1-W2-UN8"/>
                         <outlet property="tableView" destination="wkN-gS-XKZ" id="rME-eq-aos"/>
                     </connections>
                 </viewController>

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -202,7 +202,7 @@ import Foundation
 extension NCCreateFormUploadConflict: UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 180
+        return 330
     }
 }
 
@@ -222,69 +222,74 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
         
         if let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as? NCCreateFormUploadConflictCell {
             
-            let metadata = metadatasConflict[indexPath.row]
-            let fileNameExtension = (metadata.fileNameView as NSString).pathExtension.lowercased()
-            let fileNameWithoutExtension = (metadata.fileNameView as NSString).deletingPathExtension
-            var fileNameConflict = metadata.fileNameView
+            let metadataNewFile = metadatasConflict[indexPath.row]
+            let fileNameExtension = (metadataNewFile.fileNameView as NSString).pathExtension.lowercased()
+            let fileNameWithoutExtension = (metadataNewFile.fileNameView as NSString).deletingPathExtension
+            var fileNameConflict = metadataNewFile.fileNameView
 
             if fileNameExtension == "heic" && CCUtility.getFormatCompatibility() {
                 fileNameConflict = fileNameWithoutExtension + ".jpg"
             }
 
-            guard let metadataInConflict = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView == %@", metadata.account, metadata.serverUrl, fileNameConflict)) else { return UITableViewCell() }
-            
-            cell.ocId = metadata.ocId
+            cell.ocId = metadataNewFile.ocId
             cell.delegate = self
-            
-            cell.labelFileName.text = metadata.fileNameView
-            cell.labelDetail.text = ""
-            cell.labelDetailNew.text = ""
+            cell.labelFileName.text = metadataNewFile.fileNameView
+            cell.labelDetailAlreadyExistingFile.text = ""
+            cell.labelDetailNewFile.text = ""
 
-            // Image New
-            if metadata.iconName.count > 0 {
-                cell.imageFileNew.image = UIImage.init(named: metadata.iconName)
+            // -----> Already Existing File
+            
+            guard let metadataAlreadyExists = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView == %@", metadataNewFile.account, metadataNewFile.serverUrl, fileNameConflict)) else { return UITableViewCell() }
+            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataAlreadyExists.ocId, fileNameView: metadataAlreadyExists.fileNameView)) {
+                cell.imageAlreadyExistingFile.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadataAlreadyExists.ocId, fileNameView: metadataAlreadyExists.fileNameView))
+            } else {
+                if metadataAlreadyExists.iconName.count > 0 {
+                    cell.imageAlreadyExistingFile.image = UIImage.init(named: metadataAlreadyExists.iconName)
+                } else {
+                    cell.imageAlreadyExistingFile.image = UIImage.init(named: "file")
+                }
+            }
+            cell.labelDetailAlreadyExistingFile.text = CCUtility.dateDiff(metadataAlreadyExists.date as Date) + "\n" + CCUtility.transformedSize(metadataAlreadyExists.size)
+                
+            if metadatasConflictAlreadyExistingFiles.contains(metadataNewFile.ocId) {
+                cell.switchAlreadyExistingFile.isOn = true
+            } else {
+                cell.switchAlreadyExistingFile.isOn = false
+            }
+            
+            
+            // -----> New File
+            
+            if metadataNewFile.iconName.count > 0 {
+                cell.imageNewFile.image = UIImage.init(named: metadataNewFile.iconName)
             } else {
-                cell.imageFileNew.image = UIImage.init(named: "file")
+                cell.imageNewFile.image = UIImage.init(named: "file")
             }
-            // Image New < Preview >
-            if metadata.assetLocalIdentifier.count > 0 {
-                let result = PHAsset.fetchAssets(withLocalIdentifiers: [metadata.assetLocalIdentifier], options: nil)
+            if metadataNewFile.assetLocalIdentifier.count > 0 {
+                let result = PHAsset.fetchAssets(withLocalIdentifiers: [metadataNewFile.assetLocalIdentifier], options: nil)
                 if result.count == 1 {
                     PHImageManager.default().requestImage(for: result.firstObject!, targetSize: CGSize(width: 200, height: 200), contentMode: PHImageContentMode.aspectFill, options: nil) { (image, info) in
-                        cell.imageFileNew.image = image
+                        cell.imageNewFile.image = image
                     }
                     
                     let resource = PHAssetResource.assetResources(for: result.firstObject!)
                     let size = resource.first?.value(forKey: "fileSize") as! Double
                     let date = result.firstObject!.modificationDate
                     
-                    cell.labelDetail.text = CCUtility.dateDiff(date) + "\n" + CCUtility.transformedSize(size)
+                    cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + CCUtility.transformedSize(size)
                 }                
             }
-        
-            // Image
-            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict.ocId, fileNameView: metadataInConflict.fileNameView)) {
-                cell.imageFile.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict.ocId, fileNameView: metadataInConflict.fileNameView))
-            } else {
-                if metadataInConflict.iconName.count > 0 {
-                    cell.imageFile.image = UIImage.init(named: metadataInConflict.iconName)
-                } else {
-                    cell.imageFile.image = UIImage.init(named: "file")
-                }
-            }
             
-            cell.labelDetailNew.text = CCUtility.dateDiff(metadataInConflict.date as Date) + "\n" + CCUtility.transformedSize(metadataInConflict.size)
-                        
-            if metadatasConflictNewFiles.contains(metadata.ocId) {
+            if metadatasConflictNewFiles.contains(metadataNewFile.ocId) {
                 cell.switchNewFile.isOn = true
             } else {
                 cell.switchNewFile.isOn = false
             }
-            
-            if metadatasConflictAlreadyExistingFiles.contains(metadata.ocId) {
-                cell.switchAlreadyExistingFile.isOn = true
-            } else {
-                cell.switchAlreadyExistingFile.isOn = false
+        
+            // Hide switch if only one
+            if metadatasConflict.count == 1 {
+                cell.switchAlreadyExistingFile.isHidden = true
+                cell.switchNewFile.isHidden = true
             }
             
             return cell

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.swift

@@ -27,14 +27,14 @@ class NCCreateFormUploadConflictCell: UITableViewCell {
     
     @IBOutlet weak var labelFileName: UILabel!
 
-    @IBOutlet weak var imageFile: UIImageView!
-    @IBOutlet weak var imageFileNew: UIImageView!
+    @IBOutlet weak var imageAlreadyExistingFile: UIImageView!
+    @IBOutlet weak var imageNewFile: UIImageView!
 
-    @IBOutlet weak var labelDetail: UILabel!
-    @IBOutlet weak var labelDetailNew: UILabel!
+    @IBOutlet weak var labelDetailAlreadyExistingFile: UILabel!
+    @IBOutlet weak var labelDetailNewFile: UILabel!
 
-    @IBOutlet weak var switchNewFile: UISwitch!
     @IBOutlet weak var switchAlreadyExistingFile: UISwitch!
+    @IBOutlet weak var switchNewFile: UISwitch!
     
     var delegate: NCCreateFormUploadConflictCellDelegate?
     var ocId: String = ""

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.xib

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="275" id="eGO-5i-ez1" customClass="NCCreateFormUploadConflictCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="641" height="275"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="325" id="eGO-5i-ez1" customClass="NCCreateFormUploadConflictCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="641" height="330"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="eGO-5i-ez1" id="y6Q-vz-Xda">
-                <rect key="frame" x="0.0" y="0.0" width="641" height="275"/>
+                <rect key="frame" x="0.0" y="0.0" width="641" height="330"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WSQ-HI-Wkg">
-                        <rect key="frame" x="5" y="34.5" width="50" height="50"/>
+                        <rect key="frame" x="5" y="34.5" width="200" height="200"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="50" id="cfG-23-jOI"/>
-                            <constraint firstAttribute="height" constant="50" id="hzO-CU-dTl"/>
+                            <constraint firstAttribute="width" constant="200" id="cfG-23-jOI"/>
+                            <constraint firstAttribute="height" constant="200" id="hzO-CU-dTl"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hv8-qJ-lkR">
@@ -30,7 +30,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0hq-re-YVn">
-                        <rect key="frame" x="598.5" y="94.5" width="37.5" height="40"/>
+                        <rect key="frame" x="598.5" y="244.5" width="37.5" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="5Ed-pm-3oc"/>
                         </constraints>
@@ -39,26 +39,26 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FUL-4V-OgL">
-                        <rect key="frame" x="5" y="234" width="51" height="31"/>
+                        <rect key="frame" x="5" y="289" width="51" height="31"/>
                         <connections>
-                            <action selector="valueChangedSwitchNewFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="s5p-Ao-3Ty"/>
+                            <action selector="valueChangedSwitchAlreadyExistingFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="rl3-mU-JUb"/>
                         </connections>
                     </switch>
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jBi-8r-tc5">
-                        <rect key="frame" x="587" y="234" width="51" height="31"/>
+                        <rect key="frame" x="587" y="289" width="51" height="31"/>
                         <connections>
-                            <action selector="valueChangedSwitchAlreadyExistingFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="MVS-Uv-X6e"/>
+                            <action selector="valueChangedSwitchNewFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="c2y-L9-O5M"/>
                         </connections>
                     </switch>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Tx2-JG-GGa">
-                        <rect key="frame" x="586" y="34.5" width="50" height="50"/>
+                        <rect key="frame" x="436" y="34.5" width="200" height="200"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="50" id="EvS-Tl-Lkx"/>
-                            <constraint firstAttribute="width" constant="50" id="brj-dv-3FM"/>
+                            <constraint firstAttribute="height" constant="200" id="EvS-Tl-Lkx"/>
+                            <constraint firstAttribute="width" constant="200" id="brj-dv-3FM"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qye-6B-5aj">
-                        <rect key="frame" x="5" y="94.5" width="37.5" height="40"/>
+                        <rect key="frame" x="5" y="244.5" width="37.5" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="j5h-pt-EoN"/>
                         </constraints>
@@ -86,15 +86,15 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="imageFile" destination="Tx2-JG-GGa" id="b00-10-AN8"/>
-                <outlet property="imageFileNew" destination="WSQ-HI-Wkg" id="JRg-97-v7V"/>
-                <outlet property="labelDetail" destination="Qye-6B-5aj" id="Yb3-su-na8"/>
-                <outlet property="labelDetailNew" destination="0hq-re-YVn" id="TFQ-C0-v8p"/>
-                <outlet property="labelFileName" destination="Hv8-qJ-lkR" id="g4W-UF-h47"/>
-                <outlet property="switchAlreadyExistingFile" destination="jBi-8r-tc5" id="L0M-zb-k6v"/>
-                <outlet property="switchNewFile" destination="FUL-4V-OgL" id="jhA-7N-hqA"/>
+                <outlet property="imageAlreadyExistingFile" destination="WSQ-HI-Wkg" id="UZ4-Ge-Y8W"/>
+                <outlet property="imageNewFile" destination="Tx2-JG-GGa" id="CMr-tc-j3c"/>
+                <outlet property="labelDetailAlreadyExistingFile" destination="Qye-6B-5aj" id="vf5-T4-Qqe"/>
+                <outlet property="labelDetailNewFile" destination="0hq-re-YVn" id="Mel-BD-cS5"/>
+                <outlet property="labelFileName" destination="Hv8-qJ-lkR" id="vG5-AF-PvG"/>
+                <outlet property="switchAlreadyExistingFile" destination="FUL-4V-OgL" id="yFw-66-e0V"/>
+                <outlet property="switchNewFile" destination="jBi-8r-tc5" id="5Vk-YA-HeS"/>
             </connections>
-            <point key="canvasLocation" x="173.18840579710147" y="73.995535714285708"/>
+            <point key="canvasLocation" x="173.18840579710147" y="92.410714285714278"/>
         </tableViewCell>
     </objects>
 </document>