Changeset 414 for trunk

Timestamp:

Feb 24, 2010, 4:01:05 PM (15 years ago)

Author:

gav

Message:

Move CsvService to AssetCsvService in preparation for other CSV services.

Location:

trunk/grails-app

Files:

• conf/Config.groovy (modified) (1 diff)
• controllers/AssetDetailedController.groovy (modified) (5 diffs)
• i18n/messages.properties (modified) (2 diffs)
• services/AssetCsvService.groovy (moved) (moved from trunk/grails-app/services/CsvService.groovy) (4 diffs)

trunk/grails-app/conf/Config.groovy

@@ -103 +103 @@
             warn "grails.app.service"
             warn "grails.app.controller"
-            info "grails.app.service.CsvService"
+            info "grails.app.service.AssetCsvService"
             break
     }

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -6 +6 @@
 class AssetDetailedController extends BaseController {
 
-    def csvService
+    def assetCsvService
     def filterService
     def exportService
@@ -61 +61 @@
     */
     def importAssetTreeSave = {
-        def result = csvService.importAssetTree(request)
+        def result = assetCsvService.importAssetTree(request)
 
         if(!result.error)
@@ -80 +80 @@
         response.contentType = ConfigurationHolder.config.grails.mime.types["csv"]
         response.setHeader("Content-disposition", "attachment; filename=AssetTreeTemplate.csv")
-        def s = csvService.buildAssetTreeTemplate()
+        def s = assetCsvService.buildAssetTreeTemplate()
         render s
     }
@@ -90 +90 @@
         response.contentType = ConfigurationHolder.config.grails.mime.types["csv"]
         response.setHeader("Content-disposition", "attachment; filename=AssetTreeTestFile.csv")
-        def s = csvService.buildAssetTreeTest()
+        def s = assetCsvService.buildAssetTreeTest()
         render s
     }
@@ -104 +104 @@
         response.contentType = ConfigurationHolder.config.grails.mime.types["csv"]
         response.setHeader("Content-disposition", "attachment; filename=AssetTree.csv")
-        def s = csvService.buildAssetTree(assetList)
+        def s = assetCsvService.buildAssetTree(assetList)
         render s
     }

trunk/grails-app/i18n/messages.properties

@@ -4 +4 @@
 asset.tree.import.success=Asset tree imported.
 asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}.
-asset.tree.import.file.over.max.size=Supplied file is greater than max size of {0} {1}.
-asset.tree.import.file.not.supplied=No file supplied.
-asset.tree.import.no.header=The supplied file does not have the correct header lines, please see the template file.
+
+inventory.import.success=Inventory imported.
+inventory.import.failure=Could not create inventory from supplied file, failed on line {0}.
 
 asset.copy.method.required=Please select a copy method for sub items.
@@ -138 +138 @@
 default.create.failure={0} could not be created.
 default.optimistic.locking.failure=Another user has updated this item while you were editing, please check the updated values.
+default.file.over.max.size=Supplied file is greater than max size of {0} {1}.
+default.file.not.supplied=No file supplied.
+default.file.no.header=The supplied file does not have the correct header lines, please see the template file.
 
 default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]

trunk/grails-app/services/AssetCsvService.groovy

@@ -7 +7 @@
  * Requires the opencsv jar to be available which is included in the grails-export plugin.
  */
-class CsvService {
+class AssetCsvService {
 
     boolean transactional = false
@@ -36 +36 @@
 
             if(!multiPartFile || multiPartFile.isEmpty())
-                return fail(code: "asset.tree.import.file.not.supplied")
+                return fail(code: "default.file.not.supplied")
 
             if (multiPartFile.getSize() > fileMaxSize)
-                return fail(code: "asset.tree.import.file.over.max.size", args: [fileMaxSize/kByteMultiplier, "kB"])
+                return fail(code: "default.file.over.max.size", args: [fileMaxSize/kByteMultiplier, "kB"])
 
             def columnIndex = 0
@@ -55 +55 @@
                 log.error "Required: " + templateHeaderLine1.toString()
                 log.error "Supplied: " + line.toString()
-                return fail(code: "asset.tree.import.no.header")
+                return fail(code: "default.file.no.header")
             }
 
@@ -67 +67 @@
                 log.error "Required: " + templateHeaderLine2.toString()
                 log.error "Supplied: " + line.toString()
-                return fail(code: "asset.tree.import.no.header")
+                return fail(code: "default.file.no.header")
             }