Changeset 1262

Timestamp:

04/29/11 09:20:21 (13 years ago)

Author:

twagoo

Message:

When submitting import, update local XML with values from import form

Location:

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• importer/Importer.mxml (modified) (4 diffs)
• services/UploadService.as (modified) (2 diffs)

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/importer/Importer.mxml

@@ -30 +30 @@
                         private var importTypeString:String = "";
 
+                        private var loadedXML:XML;
+
                         private function submit(event:Event):void {
                                 if (validate()) {
@@ -40 +42 @@
                                         item.isProfile = isProfile;
                                         item.isInUserSpace = true; //We only allow import into workspace it can be published from there.
-                                        uploadSrv.upload(UploadService.NEW, item);
+                                        if (loadedXML) {
+                                                updateXMLFromFormFields(loadedXML);
+                                                uploadSrv.upload(UploadService.NEW, item, loadedXML.toXMLString());
+                                        } else {
+                                                // No loaded XML. Let the upload service try with file reference
+                                                uploadSrv.upload(UploadService.NEW, item);
+                                        }
                                 }
                         }
@@ -80 +88 @@
                                         try {
                                                 var utfBytes:String = data.readUTFBytes(data.length);
-                                                var resultXml:XML = new XML(utfBytes);
+                                                loadedXML = new XML(utfBytes);
 
                                                 // New file selected, clear all previous entries
                                                 clearForm();
                                                 // Set import type (profile or component) from attribute in XML
-                                                setImportTypeFromFile(resultXml);
+                                                setImportTypeFromFile(loadedXML);
                                                 // Set name, description from values in XML
-                                                setFormFieldsFromFile(resultXml);
+                                                setFormFieldsFromFile(loadedXML);
                                         } catch (error:Error) {
                                                 Alert.show("Could not read the selected file. Not a valid XML file?", "Error");
@@ -107 +115 @@
 
                         private function setFormFieldsFromFile(resultXml:XML):void {
-                                if (resultXml.hasOwnProperty("Header")) {
-                                        var nodes:XMLList = resultXml.Header;
+                                var header:XML = getHeaderXML(resultXml);
+                                if (header) {
+                                        nameInput.text = header.Name;
+                                        description.text = header.Description;
+                                }
+                        }
+
+                        private function updateXMLFromFormFields(xml:XML):void {
+                                var header:XML = getHeaderXML(xml);
+                                if (header) {
+                                        header.Name = nameInput.text;
+                                        header.Description = description.text;
+                                }
+                        }
+
+                        private function getHeaderXML(xml:XML):XML {
+                                if (xml.hasOwnProperty("Header")) {
+                                        var nodes:XMLList = xml.Header;
                                         if (nodes && nodes.length() > 0) {
-                                                var header:XML = nodes[0];
-                                                nameInput.text = header.Name;
-                                                description.text = header.Description;
-                                        }
-                                }
+                                                return nodes[0];
+                                        }
+                                }
+                                return null;
                         }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/UploadService.as

@@ -3 +3 @@
         import clarin.cmdi.componentregistry.importer.FileLoadedEvent;
         import clarin.cmdi.componentregistry.importer.UploadCompleteEvent;
-
+        
         import com.adobe.net.URI;
-
+        
         import flash.events.Event;
         import flash.events.HTTPStatusEvent;
@@ -15 +15 @@
         import flash.net.URLVariables;
         import flash.utils.ByteArray;
-
+        
         import mx.controls.ProgressBar;
         import mx.managers.CursorManager;
-
+        
         import ru.inspirit.net.MultipartURLLoader;