Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester:[471] ACMServer/trunk/ACMServer
|
From: <br...@us...> - 2009-02-02 01:04:06
|
Revision: 471
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=471&view=rev
Author: brus07
Date: 2009-02-02 01:04:03 +0000 (Mon, 02 Feb 2009)
Log Message:
-----------
Continue modify SubmitList and SubmitIoi
Update XSD file.
Change call property of SubmitList.
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Library/testData/data.xsd
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGetter.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/TestRunnerPlugin/TestRunnerPlugin.cs
Modified: ACMServer/trunk/ACMServer/Library/testData/data.xsd
===================================================================
--- ACMServer/trunk/ACMServer/Library/testData/data.xsd 2009-02-01 22:53:36 UTC (rev 470)
+++ ACMServer/trunk/ACMServer/Library/testData/data.xsd 2009-02-02 01:04:03 UTC (rev 471)
@@ -18,8 +18,9 @@
</xs:complexType>
<xs:complexType name="submitIOIType">
<xs:sequence>
+ <xs:element name="submit" type="submitType" />
<xs:element name="name" type="xs:string" />
- <xs:element name="submit" type="submitType" />
+ <xs:element name="form" type="xs:positiveInteger" />
</xs:sequence>
</xs:complexType>
<xs:element name="submitList">
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs 2009-02-01 22:53:36 UTC (rev 470)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs 2009-02-02 01:04:03 UTC (rev 471)
@@ -50,9 +50,9 @@
{
string message = "Get submits" + Environment.NewLine;
string ids = "";
- for (int i = 0; i < submitList.Items.Length; i++)
+ for (int i = 0; i < submitList.SubmitItems.Length; i++)
{
- ids += " " + submitList.Items[i].id.ToString();
+ ids += " " + submitList.SubmitItems[i].id.ToString();
}
message += " ID: " + ids;
OnLogMessage("Receive", message);
@@ -66,17 +66,17 @@
GenerateLogMessageWirhIDs(submitList);
- for (int index = 0; index < submitList.Items.Length; index++)
+ for (int index = 0; index < submitList.SubmitItems.Length; index++)
{
- if (dataContainer.Add(submitList.Items[index]) == true)
+ if (dataContainer.Add(submitList.SubmitItems[index]) == true)
{
- SystemMessage sysMes = new SystemMessage(submitList.Items[index].ToString(), "TestingSubmit");
- OnLogMessage("SystemSend", submitList.Items[index].id + " to Pool");
+ SystemMessage sysMes = new SystemMessage(submitList.SubmitItems[index].ToString(), "TestingSubmit");
+ OnLogMessage("SystemSend", submitList.SubmitItems[index].id + " to Pool");
pool.Send(sysMes);
}
else
{
- OnLogMessage("SystemReceive", submitList.Items[index].id + "is in queue");
+ OnLogMessage("SystemReceive", submitList.SubmitItems[index].id + "is in queue");
}
}
return true;
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGetter.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGetter.cs 2009-02-01 22:53:36 UTC (rev 470)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGetter.cs 2009-02-02 01:04:03 UTC (rev 471)
@@ -107,20 +107,20 @@
{
SubmitList list = SubmitList.CreateFromXml(info);
List<Submit> result = new List<Submit>();
- for (int i = 0; i < list.Items.Length; i++)
+ for (int i = 0; i < list.SubmitItems.Length; i++)
{
- if (container.Contains(list.Items[i]) == false)
+ if (container.Contains(list.SubmitItems[i]) == false)
{
- result.Add(list.Items[i]);
+ result.Add(list.SubmitItems[i]);
//TODO: \xEF\xEE\xF2\xF0\xB3\xE1\xED\xEE \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xE8 \xF2\xB3\xEB\xFC\xEA\xE8 \xF2\xEE\xE4\xB3 \xEA\xEE\xEB\xE8 \xF6\xE5\xE9 \xF1\xE0\xE1\xEC\xB3\xF2 \xE2\xB3\xE4\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE9 \xED\xE0 \xF2\xE5\xF1\xF2\xF3\xE2\xE0\xED\xED\xFF
- container.Add(list.Items[i]);
+ container.Add(list.SubmitItems[i]);
}
}
if (result.Count == 0)
return new SystemMessage("Web checked: All submits in queue (queue size " + container.Count.ToString() + ")", "SystemResult");
SubmitList resultList = new SubmitList();
- resultList.Items = result.ToArray();
+ resultList.SubmitItems = result.ToArray();
return new SystemMessage(resultList.ToString(), "TestingSubmitList");
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/TestRunnerPlugin/TestRunnerPlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/TestRunnerPlugin/TestRunnerPlugin.cs 2009-02-01 22:53:36 UTC (rev 470)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/TestRunnerPlugin/TestRunnerPlugin.cs 2009-02-02 01:04:03 UTC (rev 471)
@@ -96,12 +96,12 @@
SendMessageToControl("TestingSubmitList", "Receive");
SubmitList list = SubmitList.CreateFromXml(message.Message);
- for (int i = 0; i < list.Items.Length; i++)
+ for (int i = 0; i < list.SubmitItems.Length; i++)
{
while (runner.IsBusy() == true)
System.Threading.Thread.Sleep(50);
- SendSubmitToControl(list.Items[i].ToString(), "Receive");
- runner.AddWork(list.Items[i].ToString());
+ SendSubmitToControl(list.SubmitItems[i].ToString(), "Receive");
+ runner.AddWork(list.SubmitItems[i].ToString());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
