perfsonar development work

Author: roman
Date: 2006-08-11 04:25:44 -0400 (Fri, 11 Aug 2006)
New Revision: 1536

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManager.java
Log:
unit is replaced by valueUnits in metadata configuration file

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManager.java
  2006-08-10 12:07:52 UTC (rev 1535)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/RRDStorageManager.java
  2006-08-11 08:25:44 UTC (rev 1536)
@@ -321,7 +321,7 @@
             Parameter resolution            = 
key.getParameterByName("resolution");
             Parameter file                  = key.getParameterByName("file");
             Parameter dataSource            = 
key.getParameterByName("dataSource");
-            Parameter unit                  = key.getParameterByName("unit");
+            Parameter valueUnits            = 
key.getParameterByName("valueUnits");
 
 
             // ---------------
@@ -332,7 +332,7 @@
             String _resolution            = null;
             String _file                  = null;
             String _dataSource            = null;
-            String _unit                  = null;
+            String _valueUnits            = null;
 
 
             try {
@@ -360,9 +360,9 @@
             }
 
             try {
-                _unit = unit.getParameterValue();
+                _valueUnits = valueUnits.getParameterValue();
             } catch (Exception ex) {
-                _unit = "unknown";
+                _valueUnits = "unknown";
             }
 
             _file = file.getParameterValue();
@@ -423,7 +423,7 @@
                         __endTime,
                         __resolution);
 
-                Data data = getRRDColumn(fdata, _dataSource, _unit);
+                Data data = getRRDColumn(fdata, _dataSource, _valueUnits);
                 rrdDataSet.setData(data);
 
             } catch (RrdException se) {
@@ -531,7 +531,7 @@
      *  @author romradz
      *  @author mac
      */
-    private Data getRRDColumn(FetchData data, String dataSource, String unit)
+    private Data getRRDColumn(FetchData data, String dataSource, String 
valueUnits)
         throws DataFormatException {
 
         int rows = data.getRowCount();
@@ -556,7 +556,7 @@
                 Datum datum = new Datum();
                 datum.setTimeValue(Long.toString(data.getTimestamp(i + 1)));
                 datum.setValue(Double.toString(data.getValue(i, ds)));
-                datum.setValueUnits(unit);
+                datum.setValueUnits(valueUnits);
                 _data.addChild(datum);
 
             }