不处理domain和ip，删除hosthash

Author: zhaowu

app/helpers/api_helper.rb

@@ -10,7 +10,7 @@ def search(query, page_count=10)
 
     @results = nil
     begin
-      options = {:index => 'idx1',:sql => { :select => 'id,ip,title,header,host,hosthash,lastupdatetime'},:per_page => page_count,:page => params['page'],:order => "lastupdatetime DESC"}#:retry_stale => 2,
+      options = {:index => 'idx1',:sql => { :select => 'id,ip,title,header,host,lastupdatetime'},:per_page => page_count,:page => params['page'],:order => "lastupdatetime DESC"}#:retry_stale => 2,
       if @query_l
         @mode = "extended"
         options[:match_mode] = :extended
@@ -22,7 +22,7 @@ def search(query, page_count=10)
       @tags = {}
       #if @results
       #  @results.each {|x|
-      #    @tags[x.hosthash] = Tag.find_by_hosthash x.hosthash
+      #    @tags[x.host] = Tag.find_by_host x.host
       #    @error, @msg = Userhost.add_user_host(x.host, '127.0.0.2')
       #    puts "error: #{@msg}" if @error
       #  }

app/jobs/module/process_class.rb

@@ -137,13 +137,13 @@ def add_host_to_webdb(host, force=false)
       #puts host
       #pp http_info
       #更新ip
-      @webdb.insert_ip_to_ipaddr(http_info[:ip])
+      #@webdb.insert_ip_to_ipaddr(http_info[:ip])
 
       if domain_is_ip
         @webdb.update_host_to_subdomain(host, domain, '', http_info, exists_host)
       else
         #更新根域名表
-        @webdb.insert_domain_to_rootdomain(domain, exists_host)
+        #@webdb.insert_domain_to_rootdomain(domain, exists_host)
         #更新子域名表
         @webdb.update_host_to_subdomain(host, domain, domain_info.subdomain, http_info, exists_host)
       end
@@ -200,4 +200,4 @@ def self.perform(url)
     #puts "#{@@p.class.name}.perform called"
     @@p.add_host_to_webdb(url,false)
   end
-end
+end

app/jobs/module/webdb2_class.rb

@@ -100,8 +100,8 @@ def db_insert_host(db, host, domain, subdomain, r)
     body ||= ''
     ip = r[:ip]
 
-    sql = "insert into subdomain (host, hosthash, domain, reverse_domain, subdomain, ip, header, title, body, lastchecktime, lastupdatetime)"
-    sql += " values('#{Mysql2::Client.escape(host)}', '#{Digest::MD5.hexdigest(host)}', '#{Mysql2::Client.escape(domain)}', '#{Mysql2::Client.escape(domain.reverse)}', "
+    sql = "insert into subdomain (host, domain, reverse_domain, subdomain, ip, header, title, body, lastchecktime, lastupdatetime)"
+    sql += " values('#{Mysql2::Client.escape(host)}', '#{Mysql2::Client.escape(domain)}', '#{Mysql2::Client.escape(domain.reverse)}', "
     sql += "'#{Mysql2::Client.escape(subdomain)}', '#{Mysql2::Client.escape(ip)}', '#{Mysql2::Client.escape(header)}', "
     sql += "'#{Mysql2::Client.escape(title)}', '#{Mysql2::Client.escape(body.force_encoding('UTF-8'))}', now(), now())"
     #puts sql
@@ -122,7 +122,7 @@ def db_update_host(db, host, r)
     sql += ", header='#{Mysql2::Client.escape(header)}'"
     sql += ", title='#{Mysql2::Client.escape(title)}'"
     sql += ", body='#{Mysql2::Client.escape(body.force_encoding('UTF-8'))}'"
-    sql += ", lastupdatetime=now() where hosthash='#{Digest::MD5.hexdigest(host)}'"
+    sql += ", lastupdatetime=now() where host='#{Mysql2::Client.escape(host)}'"
     #puts sql
     db_exec(db, sql)
   end
@@ -138,7 +138,7 @@ def db_insert_ip(ip)
   end
 
   def db_update_subdomain_checktime(host)
-    db_exec(@mysql, "update subdomain set lastchecktime=NOW() where hosthash='#{Digest::MD5.hexdigest(host)}'")
+    db_exec(@mysql, "update subdomain set lastchecktime=NOW() where host='#{Mysql2::Client.escape(host)}'")
     redis_update_checktime(host)
   end
 

app/models/tag.rb

@@ -1,7 +1,7 @@
 class Tag < ActiveRecord::Base
   self.table_name = "tags"
 
-  def get(hosthash)
+  def get(host)
 
   end
 end

app/views/search/result.html.erb

@@ -78,13 +78,13 @@
       <br/> <%= link_to doc.ip, "/search/result?qbase64="+CGI.escape(Base64.encode64('ip="'+doc.ip+'"')) %>
     <br/> 更新时间：<%= doc.lastupdatetime.to_datetime.strftime('%F') %>
   <br/> 
-  <% if @tags[doc.hosthash] %>
-    <% if @tags[doc.hosthash].is_a?(Array) %>
-      <% @tags[doc.hosthash].each do |tag| %>
+  <% if @tags[doc.host] %>
+    <% if @tags[doc.host].is_a?(Array) %>
+      <% @tags[doc.host].each do |tag| %>
         <a type="button" class="btn btn-success" href="/search/result?q=<%=tag.tag%>"><%=tag.tag%></a>
       <% end %>
     <% else %>
-      <a type="button" class="btn btn-success" href="/search/result?q=<%=@tags[doc.hosthash].tag%>"><%=@tags[doc.hosthash].tag%></a>
+      <a type="button" class="btn btn-success" href="/search/result?q=<%=@tags[doc.host].tag%>"><%=@tags[doc.host].tag%></a>
     <% end %>
   <% end %>
 </div>