Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester:[492] ACMServer/trunk/ACMServer
|
From: <Or...@us...> - 2009-02-05 23:17:51
|
Revision: 492
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=492&view=rev
Author: Oracle_
Date: 2009-02-05 23:17:46 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
Added CompileLog to all result data.
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Library/Data/Result.cs
ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs
ACMServer/trunk/ACMServer/Library/testData/data.xsd
ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerControl.cs
ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerPlugin.cs
ACMServer/trunk/ACMServer/Runner/Class1.cs
Modified: ACMServer/trunk/ACMServer/Library/Data/Result.cs
===================================================================
--- ACMServer/trunk/ACMServer/Library/Data/Result.cs 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Library/Data/Result.cs 2009-02-05 23:17:46 UTC (rev 492)
@@ -27,6 +27,8 @@
public double usedTime;
[XmlElement("usedMemory", typeof(int))]
public int usedMemory;
+ [XmlElement("compOutput", typeof(string))]
+ public string compOutput;
readonly string temp;
Modified: ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs
===================================================================
--- ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs 2009-02-05 23:17:46 UTC (rev 492)
@@ -27,6 +27,8 @@
public double usedTime;
[XmlElement("usedMemory", typeof(int))]
public int usedMemory;
+ [XmlElement("compOutput",typeof(string))]
+ public string compOutput;
[XmlElement("testResults", typeof(TestResIoi[]))]
public TestResIoi[] testResults;
@@ -70,6 +72,7 @@
result.result = this.result;
result.usedMemory = usedMemory;
result.usedTime = usedTime;
+ result.compOutput = compOutput;
result.Submit = this.Submit.submit;
return result;
}
Modified: ACMServer/trunk/ACMServer/Library/testData/data.xsd
===================================================================
--- ACMServer/trunk/ACMServer/Library/testData/data.xsd 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Library/testData/data.xsd 2009-02-05 23:17:46 UTC (rev 492)
@@ -38,6 +38,7 @@
<xs:element name="result" type="xs:int" />
<xs:element name="usedTime" type="xs:double" />
<xs:element name="usedMemory" type="xs:double" />
+ <xs:element name="compOutput" type="xs:string" />
<xs:element name="submit" type="submitType" />
</xs:sequence>
</xs:complexType>
@@ -47,6 +48,7 @@
<xs:element name="result" type="xs:int" />
<xs:element name="usedTime" type="xs:double" />
<xs:element name="usedMemory" type="xs:double" />
+ <xs:element name="compOutput" type="xs:string" />
<xs:element name="testResults" type="testResultList" minOccurs="0" />
<xs:element name="submitioi" type="submitIOIType" />
</xs:sequence>
Modified: ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerControl.cs 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerControl.cs 2009-02-05 23:17:46 UTC (rev 492)
@@ -129,8 +129,9 @@
{
submitGrid[1, 5].Value = "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xCA\xEE\xEC\xEF\xB3\xEB\xFF\xF6\xB3\xBF";
resGrid.ColumnCount = 1;
- resGrid.RowCount = 1;
- resGrid[0, 0].Value = "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xCA\xEE\xEC\xEF\xB3\xEB\xFF\xF6\xB3\xBF";
+ resGrid.RowCount = 2;
+ resGrid[0, 0].Value = "\xC2\xE8\xE2\xB3\xE4 \xCA\xEE\xEC\xEF\xB3\xEB\xFF\xF2\xEE\xF0\xE0:";
+ resGrid[0, 1].Value = message.compOutput;
}
submitGrid_SizeChanged(null, new EventArgs());
resGrid_SizeChanged(null, new EventArgs());
@@ -142,7 +143,8 @@
if (File.Exists(FileName))
{
ProcessStartInfo s=new ProcessStartInfo();
- s.FileName = Path.GetFullPath(FileName);
+ s.FileName="iexplore";
+ s.Arguments = Path.GetFullPath(FileName);
Process.Start(s);
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerPlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerPlugin.cs 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Plugins/IoiPlugin/IoiInformerPlugin/IoiInformerPlugin.cs 2009-02-05 23:17:46 UTC (rev 492)
@@ -121,7 +121,10 @@
h.AddTable(data, header, "", 2, 0, 5, "top");
}
else
- h.AddParagraph("\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xCA\xEE\xEC\xEF\xB3\xEB\xFF\xF6\xB3\xBF!");
+ {
+ h.AddHeader("\xC2\xE8\xE2\xB3\xE4 \xCA\xEE\xEC\xEF\xB3\xEB\xFF\xF2\xEE\xF0\xE0:", 4, "center");
+ h.AddParagraph(result.compOutput);
+ }
h.AddHorizLine();
h.AddReference("http://acm.lviv.ua", "<small>\xC0\xD1\xCC \xCA\xEE\xED\xF2\xE5\xF1\xF2\xE5\xF0 - \xF0\xF3\xF5 \xE2\xEF\xE5\xF0\xE5\xE4</small>");
@@ -130,6 +133,9 @@
StreamWriter w = File.CreateText(dir + "\\" + result.Submit.submit.pbolemID.ToString() + ".html");
w.Write(h.Result);
w.Close();
+ StreamWriter dat = File.CreateText(dir+"\\data.dat");
+ dat.WriteLine(result.Submit.name + ";" + result.Submit.form + ";"+result.Submit.submit.pbolemID.ToString()+";" + ((result.testResults == null) ? "CE" : myPoints.ToString() + "/" + allPoints.ToString()));
+ dat.Close();
}
//Uri url=new Uri(result.Submit.submit.id.ToString() + ".html");
//((IoiInformerControl)base.Control).LoadURL(url);
Modified: ACMServer/trunk/ACMServer/Runner/Class1.cs
===================================================================
--- ACMServer/trunk/ACMServer/Runner/Class1.cs 2009-02-05 20:20:58 UTC (rev 491)
+++ ACMServer/trunk/ACMServer/Runner/Class1.cs 2009-02-05 23:17:46 UTC (rev 492)
@@ -89,6 +89,7 @@
//TODO:
+ result.compOutput = test.comp.CompilerOutput;
result.res = test.comp.Result.ToString();
if (test.comp.Result == CompRes.OK)
{
@@ -205,6 +206,7 @@
//TODO:
+ result.compOutput = test.comp.CompilerOutput;
result.res = test.comp.Result.ToString();
if (test.comp.Result == CompRes.OK)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
