Merge remote-tracking branch 'origin/tamu-sprint10-17' into tamu-spri…

…nt10-3-merger
TAMULib · Apr 6, 2020 · 0c10ffb · 0c10ffb
2 parents 7714503 + 97b3502
commit 0c10ffb
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 2 deletions.
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Document.java b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Document.java
@@ -330,7 +330,7 @@ public class Document extends Common {
     @PropertySource(template = "document/iclCode", predicate = "http://vivoweb.org/ontology/core#iclCode")
     private String iclCode;
 
-    @Indexed(type = "whole_string")
+    @Indexed(type = "sorting_string")
     @PropertySource(template = "document/numberOfPages", predicate = "http://purl.org/ontology/bibo/numPages")
     private String numberOfPages;
 
@@ -350,7 +350,7 @@ public class Document extends Common {
     @PropertySource(template = "document/issue", predicate = "http://purl.org/ontology/bibo/issue")
     private String issue;
 
-    @Indexed(type = "whole_string")
+    @Indexed(type = "sorting_string")
     @PropertySource(template = "document/placeOfPublication", predicate = "http://vivoweb.org/ontology/core#placeOfPublication")
     private String placeOfPublication;
 
@@ -431,6 +431,14 @@ public class Document extends Common {
     @PropertySource(template = "document/receipt", predicate = "http://www.w3.org/2000/01/rdf-schema#label")
     private List<String> receipts;
 
+    @Indexed(type = "sorting_string", copyTo = "_text_")
+    @PropertySource(template = "document/altmetricScore", predicate = "http://vivo.library.tamu.edu/ontology/TAMU#AltmetricScore")
+    private String altmetricScore;
+
+    @Indexed(type = "sorting_string", copyTo = "_text_")
+    @PropertySource(template = "document/citationCount", predicate = "http://vivo.library.tamu.edu/ontology/TAMU#CitationCount")
+    private String citationCount;
+
     @Indexed(type = "whole_strings")
     @PropertySource(template = "document/tag", predicate = "http://purl.obolibrary.org/obo/ARG_0000015")
     private List<String> tags;
@@ -1183,6 +1191,22 @@ public void setReceipts(List<String> receipts) {
         this.receipts = receipts;
     }
 
+    public String getAltmetricScore() {
+        return altmetricScore;
+    }
+
+    public void setAltmetricScore(String altmetricScore) {
+        this.altmetricScore = altmetricScore;
+    }
+
+    public String getCitationCount() {
+        return citationCount;
+    }
+
+    public void setCitationCount(String citationCount) {
+        this.citationCount = citationCount;
+    }
+
     public List<String> getTags() {
         return tags;
     }

diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Document.java b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Document.java
@@ -187,6 +187,10 @@ public class Document extends AbstractNestedDocument {
 
   private String isTemplate;
 
+  private String altmetricScore;
+
+  private String citationCount;
+
   private List<String> type;
 
   private String image;
@@ -741,6 +745,22 @@ public void setIsTemplate(String isTemplate) {
     this.isTemplate = isTemplate;
   }
 
+  public String getAltmetricScore() {
+    return altmetricScore;
+  }
+
+  public void setAltmetricScore(String altmetricScore) {
+    this.altmetricScore = altmetricScore;
+  }
+
+  public String getCitationCount() {
+    return citationCount;
+  }
+
+  public void setCitationCount(String citationCount) {
+    this.citationCount = citationCount;
+  }
+
   public List<String> getType() {
     return type;
   }

diff --git a/src/main/resources/defaults/displayViews.yml b/src/main/resources/defaults/displayViews.yml
@@ -877,6 +877,12 @@
         - name: keywords
           template: "defaults/displayViews/documents/overview/keywords.html"
           field: keywords
+        - name: altmetric score
+          template: "defaults/displayViews/documents/overview/altmetricScore.html"
+          field: altmetricScore
+        - name: citation count
+          template: "defaults/displayViews/documents/overview/citationCount.html"
+          field: citationCount
     - name: Identity
       sections:
         - name: EAN International-Uniform Code Council (EAN-UCC) 13

diff --git a/src/main/resources/defaults/displayViews/documents/overview/altmetricScore.html b/src/main/resources/defaults/displayViews/documents/overview/altmetricScore.html
@@ -0,0 +1 @@
+<p>{{{altmetricScore}}}</p>
diff --git a/src/main/resources/defaults/displayViews/documents/overview/citationCount.html b/src/main/resources/defaults/displayViews/documents/overview/citationCount.html
@@ -0,0 +1 @@
+<p>{{{citationCount}}}</p>
diff --git a/src/main/resources/templates/sparql/document/altmetricScore.sparql b/src/main/resources/templates/sparql/document/altmetricScore.sparql
@@ -0,0 +1,7 @@
+PREFIX tamu: <http://vivo.library.tamu.edu/ontology/TAMU#>
+
+CONSTRUCT {
+    <{{uri}}> tamu:AltmetricScore ?altmetricScore .
+} WHERE {
+    <{{uri}}> tamu:AltmetricScore ?altmetricScore .
+}
diff --git a/src/main/resources/templates/sparql/document/citationCount.sparql b/src/main/resources/templates/sparql/document/citationCount.sparql
@@ -0,0 +1,7 @@
+PREFIX tamu: <http://vivo.library.tamu.edu/ontology/TAMU#>
+
+CONSTRUCT {
+    <{{uri}}> tamu:CitationCount ?citationCount .
+} WHERE {
+    <{{uri}}> tamu:CitationCount ?citationCount .
+}