Commit b93765e4 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bugs fixed in go-packages/meep-sss-mgr/onem2m-mgr.go

parent 8c7b7c4e

go-apps/meep-sss/sbi/sss-sbi.go

+22 −0
Changes for go-apps/meep-sss/sbi/sss-sbi.go: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -394,6 +394,9 @@ func GetSensorData(sensorIdentifier string) (data SensorData, err error) { 
		return data, err

	}

	log.Info("sbi.GetSensorData: s: ", s)

	log.Info("sbi.GetSensorData: s.SensorPropertyList: ", s.SensorPropertyList)

	log.Info("sbi.GetSensorData: s.SensorCharacteristicList: ", s.SensorCharacteristicList)

	log.Info("sbi.GetSensorData: s.Flex: ", s.Flex)



	sensor := convertSensorDiscoveryInfoFromSssMgr(s)

	log.Info("sbi.GetSensorData: sensors: ", sensor)
@@ -407,6 +410,7 @@ func GetSensorData(sensorIdentifier string) (data SensorData, err error) { 
	}

	j, err := json.Marshal(sensor.SensorCharacteristicList)

	if err != nil {

		log.Warn("sbi.GetSensorData: j: ", j)

		return data, err

	}

	data.Data = string(j)
@@ -424,14 +428,18 @@ func convertSensorDiscoveryInfoListFromSssMgr(s []tm.SensorDiscoveryInfo) (senso 
}



func convertSensorDiscoveryInfoFromSssMgr(s tm.SensorDiscoveryInfo) (sensor SensorDiscoveryInfo) {

	log.Info(">>> sbi.convertSensorDiscoveryInfoFromSssMgr: ", s)



	sensor = SensorDiscoveryInfo{

		SensorIdentifier: s.SensorIdentifier,

		SensorType:       s.SensorType,

	}

	log.Info("sbi.convertSensorDiscoveryInfoFromSssMgr: len(s.SensorPropertyList): ", len(s.SensorPropertyList))

	if len(s.SensorPropertyList) != 0 {

		sensor.SensorPropertyList = make([]string, len(s.SensorPropertyList))

		copy(sensor.SensorPropertyList, s.SensorPropertyList)

	}

	log.Info("sbi.convertSensorDiscoveryInfoFromSssMgr: len(s.SensorCharacteristicList): ", len(s.SensorCharacteristicList))

	if len(s.SensorCharacteristicList) != 0 {

		sensor.SensorCharacteristicList = make([]SensorCharacteristic, len(s.SensorCharacteristicList))

		for i, val := range s.SensorCharacteristicList {
@@ -442,6 +450,19 @@ func convertSensorDiscoveryInfoFromSssMgr(s tm.SensorDiscoveryInfo) (sensor Sens 
			}

		} // End of 'for' statement

	}

	log.Info("sbi.convertSensorDiscoveryInfoFromSssMgr: len(s.Flex): ", len(s.Flex))

	if len(s.Flex) != 0 {

		sensor.SensorCharacteristicList = make([]SensorCharacteristic, len(s.Flex))

		i := 0

		for key, val := range s.Flex {

			sensor.SensorCharacteristicList[i] = SensorCharacteristic{

				CharacteristicName:          key,

				CharacteristicValue:         val.(string),

				CharacteristicUnitOfMeasure: nil,

			}

			i += 1

		} // End of 'for' statement

	}

	if s.SensorPosition != nil {

		sensor.SensorPosition = &Point{

			Latitude:  s.SensorPosition.Latitude,
@@ -449,5 +470,6 @@ func convertSensorDiscoveryInfoFromSssMgr(s tm.SensorDiscoveryInfo) (sensor Sens 
		}

	}



	log.Info("<<< sbi.convertSensorDiscoveryInfoFromSssMgr: ", sensor)

	return sensor

}

go-apps/meep-sss/server/meep-sss.go

+8 −0
Changes for go-apps/meep-sss/server/meep-sss.go: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -755,7 +755,11 @@ func sensorStatusLookupGET(w http.ResponseWriter, r *http.Request) { 


	s, err := sbi.GetSensorStatus(q["sensorIdentifier"][0])

	if err != nil {

		if err.Error() == "Wrong Device identifier" {

			errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		} else {

			errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

		}

		return

	}

	log.Debug("sensorStatusLookupGET: s: ", s)
@@ -794,7 +798,11 @@ func sensorDataLookupGET(w http.ResponseWriter, r *http.Request) { 


	s, err := sbi.GetSensorData(q["sensorIdentifier"][0])

	if err != nil {

		if err.Error() == "Wrong Device identifier" {

			errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)

		} else {

			errHandlerProblemDetails(w, err.Error(), http.StatusInternalServerError)

		}

		return

	}

	log.Debug("sensorDataLookupGET: s: ", s)