qa_server 2.2.3 → 3.0.0

data/app/views/qa_server/monitor_status/_performance.html.erb

@@ -1,44 +1,75 @@
-  <% if @presenter.display_performance? && @presenter.performance_data? %>
+<% if @presenter.display_performance? && @presenter.performance_data? %>
     <div id="performance-data" class="status-section">
       <h3><%= t('qa_server.monitor_status.performance.title') %></h3>
 
-      <% if @presenter.display_performance_graph? %>
+  <% if @presenter.display_performance_graph? %>
       <script>
-        function switch_performance_view(base_id, time_period) {
-          document.getElementById(base_id+'-during-day').className = 'performance-data-section-hidden';
-          document.getElementById(base_id+'-during-month').className = 'performance-data-section-hidden';
-          document.getElementById(base_id+'-during-year').className = 'performance-data-section-hidden';
-          document.getElementById(base_id+'-during-'+time_period).className = 'performance-data-section-visible';
+        function switch_performance_view(base_id, time_period, action) {
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :all_actions, time_period: :day) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :all_actions, time_period: :month) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :all_actions, time_period: :year) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :search, time_period: :day) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :search, time_period: :month) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :search, time_period: :year) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :fetch, time_period: :day) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :fetch, time_period: :month) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'<%= @presenter.performance_graph_data_section_id(action: :fetch, time_period: :year) %>').className = 'performance-data-section-hidden';
+          document.getElementById(base_id+'-'+action+'-during-'+time_period).className = 'performance-data-section-visible';
         }
       </script>
 
-      <% @presenter.performance_graphs.each do |graph_info| %>
+    <% @presenter.performance_graphs.each do |graph_info| %>
+      <% time_period = @presenter.performance_graph_time_period(graph_info) %>
+      <% action = @presenter.performance_graph_action(graph_info) %>
       <div id="<%= @presenter.performance_graph_data_section_id(graph_info) %>" class="<%= @presenter.performance_data_section_class(graph_info) %>">
-        <div class="right-menu-section">
+        <div class="performance-graph-menu-section">
           <h4><%= @presenter.performance_graph_authority(graph_info) %></h4>
-          <ul class="right-menu">
-            <% if @presenter.performance_day_graph_selected?(graph_info) %>
+          <ul class="time-period-menu">
+            <% if @presenter.performance_day_graph?(graph_info) %>
               <li class="selected"><%= t('qa_server.monitor_status.performance.menu_day') %></li>
             <% else %>
-              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'day')">
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'day', '<%= action %>')">
                 <%= t('qa_server.monitor_status.performance.menu_day') %>
               </li>
             <% end %>
-            <% if @presenter.performance_month_graph_selected?(graph_info) %>
+            <% if @presenter.performance_month_graph?(graph_info) %>
               <li class="selected"><%= t('qa_server.monitor_status.performance.menu_month') %></li>
             <% else %>
-              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'month')">
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'month', '<%= action %>')">
                 <%= t('qa_server.monitor_status.performance.menu_month') %>
               </li>
             <% end %>
-            <% if @presenter.performance_year_graph_selected?(graph_info) %>
+            <% if @presenter.performance_year_graph?(graph_info) %>
               <li class="selected"><%= t('qa_server.monitor_status.performance.menu_year') %></li>
             <% else %>
-              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'year')">
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', 'year', '<%= action %>')">
                 <%= t('qa_server.monitor_status.performance.menu_year') %>
               </li>
             <% end %>
           </ul>
+          <ul class="action-menu">
+            <% if @presenter.performance_all_actions_graph?(graph_info) %>
+              <li class="selected"><%= t('qa_server.monitor_status.performance.menu_all_actions') %></li>
+            <% else %>
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', '<%= time_period %>', 'all_actions')">
+                <%= t('qa_server.monitor_status.performance.menu_all_actions') %>
+              </li>
+            <% end %>
+            <% if @presenter.performance_search_graph?(graph_info) %>
+              <li class="selected"><%= t('qa_server.monitor_status.performance.menu_search') %></li>
+            <% else %>
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', '<%= time_period %>', 'search')">
+                <%= t('qa_server.monitor_status.performance.menu_search') %>
+              </li>
+            <% end %>
+            <% if @presenter.performance_fetch_graph?(graph_info) %>
+              <li class="selected"><%= t('qa_server.monitor_status.performance.menu_fetch') %></li>
+            <% else %>
+              <li class="clickable" onClick="switch_performance_view('<%= @presenter.performance_graph_data_section_base_id(graph_info) %>', '<%= time_period %>', 'fetch')">
+                <%= t('qa_server.monitor_status.performance.menu_fetch') %>
+              </li>
+            <% end %>
+          </ul>
         </div>
 
         <div id="<%= @presenter.performance_graph_id(graph_info) %>" class="performance-chart">
