Changeset 6927

Timestamp:

10/13/11 21:05:21 (13 years ago)

Author:

ascheibe

Message:

#1648 added GeoIP support to access webservice

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.GeoIP/1.12/GeoIPLookupService.cs (added)
• HeuristicLab.GeoIP/1.12/HeuristicLab.GeoIP.csproj (modified) (2 diffs)
• HeuristicLab.GeoIP/1.12/Settings.Designer.cs (added)
• HeuristicLab.GeoIP/1.12/Settings.settings (added)
• HeuristicLab.GeoIP/1.12/app.config (added)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj (modified) (1 diff)

branches/ClientUserManagement/HeuristicLab.GeoIP/1.12/HeuristicLab.GeoIP.csproj

@@ -49 +49 @@
     <Compile Include="Country.cs" />
     <Compile Include="DatabaseInfo.cs" />
+    <Compile Include="GeoIPLookupService.cs" />
     <Compile Include="Location.cs" />
     <Compile Include="LookupService.cs" />
@@ -54 +55 @@
     <Compile Include="Region.cs" />
     <Compile Include="RegionName.cs" />
-    <None Include="GeoIP201109.dat" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <None Include="app.config" />
+    <None Include="GeoIP201109.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -24 +24 @@
 using System.Linq;
 using System.ServiceModel;
+using System.ServiceModel.Channels;
 using System.Web.Security;
+using HeuristicLab.GeoIP;
 using DA = HeuristicLab.Services.Access.DataAccess;
 using DT = HeuristicLab.Services.Access.DataTransfer;
@@ -77 +79 @@
 
     public Guid AddClient(DT.Client client) {
+      string country = string.Empty;
+
+      OperationContext opContext = OperationContext.Current;
+
+      if (opContext != null) {
+        MessageProperties properties = opContext.IncomingMessageProperties;
+        RemoteEndpointMessageProperty endpoint = properties[RemoteEndpointMessageProperty.Name] as RemoteEndpointMessageProperty;
+        string ipAdr = endpoint.Address;
+        country = GeoIPLookupService.Instance.GetCountryName(ipAdr);
+      }
+
       using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
         DA.Client entity = Convert.ToEntity(client);
+
+        if (country != string.Empty) {
+          var query = from c in context.GetTable<DA.Country>()
+                      where c.Name == country
+                      select c;
+
+          if (query.Count() > 0) {
+            entity.CountryId = query.First().Id;
+          }
+        }
+
         context.Resources.InsertOnSubmit(entity);
         context.SubmitChanges();

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.GeoIP\1.12\HeuristicLab.GeoIP.csproj">
+      <Project>{BE9B0229-9150-49A4-AEA6-BB58E055992F}</Project>
+      <Name>HeuristicLab.GeoIP</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Services.Access.DataAccess\3.3\HeuristicLab.Services.Access.DataAccess-3.3.csproj">
       <Project>{0F652437-998A-4EAB-8BF1-444B5FE8CE97}</Project>