#669 Add status "Review pending" (Jena) (#670)

* #669 Add status "Review pending" (Jena) * #669 Added i18n result.dozbib.status.detailed.reviewPending * #669 Set UBO.Scopus.Importer.Default.Classifications = partOf:true * #669 Undo last commit
ThULB · Dec 11, 2024 · b63435a · b63435a
1 parent 8392a99
commit b63435a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 12 deletions.
diff --git a/common/src/main/resources/META-INF/resources/statistics.xml b/common/src/main/resources/META-INF/resources/statistics.xml
@@ -21,13 +21,13 @@
     </div>
   </article>
 
-  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked)+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet=%7Byear%3A%7Btype%3Aterms,field%3Ayear,sort%3A%7Bindex%3Aasc%7D,facet%3A%7Boa%3A%7Btype%3Aterms,field%3Aoa,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)+AND+year%3A%5B1980+TO+*%5D&amp;rows=0&amp;facet.field=year"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=destatis"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=origin_exact"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=genre"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=fundingType"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+%2B(status%3Aconfirmed+status%3Aunchecked)+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50"/>
+  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked+OR+status%3AreviewPending)+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet=%7Byear%3A%7Btype%3Aterms,field%3Ayear,sort%3A%7Bindex%3Aasc%7D,facet%3A%7Boa%3A%7Btype%3Aterms,field%3Aoa,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)+AND+year%3A%5B1980+TO+*%5D&amp;rows=0&amp;facet.field=year"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=destatis"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=origin_exact"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=genre"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=fundingType"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50"/>
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type"/>
 
 </webpage>
diff --git a/common/src/main/resources/config/thunibib-common/messages_de.properties b/common/src/main/resources/config/thunibib-common/messages_de.properties
@@ -19,15 +19,17 @@ result.dozbib.status.detailed.confirmed         = Redaktionell gepr\u00FCft
 result.dozbib.status.detailed.deleted           = Gel\u00F6scht
 result.dozbib.status.detailed.imported          = Importiert
 result.dozbib.status.detailed.review            = Wird bearbeitet
+result.dozbib.status.detailed.reviewPending     = Pr\u00FCfung ausstehend
 result.dozbib.status.detailed.submitted         = Eingereicht
 result.dozbib.status.detailed.unchecked         = Keine Redaktion
 search.dozbib.degree.supervisor                 = Akademische*r Betreuer*in
 search.dozbib.partOf.false                      = nein
 search.dozbib.partOf.true                       = ja
 search.dozbib.partOf.unknown                    = unbekannt
+search.dozbib.status.reviewpending              = Pr\u00FCfung ausstehend
 search.dozbib.status.unchecked                  = keine Redaktion
 search.update                                   = (Zuordnung anpassen)
-thunibib.classification.fachreferate.validation = Bitte w\u00E4hlen sie mindestens ein Fachgebiet aus
+thunibib.classification.fachreferate.validation = Bitte w\u00E4hlen Sie mindestens ein Fachgebiet aus
 thunibib.comment.intern                         = Zus\u00E4tzliche Hinweise f\u00FCr das Bibliothekspersonal
 thunibib.condition.partOf                       = Bitte geben Sie an, ob die Publikation in der Statistik der Bibliographie gez\u00E4hlt werden soll.
 thunibib.editor.affiliation.checkbox            = Autor geh\u00F6rte im Publikationszeitraum nicht der Einrichtung an

diff --git a/common/src/main/resources/config/thunibib-common/messages_en.properties b/common/src/main/resources/config/thunibib-common/messages_en.properties
@@ -25,12 +25,14 @@ result.dozbib.status.detailed.confirmed         = Confirmed
 result.dozbib.status.detailed.deleted           = Deleted
 result.dozbib.status.detailed.imported          = Imported
 result.dozbib.status.detailed.review            = In review
+result.dozbib.status.detailed.reviewPending     = Review pending
 result.dozbib.status.detailed.submitted         = Submitted
 result.dozbib.status.detailed.unchecked         = No editing
 search.dozbib.degree.supervisor                 = Degree Supervisor
 search.dozbib.partOf.false                      = no
 search.dozbib.partOf.true                       = yes
 search.dozbib.partOf.unknown                    = unknown
+search.dozbib.status.reviewpending              = Review pending
 search.dozbib.status.unchecked                  = keine Redaktion
 search.update                                   = (update link)
 thunibib.classification.fachreferate.validation = Please select at least one subject

diff --git a/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json b/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json
@@ -63,7 +63,7 @@
         ],
         "json.facet": "{year:{type:terms,field:year,limit:100,sort:{index:asc},facet:{oa:{type:terms,field:oa,sort:{index:asc}}}}}",
         "fq": "+objectType:mods",
-        "fq": "status:unchecked OR status:confirmed"
+        "fq": "status:unchecked OR status:confirmed OR status:reviewPending"
       },
       "invariants": {
         "fl": "",
@@ -188,7 +188,7 @@
       },
       "appends": {
         "fq": "+objectType:mods",
-        "fq": "status:unchecked OR status:confirmed"
+        "fq": "status:unchecked OR status:confirmed OR status:reviewPending"
       }
     }
   }

diff --git a/jena/src/main/resources/META-INF/resources/index.xed b/jena/src/main/resources/META-INF/resources/index.xed
@@ -73,10 +73,10 @@
     </div>
   </article>
 
-  <xinclude uri="xslStyle:response-newest:solr:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked)+AND+year%3ANOW&amp;rows=4&amp;sort=year+desc,created+desc&amp;facet=false&amp;fl=id,year"/>
+  <xinclude uri="xslStyle:response-newest:solr:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked+OR+reviewPending)+AND+year%3ANOW&amp;rows=4&amp;sort=year+desc,created+desc&amp;facet=false&amp;fl=id,year"/>
 
   <aside id="sidebar">
-    <xinclude uri="xslStyle:response-sidebar-mini:solr:q=%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0"/>
+    <xinclude uri="xslStyle:response-sidebar-mini:solr:q=%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0"/>
     <xinclude uri="xslStyle:response-sidebar-admin:solr:q=*%3A*&amp;rows=0&amp;facet=true&amp;facet.field=status&amp;facet.mincount=0&amp;facet.range=created&amp;facet.range=modified&amp;facet.range.start=NOW/DAY-30DAY&amp;facet.range.end=NOW&amp;facet.range.gap=%2B1DAY"/>
     <xinclude uri="xslStyle:response-sidebar-admin:solr:q=status%3Aimported+AND+importID%3A*&amp;rows=0&amp;facet=true&amp;facet.sort=index&amp;facet.limit=-1&amp;facet.field=importID"/>
 

diff --git a/jena/src/main/resources/status.xml b/jena/src/main/resources/status.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<items>
+  <item value="confirmed">
+    <label xml:lang="de">redaktionell geprüft</label>
+    <label xml:lang="en">confirmed</label>
+  </item>
+  <item value="reviewPending">
+    <label xml:lang="de">Prüfung ausstehend</label>
+    <label xml:lang="en">Review pending</label>
+  </item>
+  <item value="submitted">
+    <label xml:lang="de">eingereicht</label>
+    <label xml:lang="en">submitted</label>
+  </item>
+  <item value="review">
+    <label xml:lang="de">wird bearbeitet</label>
+    <label xml:lang="en">in review</label>
+  </item>
+  <item value="imported">
+    <label xml:lang="de">importiert</label>
+    <label xml:lang="en">imported</label>
+  </item>
+  <item value="unchecked">
+    <label xml:lang="de">keine Redaktion</label>
+    <label xml:lang="en">no editing</label>
+  </item>
+</items>