c-busqueda/handler.cr

@@ -4,7 +4,7 @@ require "ishi/html"
 require "json"
 
 class Handler
-  def format_buffer(buffer, canvas_name, title = "")
+  def format_buffer(buffer, canvas_name, title)
     # Process the gnuplot output so it works in the page
     #
     # buffer is the Ishi output

c-historico/handler.cr

@@ -6,17 +6,16 @@ require "json"
 require "uuid"
 
 class Handler
-  def format_buffer(buffer, canvas_name, title = "")
+  def format_buffer(buffer, canvas_name)
     # Process the gnuplot output so it works in the page
     #
     # buffer is the Ishi output
     # name is a string to replace for gnuplot_canvas so
-    #      we can have multiple charts in a page
+    # we can have multiple charts in a page
-    # title is added on top of the chart
 
     html = buffer.to_s.split("\n")
     html = html[html.index("<script type=\"text/javascript\">")..html.index("</script>")]
-    html = "<b>#{title}</b>" + html.join("\n") + %(
+    html = html.join("\n") + %(
     <div class="gnuplot">
     <canvas id="Tile" width="32" height="32" hidden></canvas>
     <table class="plot">
@@ -37,11 +36,6 @@ class Handler
   end
 
   def query(sql)
-    # Runs a SQL query against the Rqlite database.
-    #
-    # Returns an array of values (which need to be casted)
-    # Or nil if there are no results
-
     params = URI::Params.encode({"q": sql})
     response = HTTP::Client.get URI.new(
       "http",
@@ -53,10 +47,12 @@ class Handler
     # This API only has a values key when there are actual results
     results = JSON.parse(response.body)["results"][0].as_h
     if results.has_key?("values")
-      return results["values"].as_a
+      return results["values"].as_a.map { |r|
+        [r[0].as_i, r[1].as_i]
+      }
     end
-    # No result, return nil
+    # Return a dummy result
-    nil
+    [[1922, 0]]
   end
 
   nombres = [] of String
@@ -96,22 +92,15 @@ class Handler
         sql = "SELECT anio, contador FROM nombres WHERE nombre = '#{nombre}' ORDER BY anio"
         x = Array(Int32).new
         y = Array(Int32).new
-        results = query(sql)
+        query(sql).map { |r|
-        if results.nil?  # No results, all 0s
+          x << r[0]
-          x = (1922..2015).to_a
+          y << r[1]
-          y = x.map {|_| 0}
+        }
-        else  # We got results
-          displayed = true
-          results.map { |r|
-            x << r[0].as_i
-            y << r[1].as_i
-          }
-        end
         plot(x, y, title: nombre.titleize, style: :lines, linewidth: 3)
       }
     end
 
-    return {
+    {
       body:        format_buffer(buffer, "historico"),
       status_code: 200,
       headers:     HTTP::Headers{"Content-Type" => "text/html"},