Changeset 798

Timestamp:

01/23/09 16:41:54 (4 years ago)

Author:

anthony

Message:

i don't remember but it fixes something

Location:

trunk

Files:

• mpdb-common/src/edu/rpi/metpetdb/client/model/properties/PropertyUtils.java (modified) (1 diff)
• mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewAnalysisParser.java (modified) (6 diffs)
• mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewImageParser.java (modified) (1 diff)
• mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewParser.java (modified) (6 diffs)
• mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewSampleParser.java (modified) (1 diff)

trunk/mpdb-common/src/edu/rpi/metpetdb/client/model/properties/PropertyUtils.java

@@ -21 +21 @@
                                 return new Float(Float.parseFloat(o.toString())).intValue();
                         }
+                } else if (o instanceof Float) {
+                        return ((Float) o).intValue();
                 } else
                         return null;

trunk/mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewAnalysisParser.java

@@ -33 +33 @@
         // Maps an oxide/element name to their precision unit
         private final Map<String, String> precisionUnits;
-        //Oxides/Elements that are in this bulk upload process
+        // Oxides/Elements that are in this bulk upload process
         private final Map<String, Element> uploadElements;
         private final Map<String, Oxide> uploadOxides;
@@ -78 +78 @@
          * 
          * @param is
-         *              the input stream that points to a spreadsheet
+         *            the input stream that points to a spreadsheet
          * @throws MpDbException
          * @throws InvalidFormatException
@@ -90 +90 @@
                 uploadOxides = new HashMap<String, Oxide>();
         }
-        
+
         public void parse() {
-                //data starts on row 1 for chemical analyses
+                // data starts on row 1 for chemical analyses
                 parse(1);
         }
