Fix issues in conversion tool

pkg/units/unitMeasure.go

@@ -39,7 +39,7 @@ var MeasuresMap map[Measure]MeasureData = map[Measure]MeasureData{
 	},
 	Flops: {
 		Long:  "Flops",
-		Short: "Flops",
+		Short: "F",
 		Regex: "^([fF][lL]?[oO]?[pP]?[sS]?)",
 	},
 	Percentage: {

pkg/units/units.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"math"
 	"strings"
+
+	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 )
 
 type unit struct {
@@ -131,6 +133,32 @@ func NormalizeSeries(s []float64, avg float64, us string, nu *string) {
 	*nu = u.Short()
 }
 
+func ConvertUnitString(us string) schema.Unit {
+	var nu schema.Unit
+
+	if us == "CPI" ||
+		us == "IPC" ||
+		us == "load" ||
+		us == "" {
+		nu.Base = us
+		return nu
+	}
+	u := NewUnit(us)
+	p := u.getPrefix()
+	if p.Prefix() != "" {
+		nu.Prefix = p.Prefix()
+	}
+	m := u.getMeasure()
+	d := u.getUnitDenominator()
+	if d.Short() != "inval" {
+		nu.Base = fmt.Sprintf("%s/%s", m.Short(), d.Short())
+	} else {
+		nu.Base = m.Short()
+	}
+
+	return nu
+}
+
 // GetPrefixPrefixFactor creates the default conversion function between two prefixes.
 // It returns a conversation function for the value.
 func GetPrefixPrefixFactor(in Prefix, out Prefix) func(value interface{}) interface{} {