@@ -46,45 +77,89 @@
           <%= image_tag(@presenter.performance_graph(graph_info), alt: @presenter.performance_graph_label(graph_info)) %>
         </div>
       </div>
-      <% end %>
-    </div>
     <% end %>
+    </div>
+  <% end %>
 
-    <% if @presenter.display_performance_datatable? %>
+  <% if @presenter.display_performance_datatable? %>
     <div id="performance-datatable-section">
       <h4><%= @presenter.performance_table_description %></h4>
       <table class="status">
         <tr>
           <th></th>
+          <th colspan="3" class="table_subheading"><%= t('qa_server.monitor_status.performance.search') %></th>
+          <th colspan="3" class="table_subheading"><%= t('qa_server.monitor_status.performance.fetch') %></th>
+          <th colspan="3" class="table_subheading"><%= t('qa_server.monitor_status.performance.all_actions') %></th>
+        </tr>
+        <tr>
+          <th></th>
+          <th><%= t('qa_server.monitor_status.performance.slowest_times') %></th>
+          <th><%= t('qa_server.monitor_status.performance.average_times') %></th>
+          <th><%= t('qa_server.monitor_status.performance.fastest_times') %></th>
+          <th><%= t('qa_server.monitor_status.performance.slowest_times') %></th>
+          <th><%= t('qa_server.monitor_status.performance.average_times') %></th>
+          <th><%= t('qa_server.monitor_status.performance.fastest_times') %></th>
           <th><%= t('qa_server.monitor_status.performance.slowest_times') %></th>
           <th><%= t('qa_server.monitor_status.performance.average_times') %></th>
           <th><%= t('qa_server.monitor_status.performance.fastest_times') %></th>
         </tr>
         <% @presenter.performance_data.each do |authority_name, data| %>
-          <% stats = @presenter.datatable_stats(data) %>
+          <% search_stats = @presenter.datatable_search_stats(data) %>
+          <% fetch_stats = @presenter.datatable_fetch_stats(data) %>
+          <% all_actions_stats = @presenter.datatable_all_actions_stats(data) %>
           <tr>
-            <td class="table_subheading" colspan="4"><%= authority_name %></td>
+            <td class="table_subheading" colspan="10"><%= authority_name %></td>
           </tr>
           <tr>
