Merge pull request #1059 from WildMeOrg/measurement-sampling-protocol-in-bulk-import

Import sampling protocol

Author: naknomum

src/main/java/org/ecocean/servlet/importer/StandardImport.java

@@ -988,18 +988,27 @@ public Encounter loadEncounter(Row row, ArrayList<Annotation> annotations, Strin
         for (int bg = 0; bg < numMeasureVals; bg++) {
             // by index
             String colName = "Encounter.measurement" + bg;
-            Double val = getDouble(row, colName, colIndexMap, verbose, missingColumns,
-                unusedColumns, feedback);
+            String samplingProtocolName = colName+".samplingProtocol";
+            String samplingProtocol="";
+
+            Double val = getDouble(row, colName, colIndexMap, verbose, missingColumns, unusedColumns, feedback);
 
             //if Encounter.measurementX is not found, then look for Encounter.measurementName from commonConfiguration.properties
             if(val==null) {
             	colName = "Encounter."+measureVals.get(bg);
+            	samplingProtocolName = colName+".samplingProtocol";
             	val = getDouble(row, colName, colIndexMap, verbose, missingColumns, unusedColumns, feedback);
             }
 
+            //get sampling protocol name
+            String samplingProtocolVal = getString(row, samplingProtocolName, colIndexMap, verbose, missingColumns, unusedColumns, feedback);
+            if(samplingProtocolVal!=null) {
+            	samplingProtocol=samplingProtocolVal;
+            }
+            
             if (val != null) {
                 Measurement valMeas = new Measurement(encID, measureVals.get(bg), val,
-                    measureUnits.get(bg), "");
+                    measureUnits.get(bg), samplingProtocol);
                 if (committing) enc.setMeasurement(valMeas, myShepherd);
                 if (unusedColumns != null) unusedColumns.remove(colName);
             }
@@ -1009,7 +1018,7 @@ public Encounter loadEncounter(Row row, ArrayList<Annotation> annotations, Strin
                 feedback);
             if (val != null) {
                 Measurement valMeas = new Measurement(encID, measureVals.get(bg), val,
-                    measureUnits.get(bg), "");
+                    measureUnits.get(bg), samplingProtocol);
                 if (committing) enc.setMeasurement(valMeas, myShepherd);
                 if (unusedColumns != null) unusedColumns.remove(colName);
             }