@@ -6,28 +6,24 @@ class AdresserController < ApplicationController def query q = params[:query] - # "lyongade 19, 2300" - + # expecting address in format "Lyongade 19, 2300" or less vej,postnr = q.split(',') - vejnavn, husnr = vej.split(' ') + vejnavn, husnr = vej.split(/(\d{1,4})/) parameters = {} if(vejnavn) - parameters[:vejnavn] = vejnavn + parameters[:vejnavn] = vejnavn.strip end if(husnr) - parameters[:husnr] = husnr + parameters[:husnr] = husnr.strip end if(postnr) - parameters[:postnr] = postnr + parameters[:postnr] = postnr.strip end adresses = Adresse.find(:all,:params => parameters) - - - - render :partial => "adresse", :collection => adresses + render :partial => "adresser", :locals => {:adresser => adresses} end end app/controllers/adresser_controller.rb @@ -1,2 +1,4 @@ -<%= adresse.vej.navn %> <%= adresse.husnr %><br> -<%= adresse.postdistrikt.nr %> <%= adresse.postdistrikt.navn %><br> +<p> + <%= adresse.vej.navn %> <%= adresse.husnr %><br> + <%= adresse.postdistrikt.nr %> <%= adresse.postdistrikt.navn %><br> +</p> app/views/adresser/_adresse.html.erb @@ -1,12 +1,16 @@ <h1>Adresser</h1> -<% form_remote_tag :url => {:action => 'query'},:update => 'adr_search_result' do -%> +<% form_remote_tag :url => {:action => 'query'},:update => 'adr_search_result', +:loading => "$('in_progress').show();$('adr_search_result').hide();",:complete => "$('adr_search_result').show();$('in_progress').hide();" do -%> <p> <label for="query">Generisk søgestreng:<br> <%= text_field_tag 'query' %> (f.eks "lyongade 19, 2300", "lyongade" eller "lyongade 19") </label> </p> <p> - <%= submit_tag "søg" %> (ajaxrequest, endnu ingen progress indicator, klik og vent...) + <%= submit_tag "søg" %> + <div id="in_progress" style="display:none"> + <%= image_tag 'spinner_mac.gif' %> Laver opslag mod OIOREST.DK... + </div> </p> <% end -%> app/views/adresser/index.html.erb 6b6dcc4d2a02921b1b67960cda5e37c9a851460a Christian Dalager dalager@dalager.local http://github.com/dalager/oiorest-rails-examples/commit/d7e8583d6dfbabff5389cdd7a5c64f1c285bbbe1 d7e8583d6dfbabff5389cdd7a5c64f1c285bbbe1 2008-06-16T13:45:29-07:00 2008-06-16T13:45:29-07:00 Added better querystring parsing. Now it's possible to parse a two-word streetname like "tuborg havnevej 19" Added ajax progress indication cf14c0273e64afdaf1814133d1fe53194aeb0569 Christian Dalager dalager@dalager.local