-            <th><%= t('qa_server.monitor_status.performance.load_times') %></th>
-            <td class="status-neutral"><%= @presenter.high_load(stats) %></td>
-            <td class="status-neutral"><%= @presenter.avg_load(stats) %></td>
-            <td class="status-neutral"><%= @presenter.low_load(stats) %></td>
+            <th><%= t('qa_server.monitor_status.performance.retrieve_times') %></th>
+            <td class="<%= @presenter.high_full_request_style(search_stats) %>"><%= @presenter.high_retrieve(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.avg_retrieve(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.low_retrieve(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.high_retrieve(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.avg_retrieve(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.low_retrieve(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.high_retrieve(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.avg_retrieve(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.low_retrieve(all_actions_stats) %></td>
+          </tr>
+          <tr>
+            <th><%= t('qa_server.monitor_status.performance.graph_load_times') %></th>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.high_graph_load(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.avg_graph_load(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.low_graph_load(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.high_graph_load(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.avg_graph_load(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.low_graph_load(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.high_graph_load(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.avg_graph_load(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.low_graph_load(all_actions_stats) %></td>
           </tr>
           <tr>
             <th><%= t('qa_server.monitor_status.performance.normalization_times') %></th>
-            <td class="status-neutral"><%= @presenter.high_normalization(stats) %></td>
-            <td class="status-neutral"><%= @presenter.avg_normalization(stats) %></td>
-            <td class="status-neutral"><%= @presenter.low_normalization(stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.high_normalization(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.avg_normalization(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(search_stats) %>"><%= @presenter.low_normalization(search_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.high_normalization(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.avg_normalization(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(fetch_stats) %>"><%= @presenter.low_normalization(fetch_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.high_normalization(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.avg_normalization(all_actions_stats) %></td>
+            <td class="<%= @presenter.datatable_data_style(all_actions_stats) %>"><%= @presenter.low_normalization(all_actions_stats) %></td>
           </tr>
           <tr>
             <th><%= t('qa_server.monitor_status.performance.full_request_times') %></th>
-            <td class="<%= @presenter.high_full_request_style(stats) %>"><%= @presenter.high_full_request(stats) %></td>
-            <td class="<%= @presenter.avg_full_request_style(stats) %>"><%= @presenter.avg_full_request(stats) %></td>
-            <td class="<%= @presenter.low_full_request_style(stats) %>"><%= @presenter.low_full_request(stats) %></td>
+            <td class="<%= @presenter.high_full_request_style(search_stats) %>"><%= @presenter.high_full_request(search_stats) %></td>
+            <td class="<%= @presenter.avg_full_request_style(search_stats) %>"><%= @presenter.avg_full_request(search_stats) %></td>
+            <td class="<%= @presenter.low_full_request_style(search_stats) %>"><%= @presenter.low_full_request(search_stats) %></td>
+            <td class="<%= @presenter.high_full_request_style(fetch_stats) %>"><%= @presenter.high_full_request(fetch_stats) %></td>
+            <td class="<%= @presenter.avg_full_request_style(fetch_stats) %>"><%= @presenter.avg_full_request(fetch_stats) %></td>
+            <td class="<%= @presenter.low_full_request_style(fetch_stats) %>"><%= @presenter.low_full_request(fetch_stats) %></td>
+            <td class="<%= @presenter.high_full_request_style(all_actions_stats) %>"><%= @presenter.high_full_request(all_actions_stats) %></td>
+            <td class="<%= @presenter.avg_full_request_style(all_actions_stats) %>"><%= @presenter.avg_full_request(all_actions_stats) %></td>
+            <td class="<%= @presenter.low_full_request_style(all_actions_stats) %>"><%= @presenter.low_full_request(all_actions_stats) %></td>
           </tr>
         <% end %>
       </table>
     </div>
-    <% end %>
   <% end %>
+<% end %>

data/config/locales/qa_server.en.yml

@@ -76,12 +76,19 @@ en:
         percent_failing: Percent Failing
       performance:
         title:           Performance Metrics
+        search:          Search Only
+        fetch:           Fetch Only
+        all_actions:     All Actions
         menu_day:        Day
         menu_month:      Month
         menu_year:       Year
-        load_time_ms:          Load Time (ms)
+        menu_all_actions: All Requests
+        menu_search:      Search
+        menu_fetch:       Fetch
+        graph_load_time_ms:    Graph Load Time (ms)
         normalization_time_ms: Normalization Time (ms)
-        full_request_time_ms:      Full Request Time (ms)
+        retrieve_time_ms:      Retrieve Time (ms)
+        full_request_time_ms:  Full Request Time (ms)
         x_axis_hour:     Hour
         x_axis_day:      Day
         x_axis_month:    Month

data/lib/generators/qa_server/config_generator.rb

@@ -40,6 +40,7 @@ class QaServer::ConfigGenerator < Rails::Generators::Base
       "\n      config.to_prepare do"\
       "\n        Qa::Authorities::LinkedData::FindTerm.prepend PrependedLinkedData::FindTerm"\
       "\n        Qa::Authorities::LinkedData::SearchQuery.prepend PrependedLinkedData::SearchQuery"\
+      "\n        RDF::Graph.prepend PrependedRdf::RdfGraph"\
       "\n      end\n"
     end
   end

data/lib/generators/qa_server/templates/config/authorities/linked_data/agrovoc_ld4l_cache.json

@@ -35,7 +35,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/agrovoc_batch.jsp?{?query}&{?maxRecords}&{?entity}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/agrovoc_batch.jsp?{?query}&{?maxRecords}&{?startRecord}&{?entity}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -59,6 +59,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",

data/lib/generators/qa_server/templates/config/authorities/linked_data/dbpedia_ld4l_cache.json

@@ -34,7 +34,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/dbpedia_name_batch.jsp?{?entity}&{?query}&{?maxRecords}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/dbpedia_name_batch.jsp?{?entity}&{?query}&{?maxRecords}&{?startRecord}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -58,6 +58,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",

data/lib/generators/qa_server/templates/config/authorities/linked_data/geonames_ld4l_cache.json

@@ -36,7 +36,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/geonames_batch.jsp?{?query}&{?entity}&{?maxRecords}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/geonames_batch.jsp?{?query}&{?entity}&{?maxRecords}&{?startRecord}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -60,6 +60,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",
@@ -85,6 +92,7 @@
           "property_label_i18n": "qa.linked_data.authority.geonames_ld4l_cache.parent_adm1_label",
           "property_label_default": "Parent",
           "ldpath": "geonames:parentADM1 :: xsd:string",
+          "expansion_label_ldpath": "geonames:name ::xsd:string",
           "selectable": false,
           "drillable": false
         },
@@ -92,6 +100,7 @@
           "property_label_i18n": "qa.linked_data.authority.geonames_ld4l_cache.parent_adm2_label",
           "property_label_default": "Parent2",
           "ldpath": "geonames:parentADM2 :: xsd:string",
+          "expansion_label_ldpath": "geonames:name ::xsd:string",
           "selectable": false,
           "drillable": false
         },
@@ -99,6 +108,7 @@
           "property_label_i18n": "qa.linked_data.authority.geonames_ld4l_cache.parent_country_label",
           "property_label_default": "Parent Country",
           "ldpath": "geonames:parentCountry :: xsd:string",
+          "expansion_label_ldpath": "geonames:name ::xsd:string",
           "selectable": false,
           "drillable": false
         },

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_aat_ld4l_cache.json

@@ -36,7 +36,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&entity=Concept&{?maxRecords}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&entity=Concept&{?maxRecords}&{?startRecord}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -60,6 +60,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_tgn_ld4l_cache.json

@@ -37,7 +37,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&entity=Place&{?maxRecords}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&entity=Place&{?maxRecords}&{?startRecord}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -54,6 +54,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_ulan_ld4l_cache.json

@@ -36,7 +36,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&{?entity}&{?maxRecords}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/getty_batch.jsp?{?query}&{?entity}&{?maxRecords}&{?startRecord}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -60,6 +60,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",

data/lib/generators/qa_server/templates/config/authorities/linked_data/locdemographics_ld4l_cache.json

@@ -1,6 +1,7 @@
 {
   "QA_CONFIG_VERSION": "2.1",
   "prefixes": {
+    "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
     "vivo":    "http://vivoweb.org/ontology/core#"
   },
@@ -120,7 +121,7 @@
         {
           "property_label_i18n": "qa.linked_data.authority.locdemographics_ld4l_cache.earlier_form",
           "property_label_default": "Earlier form",
-          "ldpath": "madsrdf:hasEarlierEstablishedForm/madsrdf:variantLabel :: xsd:string",
+          "ldpath": "madsrdf:hasEarlierEstablishedForm/madsrdf:authoritativeLabel :: xsd:string",
           "selectable": false,
           "drillable": false
         },

data/lib/generators/qa_server/templates/config/authorities/linked_data/locnames_ld4l_cache.json

@@ -26,9 +26,9 @@
     },
     "term_id": "URI",
     "results": {
-      "id_ldpath":       "loc:lccn | madsrdf:code ::xsd:string",
-      "label_ldpath":    "skos:prefLabel ::xsd:string",
-      "altlabel_ldpath": "skos:altLabel ::xsd:string",
+      "id_ldpath":       "loc:lccn ::xsd:string",
+      "label_ldpath":    "madsrdf:authoritativeLabel ::xsd:string",
+      "altlabel_ldpath": "madsrdf:hasVariant/madsrdf:variantLabel ::xsd:string",
       "sameas_ldpath":   "skos:exactMatch ::xsd:anyURI"
     }
   },
@@ -36,7 +36,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://services.ld4l.org/ld4l_services/loc_name_batch.jsp?{?query}&{?maxRecords}&{?entity}&{?lang}",
+      "template": "http://services.ld4l.org/ld4l_services/loc_name_batch.jsp?{?query}&{?maxRecords}&{?startRecord}&{?entity}&{?lang}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -60,6 +60,13 @@
           "required": false,
           "default": "20"
         },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
         {
           "@type": "IriTemplateMapping",
           "variable": "lang",
@@ -74,8 +81,8 @@
       "subauth": "entity"
     },
     "results": {
-      "id_ldpath":    "loc:lccn | madsrdf:code ::xsd:string",
-      "label_ldpath": "skos:prefLabel ::xsd:string",
+      "id_ldpath":    "loc:lccn ::xsd:string",
+      "label_ldpath": "madsrdf:authoritativeLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"
     },
     "context": {
@@ -83,81 +90,83 @@
         "dates": {
           "group_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.dates",
           "group_label_default": "Dates"
+        },
+        "places": {
+          "group_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.places",
+          "group_label_default": "Places"
         }
       },
       "properties": [
         {
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.authoritative_label",
-          "property_label_default": "Authoritative Label",
+          "property_label_default": "Preferred label",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.type_label",
           "ldpath": "madsrdf:authoritativeLabel :: xsd:string",
           "selectable": true,
           "drillable": false
         },
         {
+          "property_label_default": "Type",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.type_label",
+          "ldpath": "rdf:type :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_default": "Variant label",
           "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.variant_label",
-          "property_label_default": "Variant Label",
           "ldpath": "madsrdf:hasVariant/madsrdf:variantLabel :: xsd:string",
           "selectable": false,
           "drillable": false
         },
         {
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.field_of_activity",
-          "property_label_default": "Field of Activity",
-          "ldpath": "(madsrdf:identifiesRWO/madsrdf:fieldOfActivity/rdfs:label) | (madsrdf:identifiesRWO/madsrdf:fieldOfActivity/madsrdf:authoritativeLabel) :: xsd:string",
+          "property_label_default": "Citation note",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.citation_note",
+          "ldpath": "madsrdf:hasSource/madsrdf:citation-note :: xsd:string",
           "selectable": false,
           "drillable": false
         },
         {
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.occupation",
-          "property_label_default": "Occupation",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:occupation/madsrdf:authoritativeLabel :: xsd:string",
+          "property_label_default": "Citation source",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.citation_source",
+          "ldpath": "madsrdf:hasSource/madsrdf:citation-source :: xsd:string",
           "selectable": false,
           "drillable": false
         },
         {
-          "group_id": "dates",
-          "property_label_default": "Birth: ",
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.birth_date",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:birthDate/rdfs:label :: xsd:string",
+          "property_label_default": "Citation status",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.citation_status",
+          "ldpath": "madsrdf:hasSource/madsrdf:citation-status :: xsd:string",
           "selectable": false,
           "drillable": false
         },
         {
-          "group_id": "dates",
-          "property_label_default": "Death: ",
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.death_date",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:deathDate/rdfs:label :: xsd:string",
+          "property_label_default": "Earlier established form",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.ealier_established_form",
+          "ldpath": "madsrdf:hasEarlierEstablishedForm/madsrdf:authoritativeLabel :: xsd:string",
           "selectable": false,
-          "drillable": false
+          "drillable": false,
+          "subauth": ["conference"]
         },
         {
-          "group_id": "dates",
-          "property_label_default": "Start: ",
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.activity_state_date",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:activityStartDate/rdfs:label :: xsd:string",
+          "property_label_default": "Later established form",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.later_established_form",
+          "ldpath": "madsrdf:hasLaterEstablishedForm/madsrdf:authoritativeLabel :: xsd:string",
           "selectable": false,
-          "drillable": false
+          "drillable": false,
+          "subauth": ["conference"]
         },
         {
-          "group_id": "dates",
-          "property_label_default": "End: ",
-          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.activity_end_date",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:activityEndDate/rdfs:label :: xsd:string",
+          "property_label_default": "Editorial note",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.editorial_note",
+          "ldpath": "madsrdf:editorialNote :: xsd:string",
           "selectable": false,
           "drillable": false
         }
       ]
     },
     "subauthorities": {
-      "person":         "Person",
-      "personal_name":  "Person",
-      "organization":   "Organization",
-      "corporate_name": "Organization",
-      "place":          "Place",
-      "intangible":     "Intangible",
-      "geocoordinates": "GeoCoordinates",
-      "work":           "Work",
-      "title":          "Work"
+      "geographic":     "Geographic",
+      "conference":     "ConferenceName"
     }
   }
 }