[Acmcontester-developers] SF.net SVN: acmcontester: [198] ACMServer/trunk

[<br...@us...>]

Revision: 198
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=198&view=rev
Author:   brus07
Date:     2008-06-02 05:05:01 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
Update protocol version

Modified Paths:
--------------
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
    ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Result.cs
    ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Submit.cs
    ACMServer/trunk/TesterSolution/Checker/Class1.cs
    ACMServer/trunk/TesterSolution/Tester/Form1.cs

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-02 10:56:22 UTC (rev 197)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-02 12:05:01 UTC (rev 198)
@@ -45,7 +45,9 @@
 
         void Send2(string message)
         {
-            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create("http://127.0.0.1/d/set.php?res=" + message);
+            string res = (message.Split(' '))[0];
+            string id = (message.Split(' '))[1];
+            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create("http://127.0.0.1/d/set.php?res=" + res + "&id=" + id);
             myRequest.Method = "GET";
             myRequest.GetResponse();
             /*

Modified: ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Result.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Result.cs	2008-06-02 10:56:22 UTC (rev 197)
+++ ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Result.cs	2008-06-02 12:05:01 UTC (rev 198)
@@ -6,12 +6,19 @@
     class Result
     {
         Xml data;
+
         Submit submit;
 
+        string temp;
+
         public Result(string message)
         {
             //TODO
-            submit = new Submit(message);
+            string[] messages = message.Split(' ');
+            if (messages.Length != 3)
+                throw new Exception("Result.Result: \xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE8\xE9 \xF4\xEE\xF0\xEC\xE0\xF2 \xE2\xF5\xB3\xE4\xED\xEE\xBF \xF1\xF2\xF0\xB3\xF7\xEA\xE8");
+            temp = messages[0];
+            submit = new Submit(messages[1] + " " + messages[2]);
         }
 
         public Submit Submit
@@ -25,7 +32,7 @@
         public override string ToString()
         {
             //HACK: \xE4\xEB\xFF \xF2\xE5\xF1\xF2\xF3 \xF5\xE0\xE9 \xE1\xF3\xE4\xE5 \xF2\xE0\xEA, \xE0\xEB\xE5 \xEC\xE0\xBA \xE1\xF3\xF2\xE8 \xF7\xE5\xF0\xE5\xE7 XML
-            return submit.ToString();
+            return temp;
         }
     }
 }

Modified: ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Submit.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Submit.cs	2008-06-02 10:56:22 UTC (rev 197)
+++ ACMServer/trunk/MediatorSolution/Mediator/Library/Data/Submit.cs	2008-06-02 12:05:01 UTC (rev 198)
@@ -7,12 +7,17 @@
     {
         Xml data;
 
+        int id;
         string temp;
 
         public Submit(string message)
         {
             //TODO
-            temp = message;
+            string[] messages = message.Split(' ');
+            if (messages.Length != 2)
+                throw new Exception("Submit.Submit: \xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE8\xE9 \xF4\xEE\xF0\xEC\xE0\xF2 \xE2\xF5\xB3\xE4\xED\xEE\xBF \xF1\xF2\xF0\xB3\xF7\xEA\xE8");
+            id = Convert.ToInt32(messages[0]);
+            temp = messages[1];
         }
 
         //HACK: \xE4\xEB\xFF \xF2\xE5\xF1\xF2\xF3 \xF5\xE0\xE9 \xE1\xF3\xE4\xE5 \xF2\xE0\xEA, \xE0\xEB\xE5 \xEC\xE0\xBA \xE1\xF3\xF2\xE8 \xF7\xE5\xF0\xE5\xE7 XML
@@ -24,13 +29,14 @@
         public override int GetHashCode()
         {
             //HACK:
+            /*
             int result = 0;
             for (int i = 0; i < temp.Length; i++)
             {
                 result *= 991;
                 result += (int)temp[i];
-            }
-            return result;
+            }*/
+            return id;
         }
     }
 }

Modified: ACMServer/trunk/TesterSolution/Checker/Class1.cs
===================================================================
--- ACMServer/trunk/TesterSolution/Checker/Class1.cs	2008-06-02 10:56:22 UTC (rev 197)
+++ ACMServer/trunk/TesterSolution/Checker/Class1.cs	2008-06-02 12:05:01 UTC (rev 198)
@@ -8,6 +8,7 @@
     {
         public static int GetResult(string code)
         {
+            code = (code.Split(' '))[1];
             int res = 0;
             for (int i = 0; i < code.Length; i++)
             {

Modified: ACMServer/trunk/TesterSolution/Tester/Form1.cs
===================================================================
--- ACMServer/trunk/TesterSolution/Tester/Form1.cs	2008-06-02 10:56:22 UTC (rev 197)
+++ ACMServer/trunk/TesterSolution/Tester/Form1.cs	2008-06-02 12:05:01 UTC (rev 198)
@@ -42,7 +42,7 @@
         {
             textBox1.Text += "\r\n" + message;
             int result = Checker.Checker.GetResult(message);
-            socket.Send(result.ToString());
+            socket.Send(result.ToString() + " " + message);
         }
 
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.