Changeset 426

Timestamp:

Mar 3, 2010, 6:20:20 PM (14 years ago)

Author:

gav

Message:

Small improvements to InventoryCsvService, increase max file size, capitalise and protect parse against nulls.

File:

• trunk/grails-app/services/InventoryCsvService.groovy (modified) (16 diffs)

trunk/grails-app/services/InventoryCsvService.groovy

@@ -27 +27 @@
 
             def kByteMultiplier = 1000
-            def fileMaxSize = 500 * kByteMultiplier
+            def fileMaxSize = 800 * kByteMultiplier
             def logFileLink = g.link(controller: "appCore", action: "appLog") {"log"}
 
@@ -82 +82 @@
 
             def tempSuppliers = []
+            def tempSupplierItem = ''
+            def tempSupplierType = ''
             def tempSupplierItemAndType = []
             def tempManufacturers = []
+            def tempManufacturerItem = ''
+            def tempManufacturerType = ''
             def tempManufacturerItemAndType = []
 
@@ -113 +117 @@
 
             def parseInputList = {
-                if(it.trim() == '') return []
+                if( (it == null) || (it.trim() == '') ) return []
                 return it.split(";").collect{it.trim()}
             }
@@ -160 +164 @@
 
                 // Parse the line into the params map.
-                /** TODO: capitalize and capitalizeFully.*/
                 inventoryParams = [:]
                 line.eachWithIndex { it, j ->
@@ -180 +183 @@
 
                 // Site
+                inventoryParams.site = WordUtils.capitalize(inventoryParams.site)
                 siteInstance = Site.findByName(inventoryParams.site)
                 if(!siteInstance) {
@@ -190 +194 @@
 
                 // InventoryStore
+                inventoryParams.inventoryStore = WordUtils.capitalizeFully(inventoryParams.inventoryStore)
                 inventoryStoreInstance = InventoryStore.findByName(inventoryParams.inventoryStore)
                 if(!inventoryStoreInstance) {
@@ -201 +206 @@
 
                 // InventoryLocation
+                inventoryParams.inventoryLocation = WordUtils.capitalize(inventoryParams.inventoryLocation)
                 inventoryLocationInstance = InventoryLocation.findByName(inventoryParams.inventoryLocation)
                 if(!inventoryLocationInstance) {
@@ -212 +218 @@
 
                 // InventoryGroup
+                inventoryParams.inventoryLocation = WordUtils.capitalizeFully(inventoryParams.inventoryLocation)
                 inventoryGroupInstance = InventoryGroup.findByName(inventoryParams.inventoryGroup)
                 if(!inventoryGroupInstance) {
@@ -222 +229 @@
 
                 // InventoryType
+                inventoryParams.inventoryType = WordUtils.capitalizeFully(inventoryParams.inventoryType)
                 inventoryTypeInstance = InventoryType.findByName(inventoryParams.inventoryType)
                 if(!inventoryTypeInstance) {
@@ -256 +264 @@
                 for(tempManufacturer in tempManufacturers) {
                     tempManufacturerItemAndType = parseItemAndType(tempManufacturer)
-
-                    manufacturerInstance = Manufacturer.findByName(tempManufacturerItemAndType[0])
+                    tempManufacturerItem = WordUtils.capitalizeFully(tempManufacturerItemAndType[0])
+
+                    manufacturerInstance = Manufacturer.findByName(tempManufacturerItem)
                     if(!manufacturerInstance) {
 
                         // ManufacturerType.
-                        if(tempManufacturerItemAndType.size == 2)
-                            manufacturerTypeInstance = ManufacturerType.findByName(tempManufacturerItemAndType[1])
+                        if(tempManufacturerItemAndType.size == 2) {
+                            tempManufacturerType = WordUtils.capitalizeFully(tempManufacturerItemAndType[1])
+                            manufacturerTypeInstance = ManufacturerType.findByName(tempManufacturerType)
+                        }
                         else
                             manufacturerTypeInstance = manufacturerTypeUnknown
@@ -270 +281 @@
                         }
 
-                        manufacturerInstance = new Manufacturer(name: tempManufacturerItemAndType[0],
+                        manufacturerInstance = new Manufacturer(name: tempManufacturerItem,
                                                                                                 manufacturerType: manufacturerTypeInstance)
                         if(!manufacturerInstance.save()) {
@@ -287 +298 @@
                 for(tempSupplier in tempSuppliers) {
                     tempSupplierItemAndType = parseItemAndType(tempSupplier)
-
-                    supplierInstance = Supplier.findByName(tempSupplierItemAndType[0])
+                    tempSupplierItem = WordUtils.capitalizeFully(tempSupplierItemAndType[0])
+
+                    supplierInstance = Supplier.findByName(tempSupplierItem)
                     if(!supplierInstance) {
 
                         // SupplierType.
-                        if(tempSupplierItemAndType.size == 2)
-                            supplierTypeInstance = SupplierType.findByName(tempSupplierItemAndType[1])
+                        if(tempSupplierItemAndType.size == 2) {
+                            tempSupplierType = WordUtils.capitalizeFully(tempSupplierItemAndType[1])
+                            supplierTypeInstance = SupplierType.findByName(tempSupplierType)
+                        }
                         else
                             supplierTypeInstance = supplierTypeUnknown
@@ -301 +315 @@
                         }
 
-                        supplierInstance = new Supplier(name: tempSupplierItemAndType[0],
+                        supplierInstance = new Supplier(name: tempSupplierItem,
                                                                             supplierType: supplierTypeInstance)
                         if(!supplierInstance.save()) {
@@ -317 +331 @@
 
                 for(tempAlternateItem in tempAlternateItems) {
-
+                    tempAlternateItem = WordUtils.capitalize(tempAlternateItem)
                     alternateItemInstance = InventoryItem.findByName(tempAlternateItem)
                     if(!alternateItemInstance) {
@@ -342 +356 @@
                 for(asset in tempSpareFor) {
 
-                    println ''
-                    println 'asset: '+asset
-                    println ''
+                    asset = WordUtils.capitalize(asset)
 
                     spareForInstance = Asset.findByName(asset)
@@ -361 +373 @@
                 inventoryParams.unitOfMeasure = unitOfMeasureInstance
                 inventoryParams.averageDeliveryPeriod = averageDeliveryPeriodInstance
+
+                // Format remaining properties.
+                inventoryParams.name = WordUtils.capitalize(inventoryParams.name)
+                inventoryParams.description = inventoryParams.description[0].toUpperCase() + inventoryParams.description[1..-1]
 
                 // Debug