Merge pull request #327 from pixlise/development

Release 4.36.0

api/ws/handlers/roi.go

@@ -30,7 +30,7 @@ func HandleRegionOfInterestGetReq(req *protos.RegionOfInterestGetReq, hctx wsHel
 
 	dbItem.Owner = wsHelpers.MakeOwnerSummary(owner, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
 
-	if req.IsMIST {
+	if req.IsMIST && dbItem.IsMIST {
 		// Fetch from MIST table and add to dbItem
 		mistItem := &protos.MistROIItem{}
 		err = hctx.Svcs.MongoDB.Collection(dbCollections.MistROIsName).FindOne(context.TODO(), bson.D{{Key: "_id", Value: req.Id}}).Decode(&mistItem)
@@ -238,6 +238,7 @@ func createROI(roi *protos.ROIItem, hctx wsHelpers.HandlerContext, needMistEntry
 				IdDepth:             mistROIItem.IdDepth,
 				ClassificationTrail: mistROIItem.ClassificationTrail,
 				Formula:             mistROIItem.Formula,
+				PmcConfidenceMap:    mistROIItem.PmcConfidenceMap,
 			}
 			// Add an entry into the MIST ROI table
 			_, err := hctx.Svcs.MongoDB.Collection(dbCollections.MistROIsName).InsertOne(context.TODO(), mistROIItem)

api/ws/wsHelpers/sync-mongo-restore.go

@@ -54,7 +54,7 @@ type LogWriter struct {
 }
 
 func (w LogWriter) Write(p []byte) (n int, err error) {
-	w.logger.Infof(string(p))
+	w.logger.Infof("%s", string(p))
 	return len(p), nil
 }