@@ -177 +177 @@
         @Override
         protected boolean parseColumnSpecialCase(HSSFRow row, HSSFCell cell,
-                        PropertyConstraint pc, ChemicalAnalysis currentObject)
-                        throws IllegalArgumentException, IllegalAccessException,
-                        InvocationTargetException {
+                        PropertyConstraint pc, ChemicalAnalysis currentObject,
+                        Integer cellNum) throws IllegalArgumentException,
+                        IllegalAccessException, InvocationTargetException {
                 final String headerText = headers.get(cell.getColumnIndex())
                                 .getHeaderText();
@@ -185 +185 @@
                         final ChemicalAnalysisElement element = new ChemicalAnalysisElement();
                         element.setElement(uploadElements.get(headerText));
-                        element.setAmount(Float.parseFloat(sanitizeNumber(cell.toString())));
+                        element
+                                        .setAmount(getFloatValue(cell.toString()));
                         element.setMeasurementUnit(measurementUnits.get(headerText));
                         // see if our next column is our precision
                         if (spreadSheetColumnMapping.get(cell.getColumnIndex() + 1) == doc.ChemicalAnalysisElement_ChemicalAnalysis_elements_precision) {
-                                element.setPrecision(Float.parseFloat(sanitizeNumber(row
-                                                .getCell(cell.getColumnIndex() + 1).toString())));
+                                cell = row.getCell(cell.getColumnIndex() + 1);
+                                ++cellNum;
+                                element.setPrecision(getFloatValue(cell.toString()));
                                 element.setPrecisionUnit(precisionUnits.get(headers.get(
                                                 cell.getColumnIndex()).getHeaderText()));
@@ -200 +202 @@
                         final ChemicalAnalysisOxide oxide = new ChemicalAnalysisOxide();
                         oxide.setOxide(uploadOxides.get(headerText));
-                        oxide.setAmount(Float.parseFloat(sanitizeNumber(cell.toString())));
-                        oxide.setMeasurementUnit(measurementUnits.get(headerText).toUpperCase());
+                        oxide.setAmount(getFloatValue(cell.toString()));
+                        oxide.setMeasurementUnit(measurementUnits.get(headerText)
+                                        .toUpperCase());
                         // see if our next column is our precision
                         if (spreadSheetColumnMapping.get(cell.getColumnIndex() + 1) == doc.ChemicalAnalysisOxide_ChemicalAnalysis_oxides_precision) {
-                                oxide.setPrecision(Float.parseFloat(sanitizeNumber(row.getCell(
-                                                cell.getColumnIndex() + 1).toString())));
-                                oxide.setPrecisionUnit(precisionUnits.get(headers.get(
-                                                cell.getColumnIndex()).getHeaderText()).toUpperCase());
+                                cell = row.getCell(cell.getColumnIndex() + 1);
+                                ++cellNum;
+                                oxide.setPrecision(getFloatValue(cell.toString()));
+                                oxide.setPrecisionUnit(precisionUnits.get(
+                                                headers.get(cell.getColumnIndex()).getHeaderText())
+                                                .toUpperCase());
                         }
                         oxide.setMinMax();

trunk/mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewImageParser.java

@@ -105 +105 @@
         @Override
         protected boolean parseColumnSpecialCase(HSSFRow row, HSSFCell cell,
-                        PropertyConstraint pc, BulkUploadImage currentObject)
+                        PropertyConstraint pc, BulkUploadImage currentObject, Integer cellNum)
                         throws IllegalArgumentException, IllegalAccessException,
                         InvocationTargetException {

trunk/mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewParser.java

@@ -230 +230 @@
 
                 for (Integer i = 0; i <= row.getLastCellNum(); ++i) {
-                        final HSSFCell cell = row.getCell(i.intValue());
+                        HSSFCell cell = row.getCell(i.intValue());
                         try {
                                 // get the constraint for this cell
@@ -236 +236 @@
 
                                 if (pc != null && cell != null && !cell.toString().equals("")
-                                                && !parseColumnSpecialCase(row, cell, pc, newObject)) {
+                                                && !parseColumnSpecialCase(row, cell, pc, newObject, i)) {
 
                                         if (pc == doc.Subsample_subsampleType) {
@@ -278 +278 @@
                                                                                         .equals(("BulkUploadImage"))))) {
                                                 if (pc instanceof NumberConstraint<?>) {
-                                                        // Santize numbers before setting them on the object
-                                                        final String data = sanitizeNumber(cell.toString());
-                                                        newObject.mSet(pc.property, data);
+                                                        newObject.mSet(pc.property, getFloatValue(cell.toString()));
                                                 } else if (pc instanceof TimestampConstraint) {
                                                         // handle dates differently
@@ -341 +339 @@
                                                                 .toString()));
                         } catch (Exception e) {
+                                e.printStackTrace();
                                 errors.put(rowindex + 1, new BulkUploadError(rowindex + 1,
                                                 i + 1, new GenericDAOException(e.getMessage()), cell
@@ -355 +354 @@
 
         protected abstract T getNewObject();
+        
+        protected Float getFloatValue(final String number) {
+                final String data = sanitizeNumber(number);
+                if (data.equals("")) {
+                        throw new NumberFormatException("Unable to convert '" + number +  "' to a number");
+                }
+                return Float.parseFloat(data);
+        }
 
         /**
@@ -368 +375 @@
          * @throws InvocationTargetException
          */
-        protected abstract boolean parseColumnSpecialCase(final HSSFRow row,
-                        final HSSFCell cell, final PropertyConstraint pc,
-                        final T currentObject) throws IllegalArgumentException,
+        protected abstract boolean parseColumnSpecialCase(HSSFRow row,
+                        HSSFCell cell, final PropertyConstraint pc,
+                        final T currentObject, Integer cellNum) throws IllegalArgumentException,
                         IllegalAccessException, InvocationTargetException;
 

trunk/mpdb-server/src/edu/rpi/metpetdb/server/bulk/upload/NewSampleParser.java

@@ -107 +107 @@
         @Override
         protected boolean parseColumnSpecialCase(HSSFRow row, HSSFCell cell,
-                        PropertyConstraint pc, Sample currentObject)
+                        PropertyConstraint pc, Sample currentObject, Integer cellNum)
                         throws IllegalArgumentException, IllegalAccessException,
                         InvocationTargetException {