iqvoc 4.0.9 → 4.1.0

data/app/models/concept/skos/scheme.rb

@@ -14,27 +14,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'singleton'
+class Concept::SKOS::Scheme < Concept::Base
+  private_class_method :new
 
-# virtual root node
-# NB:
-# * does not inherit from Concept::Base to avoid being included in all
-#   queries based on that class, including indirect ones (e.g. relations)
-# * persistence (i.e. a database record) is not required since this is a
-#   singleton and merely a static, virtual node
-class Concept::SKOS::Scheme
-  include Singleton
+  after_update :redeclare_top_concepts
 
   def self.rdf_class
-    :ConceptScheme
+    'ConceptScheme'
+  end
+
+  def self.rdf_predicate
+    'topConceptOf'
   end
 
   def self.rdf_namespace
-    :skos
+    'skos'
   end
 
-  def origin
-    :scheme
+  def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
+    rdf_subject.update_attribute :top_term, true
+  end
+
+  def self.instance
+    first_or_create!(:origin => 'scheme', :published_at => Time.now)
+  end
+
+  def self.create(attributes = nil, options = {}, &block)
+    raise TypeError, "Singleton" if first
+    super
+  end
+
+  def self.create!(attributes = nil, options = {}, &block)
+    raise TypeError, "Singleton" if first
+    super
   end
 
   def build_rdf_subject(&block)
@@ -43,4 +55,33 @@ class Concept::SKOS::Scheme
     IqRdf.build_uri(origin, ns.build_uri(self.class.rdf_class), &block)
   end
 
+  def top_concepts
+    Iqvoc::Concept.base_class.tops
+  end
+
+  def inline_top_concept_origins=(origins)
+    @inline_top_concept_origins = origins.to_s.
+      split(Iqvoc::InlineDataHelper::SPLITTER).map(&:strip)
+  end
+
+  def inline_top_concept_origins
+    @inline_top_concept_origins || top_concepts.map { |c| c.origin }.uniq
+  end
+
+  def inline_top_concepts
+    if @inline_top_concept_origins
+      Iqvoc::Concept.base_class.editor_selectable.where(:origin => @inline_top_concept_origins)
+    else
+      top_concepts.select { |c| c.editor_selectable? }
+    end
+  end
+
+  def redeclare_top_concepts
+    return if inline_top_concept_origins.nil? # There is nothing to do
+
+    Iqvoc::Concept.base_class.transaction do
+      Iqvoc::Concept.base_class.tops.update_all :top_term => false
+      Iqvoc::Concept.base_class.where(:origin => @inline_top_concept_origins).update_all(:top_term => true)
+    end
+  end
 end

data/app/models/concept/validations.rb

@@ -18,11 +18,11 @@ module Concept
       query = Concept::Base.by_origin(origin)
       existing_total = query.count
       if existing_total >= 2
-        errors.add :base, I18n.t("txt.models.concept.version_error")
+        errors.add :base, I18n.t("txt.models.concept.version_error", :origin => origin)
       elsif existing_total == 1
         unless (query.published.count == 0 and published?) or
                (query.published.count == 1 and not published?)
-          errors.add :base, I18n.t("txt.models.concept.version_error")
+          errors.add :base, I18n.t("txt.models.concept.version_error", :origin => origin)
         end
       end
     end

data/app/models/labeling/base.rb

@@ -41,6 +41,14 @@ class Labeling::Base < ActiveRecord::Base
     includes(:owner).merge(Concept::Base.published)
   end
 
+  def self.concept_expired
+    includes(:owner).merge(Iqvoc::Concept.base_class.expired)
+  end
+
+  def self.concept_not_expired
+    includes(:owner).merge(Iqvoc::Concept.base_class.not_expired)
+  end
+
   def self.label_published
     includes(:target).merge(Label::Base.published)
   end

data/app/models/labeling/skos/base.rb

@@ -28,14 +28,6 @@ class Labeling::SKOS::Base < Labeling::Base
     includes(:target).merge(self.label_class.where(:value => label, :language => language))
   end
 
-  def self.concept_expired
-    includes(:owner).merge(Iqvoc::Concept.base_class.expired)
-  end
-
-  def self.concept_not_expired
-    includes(:owner).merge(Iqvoc::Concept.base_class.not_expired)
-  end
-
   # ********** Methods
 
   def self.label_class

