acmcontester-developers

[Acmcontester-developers] SF.net SVN: acmcontester: [195] ACMServer/trunk/MediatorSolution/Library/ Connector

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

Revision: 195
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=195&view=rev
Author:   brus07
Date:     2008-06-01 15:59:03 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
Added interface for Getter. For get information from web.

Modified Paths:
--------------
    ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
    ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs

Added Paths:
-----------
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-01 12:03:25 UTC (rev 194)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-01 22:59:03 UTC (rev 195)
@@ -34,9 +34,13 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Getter\FileGetter.cs" />
+    <Compile Include="Getter\IWebGetter.cs" />
+    <Compile Include="Getter\WebGetter.cs" />
     <Compile Include="SocketClient.cs" />
     <Compile Include="SocketServer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Added: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs	                        (rev 0)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
@@ -0,0 +1,41 @@
+using System;
+
+namespace AcmContester.Library.Connector.Getter
+{
+    class FileGetter: IWebGetter
+    {
+        public object GetInfoFromSite()
+        {
+            try
+            {
+                string res = "";
+                using (System.IO.StreamReader sr = new System.IO.StreamReader("a.txt"))
+                {
+                    res = sr.ReadToEnd();
+                }
+                if (res.Length == 0)
+                    return null;
+                return res;
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+
+        public void Send(string message)
+        {
+            try
+            {
+                using (System.IO.StreamWriter sr = new System.IO.StreamWriter("b.txt", true))
+                {
+                    sr.WriteLine(DateTime.Now.ToLongTimeString() + ": " + message);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            //TODO:
+        }
+    }
+}

Added: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs	                        (rev 0)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
@@ -0,0 +1,10 @@
+using System;
+
+namespace AcmContester.Library.Connector.Getter
+{
+    interface IWebGetter
+    {
+        object GetInfoFromSite();
+        void Send(string message);
+    }
+}

Added: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	                        (rev 0)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
@@ -0,0 +1,34 @@
+using System;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace AcmContester.Library.Connector.Getter
+{
+    class WebGetter: IWebGetter
+    {
+        public void Send(string message)
+        {
+            WebBrowser webBrowser = new WebBrowser();
+            webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
+            webBrowser.Navigate("http://127.0.0.1/d/a.php?p=321");
+        }
+
+
+        Mutex mut = new Mutex();
+        string document = "";
+        public object GetInfoFromSite()
+        {
+            WebBrowser webBrowser = new WebBrowser();
+            webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
+            webBrowser.Navigate("http://127.0.0.1/d/a.php?p=321");
+            mut.WaitOne();
+            return document;
+        }
+
+        void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+        {
+            document = ((WebBrowser)sender).DocumentText;
+            mut.ReleaseMutex();
+        }
+    }
+}

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs	2008-06-01 12:03:25 UTC (rev 194)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs	2008-06-01 22:59:03 UTC (rev 195)
@@ -1,5 +1,6 @@
 using System;
 using System.Timers;
+using AcmContester.Library.Connector.Getter;
 
 namespace AcmContester.Library.Connector
 {
@@ -10,6 +11,8 @@
         public delegate void DataArrivedDelegate(string s);
         public event DataArrivedDelegate onDataArrived;
 
+        private IWebGetter getter = new WebGetter();
+
         public WebConnector()
         {
             timer.Interval = 10 * 1000;
@@ -22,7 +25,7 @@
         private void OnTimedEvent(object source, ElapsedEventArgs e)
         {
             timer.Enabled = false;
-            object ob = GetInfoFromSite();
+            object ob = getter.GetInfoFromSite();
             if (ob != null)
             {
                 DataArrived(ob);
@@ -38,38 +41,9 @@
             }
         }
 
-        private object GetInfoFromSite()
-        {
-            try
-            {
-                string res = "";
-                using (System.IO.StreamReader sr = new System.IO.StreamReader("a.txt"))
-                {
-                    res = sr.ReadToEnd();
-                }
-                if (res.Length == 0)
-                    return null;
-                return res;
-            }
-            catch(Exception)
-            {
-            }
-            return null;
-        }
-
         public void Send(string message)
         {
-            try
-            {
-                using (System.IO.StreamWriter sr = new System.IO.StreamWriter("b.txt", true))
-                {
-                    sr.WriteLine(DateTime.Now.ToLongTimeString() + ": " + message);
-                }
-            }
-            catch (Exception)
-            {
-            }
-            //TODO:
+            getter.Send(message);
         }
     }
 }


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

[Acmcontester-developers] SF.net SVN: acmcontester: [196] ACMServer/trunk/MediatorSolution/Library/ Connector

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

Revision: 196
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=196&view=rev
Author:   brus07
Date:     2008-06-01 16:03:03 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
Rename interface to IGetter

Modified Paths:
--------------
    ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
    ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs

Added Paths:
-----------
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IGetter.cs

Removed Paths:
-------------
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-01 22:59:03 UTC (rev 195)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-01 23:03:03 UTC (rev 196)
@@ -39,7 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Getter\FileGetter.cs" />
-    <Compile Include="Getter\IWebGetter.cs" />
+    <Compile Include="Getter\IGetter.cs" />
     <Compile Include="Getter\WebGetter.cs" />
     <Compile Include="SocketClient.cs" />
     <Compile Include="SocketServer.cs" />

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/FileGetter.cs	2008-06-01 23:03:03 UTC (rev 196)
@@ -2,7 +2,7 @@
 
 namespace AcmContester.Library.Connector.Getter
 {
-    class FileGetter: IWebGetter
+    class FileGetter: IGetter
     {
         public object GetInfoFromSite()
         {

Copied: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IGetter.cs (from rev 195, ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs)
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IGetter.cs	                        (rev 0)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IGetter.cs	2008-06-01 23:03:03 UTC (rev 196)
@@ -0,0 +1,9 @@
+
+namespace AcmContester.Library.Connector.Getter
+{
+    interface IGetter
+    {
+        object GetInfoFromSite();
+        void Send(string message);
+    }
+}

Deleted: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/IWebGetter.cs	2008-06-01 23:03:03 UTC (rev 196)
@@ -1,10 +0,0 @@
-using System;
-
-namespace AcmContester.Library.Connector.Getter
-{
-    interface IWebGetter
-    {
-        object GetInfoFromSite();
-        void Send(string message);
-    }
-}

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-01 22:59:03 UTC (rev 195)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-01 23:03:03 UTC (rev 196)
@@ -4,7 +4,7 @@
 
 namespace AcmContester.Library.Connector.Getter
 {
-    class WebGetter: IWebGetter
+    class WebGetter: IGetter
     {
         public void Send(string message)
         {

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs	2008-06-01 22:59:03 UTC (rev 195)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/WebConnector.cs	2008-06-01 23:03:03 UTC (rev 196)
@@ -11,7 +11,7 @@
         public delegate void DataArrivedDelegate(string s);
         public event DataArrivedDelegate onDataArrived;
 
-        private IWebGetter getter = new WebGetter();
+        private IGetter getter = new WebGetter();
 
         public WebConnector()
         {


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

[Acmcontester-developers] SF.net SVN: acmcontester: [215] ACMServer/trunk/MediatorSolution/Library/ Connector

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

Revision: 215
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=215&view=rev
Author:   brus07
Date:     2008-06-04 15:16:56 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Added InData.txt. In this file save real path to webpages. Read only first line in this file.

Modified Paths:
--------------
    ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs

Added Paths:
-----------
    ACMServer/trunk/MediatorSolution/Library/Connector/Getter/InData.txt

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-04 21:24:40 UTC (rev 214)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Connector.csproj	2008-06-04 22:16:56 UTC (rev 215)
@@ -46,6 +46,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WebConnector.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Getter\InData.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Added: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/InData.txt
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/InData.txt	                        (rev 0)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/InData.txt	2008-06-04 22:16:56 UTC (rev 215)
@@ -0,0 +1,2 @@
+http://127.0.0.1/d
+http://acm.lviv.ua/version3
\ No newline at end of file

Modified: ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs
===================================================================
--- ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-04 21:24:40 UTC (rev 214)
+++ ACMServer/trunk/MediatorSolution/Library/Connector/Getter/WebGetter.cs	2008-06-04 22:16:56 UTC (rev 215)
@@ -3,18 +3,34 @@
 using System.Windows.Forms;
 using System.Net;
 using System.IO;
+using System.Text;
 
 namespace AcmContester.Library.Connector.Getter
 {
     class WebGetter: IGetter
     {
+        //"http://127.0.0.1/d";
+        string fullPathToWebPages = "";
+
+        private void checkAddress()
+        {
+            if (fullPathToWebPages == "")
+            {
+                StreamReader s = new StreamReader("Getter/InData.txt", Encoding.Default);
+                fullPathToWebPages = s.ReadLine();
+                s.Close();
+            }
+        }
+
         public void Send(string message)
         {
+            checkAddress();
             Send2(message);
         }
 
         public object GetInfoFromSite()
         {
+            checkAddress();
             return GetInfoFromSite2();
         }
 
@@ -22,7 +38,7 @@
         {
             WebBrowser webBrowser = new WebBrowser();
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
-            webBrowser.Navigate("http://127.0.0.1/d/a.php?p=321");
+            webBrowser.Navigate(fullPathToWebPages + "/a.php?p=321");
         }
 
 
@@ -32,7 +48,7 @@
         {
             WebBrowser webBrowser = new WebBrowser();
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
-            webBrowser.Navigate("http://127.0.0.1/d/a.php?p=321");
+            webBrowser.Navigate(fullPathToWebPages + "/a.php?p=321");
             mut.WaitOne();
             return document;
         }
@@ -47,7 +63,7 @@
         {
             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);
+            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(fullPathToWebPages + "/set.php?res=" + res + "&id=" + id);
             myRequest.Method = "GET";
             myRequest.GetResponse();
             /*
@@ -60,7 +76,7 @@
         }
         string GetInfoFromSite2()
         {
-            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create("http://127.0.0.1/d/get.php");
+            HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(fullPathToWebPages + "/get.php");
             myRequest.Method = "GET";
             WebResponse myResponse = myRequest.GetResponse();
             StreamReader sr = new StreamReader(myResponse.GetResponseStream(), System.Text.Encoding.UTF8);


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