cleaning up and refactoring

gutelius · Jan 21, 2010 · da8c322 · da8c322
1 parent fc1f94b
commit da8c322
Show file tree

Hide file tree

Showing 42 changed files with 132 additions and 140 deletions.
diff --git a/app/.svn/all-wcprops b/app/.svn/all-wcprops
@@ -1,5 +1,5 @@
 K 25
 svn:wc:ra_dav:version-url
 V 31
-/svn/!svn/ver/2148/nslookup/app
+/svn/!svn/ver/2149/nslookup/app
 END
diff --git a/app/.svn/entries b/app/.svn/entries
@@ -1,14 +1,14 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app
 http://appfricalabs.dyndns.org/svn
 
 
 
-2010-01-21T09:27:02.525958Z
-2148
+2010-01-21T14:16:08.530788Z
+2149
 mossplix
 
 

diff --git a/app/controllers/.svn/all-wcprops b/app/controllers/.svn/all-wcprops
@@ -1,7 +1,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 43
-/svn/!svn/ver/2148/nslookup/app/controllers
+/svn/!svn/ver/2149/nslookup/app/controllers
 END
 application_controller.rb
 K 25
@@ -13,5 +13,5 @@ ip_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 60
-/svn/!svn/ver/2148/nslookup/app/controllers/ip_controller.rb
+/svn/!svn/ver/2149/nslookup/app/controllers/ip_controller.rb
 END
diff --git a/app/controllers/.svn/entries b/app/controllers/.svn/entries
@@ -1,14 +1,14 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/controllers
 http://appfricalabs.dyndns.org/svn
 
 
 
-2010-01-21T09:27:02.525958Z
-2148
+2010-01-21T14:16:08.530788Z
+2149
 mossplix
 
 
@@ -32,7 +32,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 a09a90b9599fecd980c073cceaac1cd4
 2010-01-19T13:33:46.118556Z
 2145
@@ -66,10 +66,10 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
-30ff0258aec57811c6ce32f0b05a48c0
-2010-01-21T09:27:02.525958Z
-2148
+2010-01-21T14:46:28.000000Z
+5ce561e1bf43689b84b50c95910d8a8c
+2010-01-21T14:16:08.530788Z
+2149
 mossplix
 has-props
 
@@ -92,5 +92,5 @@ has-props
 
 
 
-1373
+880
 
diff --git a/app/controllers/.svn/text-base/ip_controller.rb.svn-base b/app/controllers/.svn/text-base/ip_controller.rb.svn-base
@@ -1,9 +1,7 @@
 class IpController < ApplicationController
 
   def ip
-    @w=params[:ip].to_s.strip
-    @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-    @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
           respond_to do |format|
             format.html # index.html.erb
             format.xml  { render :xml => @country.to_xml(:root => "locations",:except => [ :dstOffset,:dstOffset,:gmtOffset,:ip_start ],:skip_types=>true) }
@@ -12,30 +10,28 @@ class IpController < ApplicationController
 
   end
   def edxl
-
-    @w=params[:ip].to_s.strip
-        @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-        @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
        #@country.to_xml
       @xml=Builder::XmlMarkup.new
 
 
   end
   def pfif
-    @w=params[:ip].to_s.strip
-            @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-            @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
            #@country.to_xml
           @xml=Builder::XmlMarkup.new
   end
  def georss
-   @w=params[:ip].to_s.strip
-    @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-    @country=IpGroupCity.find_by_sql(@s)
+   get_ip()
+
               #@country.to_xml
      @xml=Builder::XmlMarkup.new
 
  end
-
+ def get_ip
+   @w=params[:ip].to_s.strip
+       @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
+       @country=IpGroupCity.find_by_sql(@s)
+ end
 
 end
diff --git a/app/controllers/ip_controller.rb b/app/controllers/ip_controller.rb
@@ -1,9 +1,7 @@
 class IpController < ApplicationController
 
   def ip
-    @w=params[:ip].to_s.strip
-    @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-    @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
           respond_to do |format|
             format.html # index.html.erb
             format.xml  { render :xml => @country.to_xml(:root => "locations",:except => [ :dstOffset,:dstOffset,:gmtOffset,:ip_start ],:skip_types=>true) }
@@ -12,30 +10,28 @@ def ip
 
   end
   def edxl