data/app/models/notation/base.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+
+# Copyright 2011 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Notation::Base < ActiveRecord::Base
+
+  self.table_name = 'notations'
+
+  class_attribute :rdf_namespace, :rdf_predicate
+  self.rdf_namespace = 'skos'
+  self.rdf_predicate = 'notation'
+
+  def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
+    # TODO: Adopt this to RDFAPI
+    data = rdf_object.match /"(?<value>.+)"\^\^<(?<data_type>.+)>/
+    create! :concept_id => rdf_subject.id,
+      :value => data[:value],
+      :data_type => data[:data_type]
+  end
+
+  def self.view_section(obj)
+    "main"
+  end
+
+  def self.view_section_sort_key(obj)
+    500
+  end
+
+  def self.partial_name(obj)
+    "partials/notation/base"
+  end
+
+  def self.edit_partial_name(obj)
+    "partials/notation/edit_base"
+  end
+
+  def build_rdf(document, subject)
+    raise "Notation::Base#build_rdf: Class #{self.name} needs to define self.rdf_namespace and self.rdf_predicate." unless self.rdf_namespace && self.rdf_predicate
+
+    if IqRdf::Namespace.find_namespace_class(self.rdf_namespace.camelcase)
+      subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, IqRdf::Literal.new(value, :none, URI.parse(data_type)))
+    else
+      raise "#{self.class}#build_rdf: couldn't find Namespace '#{self.rdf_namespace.camelcase}'."
+    end
+  end
+
+end

data/app/views/concepts/_form.html.erb

@@ -41,7 +41,7 @@
     <legend><%= Concept::Relation::Base.model_name.human(:count => 2) %></legend>
     <%- if Iqvoc::Concept.broader_relation_class.narrower_editable -%>
       <%= render Iqvoc::Concept.broader_relation_class.narrower_class.edit_partial_name(concept),
-        :concept => concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class %>
+        :concept => concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class, :f => f %>
     <%- end -%>
 
     <%= f.input :top_term, :as => :boolean, :input_html =>
@@ -57,12 +57,20 @@
   </fieldset>
   <!-- / Concept relations -->
 
+  <!-- Matches -->
   <fieldset>
     <legend><%= Match::Base.model_name.human(:count => 2) %></legend>
     <% Iqvoc::Concept.match_classes.each do |match_class| %>
       <%= render match_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => match_class, :f => f %>
     <% end %>
   </fieldset>
+  <!-- / Matches -->
+
+  <!-- Notations -->
+  <% Iqvoc::Concept.notation_classes.each do |notation_class| %>
+    <%= render notation_class.edit_partial_name(concept), :owner_klass => concept, :assoc_klass => notation_class, :f => f %>
+  <% end %>
+  <!-- / Notations -->
 
   <div class="form-actions">
     <%= f.submit t("txt.common.save"), :class => "btn-primary" %>

data/app/views/concepts/scheme/_sidebar.html.erb

@@ -0,0 +1,6 @@
+<%= sidebar do %>
+  <%= sidebar_header t('txt.common.representations') %>
+  <%= sidebar_item :icon => 'share', :text => 'HTML', :path => scheme_path(:format => :html) %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_scheme_url(:format => :rdf, :lang => nil), :id => 'rdf_link_xml' %>
+  <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_scheme_url(:format => :ttl, :lang => nil), :id => 'rdf_link_ttl' %>
+<% end %>

data/app/views/concepts/scheme/edit.html.erb

