1) Modified contents of contextmessagetypes tables in totalrecallpopulate.sql

rg2023 [2003-05-07 19:43:29]
1) Modified contents of contextmessagetypes tables in totalrecallpopulate.sql
2) Added signed one-way response (ack) to IAs that share/recall resources
3) Rebuilt installers with new version of IA
Filename
discus2/bin/InfoAgent.asmx.cs
discus2/bin/TotalRecallPopulate.sql
discus2/bin/TotalRecallSetup.msi
discus2/bin/TotalRecallSetupDebug.msi
diff --git a/discus2/bin/InfoAgent.asmx.cs b/discus2/bin/InfoAgent.asmx.cs
index 766843a..76999b0 100644
--- a/discus2/bin/InfoAgent.asmx.cs
+++ b/discus2/bin/InfoAgent.asmx.cs
@@ -1793,6 +1793,10 @@ namespace TotalRecall
 			}
 			if( resMsg.m_lstResources.Count > 0 )
 			{
+				ResourceCtxMsg resCtxMsg = new ResourceCtxMsg( resMsg );
+				ContextMsgDAO ctxDAO = new ContextMsgDAO( this.DBConnect );
+				ctxDAO.ReceiveContextMessage( resCtxMsg, false );
+
 				// Send a response
 				ContextMsgResponse ctxRespMsg = new ContextMsgResponse();
 				ctxRespMsg.MessageID = resMsg.MessageID;
@@ -1800,7 +1804,7 @@ namespace TotalRecall
 				ctxRespMsg.Ack = true;
 				ctxRespMsg.Sender = me.Name;
 				ctxRespMsg.SenderUrl = me.Location;
-				ctxRespMsg.Type = enuContextMsgType.ResourceShared;
+				ctxRespMsg.Type = enuContextMsgType.ResourceSharedResponse;
 				this.SendContextUpdate( ctxRespMsg, resMsg.Sender, resMsg.SenderUrl );
 			}
 		}
@@ -1873,6 +1877,9 @@ namespace TotalRecall

 		private void RecallResources( ResourceCtxMsg resCtxMsg )
 		{
+			ContextMsgDAO ctxMsgDAO = new ContextMsgDAO( this.DBConnect );
+			ctxMsgDAO.ReceiveContextMessage( resCtxMsg, false );
+
 			// Only the owner and the meeting organizer know the resource ids
 			ResourceDAO resDAO = new ResourceDAO( this.DBConnect );
 			IEnumerator it = resCtxMsg.ResourceIDs.GetEnumerator();
@@ -1881,6 +1888,16 @@ namespace TotalRecall
 				string strResID = (string) it.Current;
 				resDAO.RecallResource( strResID );
 			}
+
+			// Send a response
+			ContextMsgResponse ctxRespMsg = new ContextMsgResponse();
+			ctxRespMsg.MessageID = resCtxMsg.MessageID;
+			ctxRespMsg.MeetingID = resCtxMsg.MeetingID;
+			ctxRespMsg.Ack = true;
+			ctxRespMsg.Sender = me.Name;
+			ctxRespMsg.SenderUrl = me.Location;
+			ctxRespMsg.Type = enuContextMsgType.ResourceRecalledResponse;
+			this.SendContextUpdate( ctxRespMsg, resCtxMsg.Sender, resCtxMsg.SenderUrl );
 		}
 	}
 }
diff --git a/discus2/bin/TotalRecallPopulate.sql b/discus2/bin/TotalRecallPopulate.sql
index c303f57..34ef1a8 100644
--- a/discus2/bin/TotalRecallPopulate.sql
+++ b/discus2/bin/TotalRecallPopulate.sql
@@ -26,10 +26,13 @@ insert into ContextMessageTypes(CTXMSG_TYPE) values ('InfoAgentLeft')
 insert into ContextMessageTypes(CTXMSG_TYPE) values ('InfoAgentJoinedResponse')
 insert into ContextMessageTypes(CTXMSG_TYPE) values ('InfoAgentLeftResponse')

-insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceAdd')
-insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceRecall')
-insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceAddResponse')
-insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceRecallResponse')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceShared')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceRecalled')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceSharedResponse')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceRecalledResponse')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceUpdated')
+insert into ContextMessageTypes(CTXMSG_TYPE) values ('ResourceUpdatedResponse')
+

 insert into ContextMessageTypes(CTXMSG_TYPE) values ('RecommendationRequest')
 insert into ContextMessageTypes(CTXMSG_TYPE) values ('RecommendationResponse')
diff --git a/discus2/bin/TotalRecallSetup.msi b/discus2/bin/TotalRecallSetup.msi
index 8ac5fe7..e95da0a 100644
Binary files a/discus2/bin/TotalRecallSetup.msi and b/discus2/bin/TotalRecallSetup.msi differ
diff --git a/discus2/bin/TotalRecallSetupDebug.msi b/discus2/bin/TotalRecallSetupDebug.msi
index 2530491..dda5877 100644
Binary files a/discus2/bin/TotalRecallSetupDebug.msi and b/discus2/bin/TotalRecallSetupDebug.msi differ