Merge branch 'master' into ucar_to_icf_server_migration_changes

USGCRP · Jul 14, 2016 · beea48d · beea48d
2 parents df7fc9e + 3eb31a5
commit beea48d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lib/Tuba/files/templates/menu.html.ep b/lib/Tuba/files/templates/menu.html.ep
@@ -71,7 +71,7 @@
                     % if(config('no_search')) {
                     % } elsif (config('google_site_search')) {
                        <form action="http://google.com/cse" target="_blank" class="form navbar-form" role="search">
-                           <input name="cx" type="hidden" value="013381772809718463072:8vyf_-czy98">
+                           <input name="cx" type="hidden" value="003035990453873541456:tojcob4zaam">
                            <input name="ie" type="hidden" value="UTF-8">
                            <input name="q" class="form-control" placeholder="Search" type="search">
                        </form>

diff --git a/lib/Tuba/files/templates/opensearch.xml.ep b/lib/Tuba/files/templates/opensearch.xml.ep
@@ -5,7 +5,7 @@
    <Tags>global climate change science data</Tags>
 % if (config('google_site_search')) {
    <Contact>[email protected]</Contact>
-   <Url type="text/html" template="http://www.google.com/cse?q={searchTerms}&amp;cx=013381772809718463072%3A8vyf_-czy98&amp;ie=UTF-8" />
+   <Url type="text/html" template="http://www.google.com/cse?q={searchTerms}&amp;cx=003035990453873541456%3Atojcob4zaam&amp;ie=UTF-8" />
 % } else {
    <Contact>[email protected]</Contact>
    <Url type="text/html" template="<%= url_for('search')->to_abs %>?q={searchTerms}" />

diff --git a/lib/Tuba/files/templates/organization/object.ttl.tut b/lib/Tuba/files/templates/organization/object.ttl.tut
@@ -34,10 +34,12 @@
         % ||  ($map->organization_relationship_identifier eq "working_group_of")
         % ||  ($map->organization_relationship_identifier eq "commission_of")) {
      org:unitOf <<%= uri($map->other_organization) %>> .
+        % } elsif ($map->organization_relationship_identifier eq "predecessor_of") {
+     prov:wasDerivedFrom <<%= uri($map->other_organization) %>> .
         % } else {
      org:linkedTo <<%= uri($map->other_organization) %>> .
         % }
-     % }
+      % }
   % }
 % #
      % if (my @maps = $organization->organization_maps_objs) {
@@ -63,7 +65,9 @@
         % ||  ($map->organization_relationship_identifier eq "working_group_of")
         % ||  ($map->organization_relationship_identifier eq "commission_of")) {
      org:unitOf <<%= current_resource %>> .
-        % } else {
+        % } elsif ($map->organization_relationship_identifier eq "predecessor_of") {
+     prov:wasDerivedFrom <<%= uri($map->other_organization) %>> .
+      % } else {
      org:linkedTo <<%= current_resource %>> .
      % }
   %}

diff --git a/lib/Tuba/files/templates/other_identifiers.ttl.tut b/lib/Tuba/files/templates/other_identifiers.ttl.tut
@@ -8,10 +8,10 @@
     % for my $exterm (@$matches) {
 <<%= current_resource %>>
       % if (my $url = $exterm->native_url) {
-   skos:prefLabel "<%= $exterm->term %>";
+   skos:altLabel "<%= $exterm->term %>";
    gcis:hasURL "<%= $url %>";
       % } else {
-   skos:prefLabel "<%= $exterm->term %>";
+   skos:altLabel "<%= $exterm->term %>";
       % }
       % if (my $same_as = $exterm->same_as) {
    owl:sameAs <<%= $same_as %>>;