@@ -0,0 +1,30 @@
+<%= page_header :title => @scheme.class.model_name.human %>
+<%= error_messages_for @scheme %>
+<%= simple_form_for @scheme, :as => :concept, :url => scheme_path, :html => { :class => 'form-horizontal' } do |f| %>
+  <fieldset>
+    <legend><%= t 'txt.views.layouts.sections.labels' %></legend>
+    <% if not Iqvoc.const_defined?(:SKOSXL) %>
+      <p><%= t 'txt.common.hint_csv_input' %></p>
+    <% end %>
+    <%- Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| -%>
+      <%- languages.each do |language| -%>
+        <%= render labeling_class.edit_partial_name(@scheme), :f => f,
+          :concept => @scheme, :klass => labeling_class, :language => language %>
+      <%- end -%>
+    <%- end -%>
+  </fieldset>
+  <fieldset>
+    <legend><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></legend>
+    <%= f.input "concept[inline_top_concept_origins]", :label => t('txt.common.type_to_search') do %>
+      <%= text_field_tag "concept[inline_top_concept_origins]", @scheme.inline_top_concept_origins.join(Iqvoc::InlineDataHelper::JOINER),
+      :class => "entity_select",
+      :"data-query-url" => concepts_path(:format => :json),
+      :"data-entity-uri" => concept_path(:id => "{id}"),
+      :"data-entities" => @scheme.inline_top_concepts.
+      map { |c| concept_widget_data(c) }.to_json %>
+    <% end %>
+  </fieldset>
+  <div class="form-actions">
+    <%= f.submit t("txt.common.save"), :class => "btn-primary" %>
+  </div>
+<% end %>

data/app/views/concepts/scheme/show.html.erb

@@ -0,0 +1,19 @@
+<%= page_header :title => 'Concept Scheme' %>
+<%= render 'sidebar', :scheme => @scheme %>
+
+<% if can? :update, @scheme %>
+  <div class="editing_versioning_toolbar well">
+    <%= link_to t('txt.common.edit'), edit_scheme_path, :class => 'btn' %>
+  </div>
+<% end %>
+
+<% Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| %>
+  <% (languages || Iqvoc.available_languages).each do |lang| %>
+    <%= render labeling_class.partial_name(@scheme), :klass => labeling_class, :concept => @scheme, :lang => lang %>
+  <% end %>
+<% end %>
+
+<div class="relation panel">
+  <h3><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></h3>
+  <%= treeview @scheme.top_concepts %>
+</div>

data/app/views/hierarchy/show.html.erb

@@ -0,0 +1,5 @@
+<%= page_header :title => Iqvoc::Concept.base_class.model_name.human(:count => 2),
+        :desc => t("txt.views.navigation.hierarchical") %>
+<%= render "concepts/sidebars/plural" %>
+
+<%= nested_list(@concepts, :class => "concept-hierarchy") if @concepts %>

data/app/views/hierarchy/show.iqrdf

@@ -0,0 +1,24 @@
+hierarchy2rdf = lambda do |hash|
+  hash.each do |concept, rels|
+    document << concept.build_rdf_subject do |sbj|
+      sbj.Skos::topConceptOf IqRdf.build_uri(Iqvoc::Concept.root_class.instance.origin) if concept.top_term?
+
+      concept.pref_labelings.each do |labeling|
+        labeling.build_rdf(document, sbj)
+      end
+
+      rels.each do |relation, _|
+        @relation_class.new(:owner => concept, :target => relation). # XXX: hacky!?
+            build_rdf(document, sbj)
+      end
+
+      hierarchy2rdf.call(rels)
+    end
+  end
+end
+
+Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
+  document.namespaces(self.send(meth))
+end
+
+hierarchy2rdf.call(@concepts)

data/app/views/partials/notation/_base.html.erb

@@ -0,0 +1,8 @@
+<div class="relation panel">
+  <h2><%= klass.model_name.human(:count => 2) %></h2>
+  <div class="relation-body">
+    <%= item_listing(concept.notations_for_class(klass)) do |notation|
+      link_to notation.value, notation.data_type
+    end %>
+  </div>
+</div>

data/app/views/partials/notation/_edit_base.html.erb

@@ -0,0 +1,18 @@
+<fieldset class="note_relation" id="notations_data">
+  <legend><%= Notation::Base.model_name.human(:count => 2) %></legend>
+  <ol>
+    <% owner_klass.notations.each do |notation| %>
+      <%= content_tag(:li, :class => "inline_note #{" new" if notation.new_record?}") do %>
+        <%= f.simple_fields_for :notations, notation do |note_form| %>
+          <%= note_form.input :value, :input_html => { :class => 'span4' } %>
+          <%= note_form.input :data_type, :input_html => { :class => 'span4' } %>
+
+          <% unless notation.new_record? %>
+            <%= note_form.input :"_destroy", :as => :boolean, :label => t("txt.common.delete") %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </ol>
+  <input type="button" value="<%= t("txt.common.add_note") %>" class="btn pull-right">
+</fieldset>

