Changeset 287 for trunk

Timestamp:

Jan 21, 2010, 9:54:06 PM (15 years ago)

Author:

gav

Message:

First asset tree import working and created a site.

Location:

trunk/grails-app

Files:

• i18n/messages.properties (modified) (1 diff)
• services/CsvService.groovy (modified) (4 diffs)
• views/assetDetailed/importAssetTree.gsp (modified) (2 diffs)

trunk/grails-app/i18n/messages.properties

@@ -1 +1 @@
 asset.tree.import.success=Asset tree imported.
 asset.tree.import.failure=Could not create asset tree from supplied file.
-asset.tree.import.file.over.max.size=Supplied file is over max size.
+asset.tree.import.file.over.max.size=Supplied file is greater than max size of {0} Mbytes.
 asset.tree.import.file.not.supplied=No file supplied.
 asset.tree.import.no.header=The supplied file does not have the correct headers, please see the template file.

trunk/grails-app/services/CsvService.groovy

@@ -11 +11 @@
 
     /**
-    * Import an asset tree for a single asset.
-    * @param file A csv file containing the asset tree for a single asset.
+    * Import an asset tree creating items as required.
+    * @param request The http request to run getFile against.
+    * Get file should return a csv format file containing the asset tree as per template.
     */
     def importAssetTree(request) {
@@ -20 +21 @@
         def fileMaxSize = 10 * megaByteMultiplier //Mb
 
+        def multiPartFile = request.getFile('file')
+
+        InputStreamReader sr = new InputStreamReader(multiPartFile.inputStream)
+        CSVReader reader = new CSVReader(sr)
+
         def fail = { Map m ->
             //status.setRollbackOnly()
-            result.error = [ code: m.code, args: ["Import Asset Tree"] ]
+            reader.close()
+            result.error = [ code: m.code, args: m.args ]
             return result
         }
-
-        def multiPartFile = request.getFile('file')
 
         if(!multiPartFile || multiPartFile.isEmpty())
@@ -32 +37 @@
 
         if (multiPartFile.getSize() > fileMaxSize)
-            return fail(code: "asset.tree.import.file.over.max.size")
+            return fail(code: "asset.tree.import.file.over.max.size", args: [fileMaxSize/megaByteMultiplier])
 
-        InputStreamReader sr = new InputStreamReader(multiPartFile.inputStream)
-        CSVReader reader = new CSVReader(sr)
-
-        def nextLine = reader.readNext()
+        def line = reader.readNext()
         def lineNumber = 1
 
         def header = ["Site", "Section", "Asset", "Sub Asset", "Functional Assembly", "Sub Assembly Group"]
-        if(nextLine != header)
+
+        if(line != header)
             return fail(code: "asset.tree.import.no.header")
 
-        nextLine = reader.readNext()
+        log.info "Import checks passed, start processing asset file."
+
+        // Prepare the first body line.
+        line = reader.readNext()
         lineNumber ++
 
-        while(nextLine) {
+        while(line) {
+            def lineSize = line.size()
+//             log.info lineNumber+ "(" + lineSize + ")" + " : " + line
+
+            if(line[0]) {
+                    if( !Site.findByName(line[0]) )
+                        new Site(name: line[0]).save()
+            }
+
+            line = reader.readNext()
             lineNumber ++
-
-            println lineNumber + " : " + nextLine[0]
-
-//             if(nextLine[0]) {
-//                 if( !Site.findByName(nextLine[0].toString()) )
-//                     println nextLine[0]
-//             }
-
-            nextLine = reader.readNext()
-        } //while(nextLine)
+        } //while(line)
 
         // Success.
+        reader.close()
         return result
 
@@ -77 +84 @@
         //Header
         def header = ["Site", "Section", "Asset", "Sub Asset", "Functional Assembly", "Sub Assembly Group"]
+        def blankLine = []
+        def noteLine = ["Note: the header is required, start by replacing this line."]
+
         writer.writeNext(header as String[])
-
-        //Rows
-        def row
-
-        row = []
-        writer.writeNext(row as String[]) //blank row between assets.
+        writer.writeNext(blankLine as String[])
+        writer.writeNext(noteLine as String[])
 
         writer.close()

trunk/grails-app/views/assetDetailed/importAssetTree.gsp

@@ -12 +12 @@
         <div class="body">
             <g:render template="/shared/messages" />
-            <g:uploadForm action="importAssetTreeSave" enctype="multipart/form-data" onsubmit="return Lightbox.loading();">
+            <g:uploadForm action="importAssetTreeSave" onsubmit="return Lightbox.loading();">
                 <div class="dialog">
                     <table>
@@ -20 +20 @@
                                     <label for="file">File:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean: picture, field: 'file', 'errors')}">
+                                <td valign="top" class="value">
                                     <input type="file" id="file" name="file" size="40"/>
                                 </td>