[OFBiz] SVN: r5637 - trunk/framework/common/data

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-09-03 07:08:43 -0500 (Sat, 03 Sep 2005)
New Revision: 5637

Modified:
   trunk/framework/common/data/CommonTypeData.xml
   trunk/framework/common/data/UnitData.xml
Log:
Added some unit data for data size and data transfter speed

Modified: trunk/framework/common/data/CommonTypeData.xml
===================================================================
--- trunk/framework/common/data/CommonTypeData.xml	2005-09-03 12:07:21 UTC (rev 5636)
+++ trunk/framework/common/data/CommonTypeData.xml	2005-09-03 12:08:43 UTC (rev 5637)
@@ -56,6 +56,8 @@
     <StatusItem description="Synchronized" sequenceId="02" statusCode="SYNCHRONIZED" statusId="SYNCHRONIZED" statusTypeId="SYNCHRONIZE_STATUS"/>
 
     <UomType description="Currency" hasTable="N" parentTypeId="" uomTypeId="CURRENCY_MEASURE"/>
+    <UomType description="Data Size" hasTable="N" parentTypeId="" uomTypeId="DATA_MEASURE"/>
+    <UomType description="Data Speed" hasTable="N" parentTypeId="" uomTypeId="DATASPD_MEASURE"/>
     <UomType description="Time/Frequency" hasTable="N" parentTypeId="" uomTypeId="TIME_FREQ_MEASURE"/>
     <UomType description="Length" hasTable="N" parentTypeId="" uomTypeId="LENGTH_MEASURE"/>
     <UomType description="Area" hasTable="N" parentTypeId="" uomTypeId="AREA_MEASURE"/>

Modified: trunk/framework/common/data/UnitData.xml
===================================================================
--- trunk/framework/common/data/UnitData.xml	2005-09-03 12:07:21 UTC (rev 5636)
+++ trunk/framework/common/data/UnitData.xml	2005-09-03 12:08:43 UTC (rev 5637)
@@ -4,7 +4,45 @@
       NOTE: All UomConversion conversionFactors are multipliers to change from uomId to uomIdTo.
       In other words there is 1 uomId for conversionFactor uomIdTos, for instance 1 minute for 60 seconds.
     -->
+    
+    <!-- =============== DATA_MEASURE =============== -->
+    <Uom abbreviation="b" description="Bit of Data" uomId="DATA_b" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="Kb" description="Kilobit of Data" uomId="DATA_Kb" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="Mb" description="Megabit of Data" uomId="DATA_Mb" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="Gb" description="Gigabit of Data" uomId="DATA_Gb" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="Tb" description="Terabit of Data" uomId="DATA_Tb" uomTypeId="DATA_MEASURE"/>
 
+    <Uom abbreviation="B" description="Byte of Data" uomId="DATA_B" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="KB" description="Kilobyte of Data" uomId="DATA_KB" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="MB" description="Megabyte of Data" uomId="DATA_MB" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="GB" description="Gigabyte of Data" uomId="DATA_GB" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="TB" description="Terabyte of Data" uomId="DATA_TB" uomTypeId="DATA_MEASURE"/>
+    <Uom abbreviation="PB" description="Petabyte of Data" uomId="DATA_PB" uomTypeId="DATA_MEASURE"/>
+    
+    <UomConversion uomId="DATA_Kb" uomIdTo="DATA_b" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_Mb" uomIdTo="DATA_Kb" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_Gb" uomIdTo="DATA_Mb" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_Tb" uomIdTo="DATA_Gb" conversionFactor="1024"/>
+
+    <UomConversion uomId="DATA_B" uomIdTo="DATA_b" conversionFactor="8"/>
+    <UomConversion uomId="DATA_KB" uomIdTo="DATA_B" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_MB" uomIdTo="DATA_KB" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_GB" uomIdTo="DATA_MB" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_TB" uomIdTo="DATA_GB" conversionFactor="1024"/>
+    <UomConversion uomId="DATA_PB" uomIdTo="DATA_TB" conversionFactor="1024"/>
+
+    <!-- =============== DATASPD_MEASURE =============== -->
+    <Uom abbreviation="bps" description="Bit-per-second of Data" uomId="DATASPD_bps" uomTypeId="DATASPD_MEASURE"/>
+    <Uom abbreviation="Kbps" description="Kilobit-per-second of Data" uomId="DATASPD_Kbps" uomTypeId="DATASPD_MEASURE"/>
+    <Uom abbreviation="Mbps" description="Megabit-per-second of Data" uomId="DATASPD_Mbps" uomTypeId="DATASPD_MEASURE"/>
+    <Uom abbreviation="Gbps" description="Gigabit-per-second of Data" uomId="DATASPD_Gbps" uomTypeId="DATASPD_MEASURE"/>
+    <Uom abbreviation="Tbps" description="Terabit-per-second of Data" uomId="DATASPD_Tbps" uomTypeId="DATASPD_MEASURE"/>
+
+    <UomConversion uomId="DATASPD_Kbps" uomIdTo="DATASPD_bps" conversionFactor="1024"/>
+    <UomConversion uomId="DATASPD_Mbps" uomIdTo="DATASPD_Kbps" conversionFactor="1024"/>
+    <UomConversion uomId="DATASPD_Gbps" uomIdTo="DATASPD_Mbps" conversionFactor="1024"/>
+    <UomConversion uomId="DATASPD_Tbps" uomIdTo="DATASPD_Gbps" conversionFactor="1024"/>
+    
     <!-- =============== TIME_FREQ_MEASURE =============== -->
     <Uom abbreviation="ms" description="Time in Milli-Seconds" uomId="TF_ms" uomTypeId="TIME_FREQ_MEASURE"/>
     <Uom abbreviation="s" description="Time in Seconds" uomId="TF_s" uomTypeId="TIME_FREQ_MEASURE"/>