data/config/application.rb

@@ -68,5 +68,7 @@ module Iqvoc
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    config.assets.initialize_on_precompile = false
   end
 end

data/config/engine.rb

@@ -8,7 +8,6 @@ require 'kaminari'
 require 'iq_rdf'
 require 'json'
 require 'rails_autolink'
-require 'fastercsv' if RUBY_VERSION < '1.9'
 require 'simple_form'
 require 'sass'
 require 'sass-rails'

data/config/initializers/mime_types.rb

@@ -20,5 +20,5 @@
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
 
-Mime::Type.register "application/xml+rdf", :rdf
-Mime::Type.register "text/turtle", :ttl
+Mime::Type.register "application/rdf+xml", :rdf
+Mime::Type.register "text/turtle", :ttl

data/config/locales/activerecord.de.yml

@@ -41,6 +41,8 @@ de:
       concept/relation/skos/related:
         one:   "Verwandter Begriff"
         other: "Verwandte Begriffe"
+      concept/skos/scheme:
+        one:   "Konzept-Schema"
       label/skos/base:
         one:   "Label"
         other: "Labels"
@@ -110,6 +112,9 @@ de:
       collection/member/base:
         one:   "Zugewiesene Kollektion"
         other: "Zugewiesene Kollektionen"
+      notation/base:
+        one:   "Notation"
+        other: "Notationen"
 
     attributes:
       concept/base:
@@ -122,6 +127,9 @@ de:
         language: "Sprache"
       note/base:
         value: "Wert"
+      notation/base:
+        value: "Wert"
+        data_type: "Datentyp (URL)"
       user:
         forename: "Vorname"
         surname: "Nachname"

data/config/locales/activerecord.en.yml

@@ -41,6 +41,8 @@ en:
       concept/relation/skos/related:
         one:   "Related term"
         other: "Related terms"
+      concept/skos/scheme:
+        one:   "Concept Scheme"
       label/skos/base:
         one:   "Label"
         other: "Labels"
@@ -110,6 +112,9 @@ en:
       collection/member/base:
         one:   "Assigned collection"
         other: "Assigned collections"
+      notation/base:
+        one:   "Notation"
+        other: "Notations"
 
     attributes:
       concept/base:
@@ -122,6 +127,9 @@ en:
         language: "Language"
       note/base:
         value: "Value"
+      notation/base:
+        value: "Value"
+        data_type: "Data type (URL)"
       user:
         forename: "Forename"
         surname: "Surname"

data/config/locales/activerecord.pt.yml

@@ -41,6 +41,8 @@ pt:
       concept/relation/skos/related:
         one:   "Termo relacionado"
         other: "Termos relacionados"
+      concept/skos/scheme:
+        one:   "esquema de conceito"
       label/skos/base:
         one:   "Rótulo"
         other: "Rótulos"
@@ -110,6 +112,9 @@ pt:
       collection/member/base:
         one:   "Coleção atribuída"
         other: "Coleções atribuídas"
+      notation/base:
+        one:   "Notação"
+        other: "Notações"
 
     attributes:
       concept/base:
@@ -122,6 +127,9 @@ pt:
         language: "Idioma"
       note/base:
         value: "Valor"
+      notation/base:
+        value: "Valor"
+        data_type: "Tipo de dados (URL)"
       user:
         forename: "Primeiro nome"
         surname: "Sobrenome"

data/config/locales/de.yml

@@ -343,6 +343,10 @@ de:
        config_info: "Synchronisierung mit Triplestore: %{target_info}"
        config_warning: "Bisher wurde kein Triplestore konfiguriert."
        batch_hint: "Für große Datenmengen sollte vom Systemadministrator `rake sync:all[%{host}]` ausgeführt werden."
+     concept_scheme:
+       save:
+         success: "Das Konzept-Schema wurde erfolgreich gespeichert."
+         error: "Das Konzept-Schema konnte nicht gespeichert werden."
 
    models:
      label:
@@ -351,7 +355,7 @@ de:
      concept:
        uri: "Konzept-URI"
        origin_error: "Origin ungültig!"
