Merge branch 'pr/issue_418_2nd_edition' into dev

LibreCat · May 15, 2018 · 91076b4 · 91076b4
2 parents c1e9e35 + a8fbf26
commit 91076b4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/config/catmandu.local.yml-example b/config/catmandu.local.yml-example
@@ -35,7 +35,7 @@ default_person_sort:
 default_facets:
     open_access:
       terms:
-        field: 'file.open_access'
+        fields: ['oa']
         size: 1
     popular_science:
       terms:

diff --git a/config/store.yml b/config/store.yml
@@ -591,6 +591,11 @@ search:
                 '=': true
                 '<>': true
               field: 'main_file_link.open_access'
+            oa:
+              op:
+                '=': true
+                '<>': true
+              field: ['oa']
             embargo:
               op:
                 '=': true
@@ -1068,6 +1073,7 @@ search:
             properties:
               url: {type: string, analyzer: tag}
               open_access: {type: byte}
+          oa: {type: byte}
           alternative_id: {type: string, analyzer: tag, include_in_all: true}
           defense_date: {type: date, index: no}
           locked: {type: byte}

diff --git a/fixes/index_publication.fix b/fixes/index_publication.fix
@@ -0,0 +1,9 @@
+# add OA flag for open access publications
+
+if any_match(file.*.access_level, open_access)
+  add_field(oa, 1)
+end
+
+if any_match(main_file_link.*.open_access, 1)
+  add_field(oa, 1)
+end
diff --git a/lib/LibreCat/App/Helper.pm b/lib/LibreCat/App/Helper.pm
@@ -247,7 +247,7 @@ sub get_statistics {
     my $reshits = librecat->searcher->search('publication',
         {cql => ["status=public", "type=research_data"]});
     my $oahits = librecat->searcher->search('publication',
-        {cql => ["status=public", "fulltext=1", "type<>research_data",]});
+        {cql => ["status=public", "oa=1", "type<>research_data",]});
 
     return {
         publications => $hits->{total},

diff --git a/views/facets/open_access.tt b/views/facets/open_access.tt
@@ -1,8 +1,8 @@
 [%- FOREACH t IN facets.open_access.terms %]
   [%- IF t.count < total %]
   [%- NEXT UNLESS t.term %]
-  <a class="facet_[% tabmodus %][% menu %]" data-key="cql" data-param="fulltext" data-value="1" href="#" rel="nofollow"><span class="fa fa-chevron-right"></span>[% t.count %] [% h.loc("facets.fulltext") %]</a>
+  <a class="facet_[% tabmodus %][% menu %]" data-key="cql" data-param="oa" data-value="1" href="#" rel="nofollow"><span class="fa fa-chevron-right"></span>[% t.count %] [% h.loc("facets.fulltext") %]</a>
   [%- ELSE %]
   <div class="text-success margin-top1-2 margin-bottom1-2"><span class="fa fa-check"></span> <strong>[% h.loc("facets.all_fulltext") %]</strong></div>
   [%- END %]
-[%- END %]
+[%- END %]
diff --git a/views/index.tt b/views/index.tt
@@ -41,7 +41,7 @@
                 <div class="col-md-12">
                   <p class="h3"><span class="fa fa-check fa-1x"></span> <span class="statalign">[% stats.publications %]</span> <a href="[% uri_base %]/publication">[% h.loc("home.stats.publications") %]</a></p>
                   <p class="h3"><span class="fa fa-check fa-1x"></span> <span class="statalign">[% stats.researchdata %]</span> <a href="[% uri_base %]/data">[% h.loc("home.stats.data_publications") %]</a></p>
-                  <p class="h3"><span class="fa fa-check fa-1x"></span> <span class="statalign">[% stats.oahits %]</span> <a href="[% uri_base %]/publication?cql=fulltext=1">[% h.loc("home.stats.oa_publications") %]</a></p>
+                  <p class="h3"><span class="fa fa-check fa-1x"></span> <span class="statalign">[% stats.oahits %]</span> <a href="[% uri_base %]/publication?cql=oa=1">[% h.loc("home.stats.oa_publications") %]</a></p>
                   <p class="h3"><span class="fa fa-check fa-1x"></span> <span class="statalign">[% stats.projects %]</span> <a href="[% uri_base %]/project">[% h.loc("home.stats.projects") %]</a></p>
                 </div>
               </div>