-
-    @w=params[:ip].to_s.strip
-        @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-        @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
        #@country.to_xml
       @xml=Builder::XmlMarkup.new
 
 
   end
   def pfif
-    @w=params[:ip].to_s.strip
-            @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-            @country=IpGroupCity.find_by_sql(@s)
+    get_ip()
            #@country.to_xml
           @xml=Builder::XmlMarkup.new
   end
  def georss
-   @w=params[:ip].to_s.strip
-    @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
-    @country=IpGroupCity.find_by_sql(@s)
+   get_ip()
+
               #@country.to_xml
      @xml=Builder::XmlMarkup.new
 
  end
-
+ def get_ip
+   @w=params[:ip].to_s.strip
+       @s="SELECT * FROM `ip_group_city` where `ip_start` <= INET_ATON('#{@w}') order by ip_start desc limit 1"
+       @country=IpGroupCity.find_by_sql(@s)
+ end
 
 end
diff --git a/app/helpers/.svn/entries b/app/helpers/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/helpers
 http://appfricalabs.dyndns.org/svn
 
@@ -32,7 +32,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 3a1f28b1e560cf597cd3f2a9afade628
 2010-01-19T13:33:46.118556Z
 2145
@@ -66,7 +66,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 f99a3dc5d5b382c8dde887b6d53ac060
 2010-01-19T13:33:46.118556Z
 2145

diff --git a/app/models/.svn/entries b/app/models/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/models
 http://appfricalabs.dyndns.org/svn
 
@@ -32,7 +32,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 604e128ed2aace2674b0fa5caf6f6b84
 2010-01-19T13:33:46.118556Z
 2145
@@ -66,7 +66,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 68b9e9bb3ccb92d10c11cd0ed1bb7ec1
 2010-01-19T13:33:46.118556Z
 2145
@@ -100,7 +100,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 1b56bfa64b592a3de7d42c7f38f02099
 2010-01-19T13:33:46.118556Z
 2145

diff --git a/app/views/.svn/entries b/app/views/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/views
 http://appfricalabs.dyndns.org/svn
 

diff --git a/app/views/ip/.svn/entries b/app/views/ip/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/views/ip
 http://appfricalabs.dyndns.org/svn
 
@@ -32,7 +32,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 5b6c4337b58ac189290180271467aa77
 2010-01-21T09:27:02.525958Z
 2148
@@ -66,7 +66,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 f52e3a63ccdd87dd7ffac72a858c5a56
 2010-01-21T09:27:02.525958Z
 2148
@@ -100,7 +100,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:28.000000Z
 d204f057b4536e6e66a3d761a6beebf5
 2010-01-20T16:49:40.000055Z
 2147

diff --git a/app/views/layouts/.svn/entries b/app/views/layouts/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/app/views/layouts
 http://appfricalabs.dyndns.org/svn
 

diff --git a/config/.svn/entries b/config/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/config
 http://appfricalabs.dyndns.org/svn
 
@@ -35,7 +35,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 228cc8b97cf31a3ce19c4f26aa78cb61
 2010-01-21T09:27:02.525958Z
 2148
@@ -69,7 +69,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 ec8c149b777fd51dd32cce8108b6d75e
 2010-01-19T13:33:46.118556Z
 2145
@@ -103,7 +103,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 9792ccadfdbcc30afb84c8815b81374c
 2010-01-19T13:33:46.118556Z
 2145
@@ -140,7 +140,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 8ad3d0748f0cab8118e8f80a07fdac0a
 2010-01-19T13:33:46.118556Z
 2145

diff --git a/config/environments/.svn/entries b/config/environments/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-2148
+2149
 http://appfricalabs.dyndns.org/svn/nslookup/config/environments
 http://appfricalabs.dyndns.org/svn
 
@@ -32,7 +32,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 df2ec2d06d3785c5948a005e4e9865f7
 2010-01-19T13:33:46.118556Z
 2145
@@ -66,7 +66,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 be8ff9efffa8df9afa2c5d2a9ec94194
 2010-01-19T13:33:46.118556Z
 2145
@@ -100,7 +100,7 @@ file
 
 
 
-2010-01-21T09:35:41.000000Z
+2010-01-21T14:46:30.000000Z
 1a533eec8d30b8612e7a01209614eee6
 2010-01-19T13:33:46.118556Z
 2145