-       version_error: "Es existieren schon zwei Versionen dieses Konzepts"
+       version_error: "Es existieren schon zwei Versionen dieses Konzepts: %{origin}"
        no_pref_label_error: "Es muss mindestens ein bevorzugtes Label angegeben werden."
        orphan_error: "Es muss ein allgemeinerer Begriff zugewiesen oder der Begriff als Begriff oberster Ebene definiert werden."
        top_term_exclusive_error: "Einem Begriff oberster Ebene darf kein allgemeinerer Begriff zugewiesen werden."

data/config/locales/en.yml

@@ -350,6 +350,10 @@ en:
        config_info: "Synchronizing with triplestore: %{target_info}"
        config_warning: "Triplestore has not been configured yet."
        batch_hint: "For a large data sets please advise your sysadmin to execute `rake sync:all[%{host}]`."
+     concept_scheme:
+       save:
+         success: "Concept scheme has been saved."
+         error: "Concept scheme could not be saved."
 
    models:
      label:
@@ -358,7 +362,7 @@ en:
      concept:
        uri: "Concept URI"
        origin_error: "Invalid origin."
-       version_error: "New Concept version already exists."
+       version_error: "New Concept version already exists: %{origin}"
        no_pref_label_error: "At least one preferred label must be specified."
        orphan_error: "Missing broader term or Top Term assignment."
        top_term_exclusive_error: "A Top Term must not have any broader terms."

data/config/locales/pt.yml

@@ -348,6 +348,10 @@ pt:
        config_info: "Sincronizando com o repositório de triplas: %{target_info}"
        config_warning: "Repositório de triplas ainda não foi configurado."
        batch_hint: "Para um conjunto de dados grande por favor oriente seu administrador de sistema a executar `rake sync:all[%{host}]`."
+     concept_scheme:
+       save:
+         success: "A esquema de conceito foi salva."
+         error: "Não foi possível salvar a esquema de conceito."
 
    models:
      label:
@@ -356,7 +360,7 @@ pt:
      concept:
        uri: "URI do conceito"
        origin_error: "Origem inválida."
-       version_error: "Nova versão de Rótulo já existe."
+       version_error: "Nova versão de Rótulo já existe: %{origin}"
        no_pref_label_error: "No mínimo um Rótulo preferencial precisa ser especificado."
        orphan_error: "Faltando termo geral ou atribuição de Termo Principal."
        top_term_exclusive_error: "Um Termo Principal não pode ter nenhum termo geral."

data/config/routes.rb

@@ -2,23 +2,21 @@
 
 # Copyright 2011 innoQ Deutschland GmbH
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 Rails.application.routes.draw do
-  match 'schema(.:format)' => 'pages#schema', :as => 'schema'
-
   scope ':lang', :constraints => lambda { |params, req|
-    langs = Iqvoc::Concept.pref_labeling_languages.join("|").presence || "en"
+    langs = Iqvoc::Concept.pref_labeling_languages.join('|').presence || 'en'
     return params[:lang].to_s =~ /^#{langs}$/
   } do
 
@@ -26,50 +24,55 @@ Rails.application.routes.draw do
 
     resource  :user_session, :only => [:new, :create, :destroy]
     resources :users, :except => [:show]
-
     resources :concepts
     resources :collections
 
-    get "triplestore_sync" => "triplestore_sync#index"
-    post "triplestore_sync" => "triplestore_sync#sync"
+    get 'scheme' => 'concepts/scheme#show', :as => 'scheme'
+    get 'scheme/edit' => 'concepts/scheme#edit', :as => 'edit_scheme'
+    put 'scheme' => 'concepts/scheme#update'
 
-    match "/" => "frontpage#index"
+    get 'hierarchy/:root' => 'hierarchy#show'
 
-    match "concepts/:origin/branch(.:format)"      => "concepts/versions#branch",    :as => "concept_versions_branch"
-    match "concepts/:origin/merge(.:format)"       => "concepts/versions#merge",     :as => "concept_versions_merge"
-    match "concepts/:origin/lock(.:format)"        => "concepts/versions#lock",      :as => "concept_versions_lock"
-    match "concepts/:origin/unlock(.:format)"      => "concepts/versions#unlock",    :as => "concept_versions_unlock"
-    match "concepts/:origin/to_review(.:format)"   => "concepts/versions#to_review", :as => "concept_versions_to_review"
-    match "concepts/:origin/consistency_check(.:format)" => "concepts/versions#consistency_check", :as => "concept_versions_consistency_check"
+    get 'triplestore_sync' => 'triplestore_sync#index'
+    post 'triplestore_sync' => 'triplestore_sync#sync'
 
