From: <br...@us...> - 2008-06-04 22:17:13
|
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. |