summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2013-01-06 18:11:56 +0100
committerJochen Topf <jochen@topf.org>2013-01-06 18:11:56 +0100
commit9474196b76b491668c3120455b0a02896d2c5e3c (patch)
tree969c3101ac0a09f252928ef1d421f6308701b1f5 /web
parent0393d1b98ff38fa1015ae7b82eff9fbae783b8ef (diff)
downloadtaginfo-9474196b76b491668c3120455b0a02896d2c5e3c.tar
taginfo-9474196b76b491668c3120455b0a02896d2c5e3c.tar.gz
Updated (and disabled) unfinished langtag api
Diffstat (limited to 'web')
-rw-r--r--web/lib/api/langtag.rb4
-rwxr-xr-xweb/taginfo.rb2
-rw-r--r--web/viewsjs/reports/name_tags.js.erb4
3 files changed, 5 insertions, 5 deletions
diff --git a/web/lib/api/langtag.rb b/web/lib/api/langtag.rb
index 1c2eca1..3f4f505 100644
--- a/web/lib/api/langtag.rb
+++ b/web/lib/api/langtag.rb
@@ -1,7 +1,7 @@
# web/lib/api/langtag.rb
class Taginfo < Sinatra::Base
- api(2, 'langtag/name', {
+ api(4, 'keys/name', {
:description => 'Get list of keys from the database that contain the string "name".',
:parameters => { :query => 'Only show keys matching this query (substring match, optional).' },
:paging => :optional,
@@ -75,7 +75,7 @@ class Taginfo < Sinatra::Base
@@bcp47_filters[type.to_sym] = { :expr => type, :doc => "Show entries of type '#{type}' only." };
end
- api(2, 'langtag/bcp47', {
+ api(4, 'langtags', {
:description => 'Get official subtags from the IETF BCP47 registry.',
:parameters => { :query => 'Only show entries matching this query (case insensitive substring match on subtags and description; optional).' },
:paging => :optional,
diff --git a/web/taginfo.rb b/web/taginfo.rb
index b0216d2..0222ec1 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -192,7 +192,6 @@ class Taginfo < Sinatra::Base
load 'lib/api/reports.rb'
load 'lib/api/search.rb'
load 'lib/api/wiki.rb'
- load 'lib/api/langtag.rb'
# current API (version 4)
load 'lib/api/site.rb'
@@ -200,6 +199,7 @@ class Taginfo < Sinatra::Base
load 'lib/api/keys.rb'
load 'lib/api/tag.rb'
load 'lib/api/tags.rb'
+# load 'lib/api/langtag.rb'
load 'lib/ui/embed.rb'
load 'lib/ui/keys_tags.rb'
diff --git a/web/viewsjs/reports/name_tags.js.erb b/web/viewsjs/reports/name_tags.js.erb
index 7781f58..e0aed07 100644
--- a/web/viewsjs/reports/name_tags.js.erb
+++ b/web/viewsjs/reports/name_tags.js.erb
@@ -5,7 +5,7 @@
var create_flexigrid_for = {
"overview": function() {
create_flexigrid('grid-name', {
- url: '/api/2/langtag/name',
+ url: '/api/4/keys/name',
colModel: [
{ display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
{ display: '<%= osm.objects %>', name: 'count_all', width: 100, sortable: true, align: 'right' },
@@ -44,7 +44,7 @@ var create_flexigrid_for = {
},
"bcp47": function(filter_type) {
create_flexigrid('grid-bcp47-subtags', {
- url: '/api/2/langtag/bcp47?filter=' + encodeURIComponent(filter_type),
+ url: '/api/4/langtags?filter=' + encodeURIComponent(filter_type),
colModel: [
{ display: 'Type', name: 'type', width: 80, sortable: false },
{ display: 'Subtag', name: 'subtag', width: 80, sortable: true },