From 05a267af4b158a36e3206081fd25c9226401e4c5 Mon Sep 17 00:00:00 2001
From: tdtalbot <6729926+tdtalbot@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:21:04 -0800
Subject: [PATCH] Correct the subject in the powergrid model manager. 
 Otherwise it sometimes truncates the beginning of the uuid

---
 .../gridappsd/data/BGPowergridModelDataManagerImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java
index 8a3dea9b..27fba442 100644
--- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java
+++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java
@@ -733,7 +733,12 @@ protected String resultSetToJson(ResultSet rs){
 		HashMap<String, JsonObject> resultObjects = new HashMap<String, JsonObject>();
 		while( rs.hasNext()) {
 			QuerySolution qs = rs.nextSolution();
-			String subject = qs.getResource(SUBJECT).getLocalName();
+			String subject = qs.getResource(SUBJECT).toString();
+			if(!subject.contains("urn:uuid")){
+				subject = qs.getResource(SUBJECT).getLocalName();
+			} else {
+				subject = subject.substring(subject.lastIndexOf(':')+1);
+			}
 			JsonObject obj = new JsonObject();
 			if(resultObjects.containsKey(subject)){
 				obj = resultObjects.get(subject);