-    match 'alphabetical_concepts(/:prefix)(.:format)' => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
-    match 'untranslated_concepts/:prefix(.:format)'   => 'concepts/untranslated#index', :as => 'untranslated_concepts'
-    match 'hierarchical_concepts(.:format)' => 'concepts/hierarchical#index', :as => 'hierarchical_concepts'
-    match 'expired_concepts(.:format)' => 'concepts/expired#index', :as => 'expired_concepts'
+    post 'concepts/:origin/branch'      => 'concepts/versions#branch',    :as => 'concept_versions_branch'
+    post 'concepts/:origin/merge'       => 'concepts/versions#merge',     :as => 'concept_versions_merge'
+    post 'concepts/:origin/lock'        => 'concepts/versions#lock',      :as => 'concept_versions_lock'
+    post 'concepts/:origin/unlock'      => 'concepts/versions#unlock',    :as => 'concept_versions_unlock'
+    post 'concepts/:origin/to_review'   => 'concepts/versions#to_review', :as => 'concept_versions_to_review'
+    post 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', :as => 'concept_versions_consistency_check'
 
-    match 'dashboard(.:format)' => 'dashboard#index',      :as => 'dashboard'
+    get 'alphabetical_concepts(/:prefix)' => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
+    get 'untranslated_concepts/:prefix'   => 'concepts/untranslated#index', :as => 'untranslated_concepts'
+    get 'hierarchical_concepts' => 'concepts/hierarchical#index', :as => 'hierarchical_concepts'
+    get 'expired_concepts' => 'concepts/expired#index', :as => 'expired_concepts'
 
-    get 'config(.:format)' => 'instance_configuration#index', :as => 'instance_configuration'
-    put 'config(.:format)' => 'instance_configuration#update'
+    get 'dashboard' => 'dashboard#index', :as => 'dashboard'
 
-    get "import" => "import#index", :as => 'import'
-    post "import" => "import#import"
+    get 'config' => 'instance_configuration#index', :as => 'instance_configuration'
+    put 'config' => 'instance_configuration#update'
 
-    match 'search(.:format)' => 'search_results#index', :as => 'search'
+    get 'import' => 'import#index', :as => 'import'
+    post 'import' => 'import#import'
 
-    get "help" => "pages#help", :as => "help"
+    get 'search' => 'search_results#index', :as => 'search'
 
+    get 'help' => 'pages#help', :as => 'help'
+
+    get '/' => 'frontpage#index'
     root :to => 'frontpage#index', :format => nil
   end
 
-  match 'schema(.:format)' => 'pages#schema', :as => 'schema'
-  match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'
+  get 'schema' => redirect('/'), :as => 'schema'
+
+  get 'scheme' => 'concepts/scheme#show', :as => 'rdf_scheme'
+  get 'search' => 'search_results#index', :as => 'rdf_search'
 
-  get 'search(.:format)' => 'search_results#index', :as => 'rdf_search'
-  get '/:id(.:format)' => 'rdf#show', :as => 'rdf'
-  get '/collections/:id(.:format)', :as => "rdf_collection", :to => "collections#show"
-  get '/collections', :as => "rdf_collections", :to => "collections#index"
+  get ':id' => 'rdf#show', :as => 'rdf'
 
+  get 'collections/:id', :as => 'rdf_collection', :to => 'collections#show'
+  get 'collections', :as => 'rdf_collections', :to => 'collections#index'
 
   root :to => 'frontpage#index', :format => nil
 end

data/db/migrate/20130315093255_add_notations.rb

@@ -0,0 +1,9 @@
+class AddNotations < ActiveRecord::Migration
+  def change
+    create_table :notations do |t|
+      t.integer "concept_id"
+      t.string "value", :limit => 4000
+      t.string "data_type", :limit => 4000
+    end
+  end
+end

data/db/migrate/20130315141952_add_indexes_to_notations.rb

@@ -0,0 +1,5 @@
+class AddIndexesToNotations < ActiveRecord::Migration
+  def change
+    add_index :notations, :concept_id
+  end
+end