diff options
| -rwxr-xr-x | sources/projects/import.rb | 2 | ||||
| -rwxr-xr-x | sources/projects/parse.rb | 4 | ||||
| -rw-r--r-- | sources/projects/pre.sql | 2 | ||||
| -rw-r--r-- | web/lib/api/v4/projects.rb | 4 | ||||
| -rw-r--r-- | web/views/taginfo/projects.erb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sources/projects/import.rb b/sources/projects/import.rb index 4004892..f128281 100755 --- a/sources/projects/import.rb +++ b/sources/projects/import.rb @@ -61,7 +61,7 @@ projects.each do |id, url| rescue last_modified = Time.now.utc end - db.execute("INSERT INTO projects (id, json_url, last_modified, fetch_date, fetch_status, fetch_json, fetch_result, data_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", + db.execute("INSERT INTO projects (id, json_url, last_modified, fetch_date, fetch_status, fetch_json, status, data_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", id, url, last_modified, diff --git a/sources/projects/parse.rb b/sources/projects/parse.rb index 1471d0e..679d9de 100755 --- a/sources/projects/parse.rb +++ b/sources/projects/parse.rb @@ -36,7 +36,7 @@ db = SQLite3::Database.new(dir + '/taginfo-projects.db') #------------------------------------------------------------------------------ -projects = db.execute("SELECT id, fetch_json FROM projects WHERE fetch_result='OK' ORDER BY id") +projects = db.execute("SELECT id, fetch_json FROM projects WHERE status='OK' ORDER BY id") projects.each do |id, json| puts " #{id}..." @@ -89,7 +89,7 @@ projects.each do |id, json| end end rescue JSON::ParserError - db.execute("UPDATE projects SET fetch_result='PARSE_ERROR' WHERE id=?", id) + db.execute("UPDATE projects SET status='PARSE_ERROR' WHERE id=?", id) end end diff --git a/sources/projects/pre.sql b/sources/projects/pre.sql index 6e4c0de..ae55fbf 100644 --- a/sources/projects/pre.sql +++ b/sources/projects/pre.sql @@ -17,7 +17,7 @@ CREATE TABLE projects ( fetch_date DATE, fetch_status TEXT, -- HTTP status code fetch_json TEXT, -- HTTP body - fetch_result TEXT, -- 'OK', 'FETCH ERROR', 'PARSE ERROR' + status TEXT, -- 'OK', 'FETCH ERROR', 'PARSE ERROR' data_format INTEGER, data_updated DATE, data_url TEXT, diff --git a/web/lib/api/v4/projects.rb b/web/lib/api/v4/projects.rb index 1ab9ede..e920857 100644 --- a/web/lib/api/v4/projects.rb +++ b/web/lib/api/v4/projects.rb @@ -25,12 +25,12 @@ class Taginfo < Sinatra::Base q = like_contains(params[:query]) total = @db.count('projects.projects'). - condition("fetch_result=?", status). + condition("status=?", status). condition_if("name LIKE ? ESCAPE '@' OR description LIKE ? ESCAPE '@'", q, q). get_first_value().to_i res = @db.select('SELECT * FROM projects.projects'). - condition("fetch_result=?", status). + condition("status=?", status). condition_if("name LIKE ? ESCAPE '@' OR description LIKE ? ESCAPE '@'", q, q). order_by(@ap.sortname, @ap.sortorder) { |o| o.name 'lower(name)' diff --git a/web/views/taginfo/projects.erb b/web/views/taginfo/projects.erb index dda4111..bca034d 100644 --- a/web/views/taginfo/projects.erb +++ b/web/views/taginfo/projects.erb @@ -23,7 +23,7 @@ <%= h(project['data_updated']) %> </td> <td class="tc<%= c %> nowrap"><%= h(project['fetch_status']) %></td> - <td class="tc<%= c %> nowrap"><%= h(project['fetch_result']) %></td> + <td class="tc<%= c %> nowrap"><%= h(project['status']) %></td> <td class="<%= c %> nowrap"> <a href="<%= h(project['json_url']) %>"><%= h(project['json_url']) %></a><br/> <a href="<%= h(project['data_url']) %>"><%= h(project['data_url']) %></a> |