Merge branch 'release-2018.02' into clarin

ufal · Jul 10, 2018 · d679773 · d679773
2 parents 602654c + 73035f1
commit d679773
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/dspace-api/src/main/java/cz/cuni/mff/ufal/tracker/PiwikTracker.java b/dspace-api/src/main/java/cz/cuni/mff/ufal/tracker/PiwikTracker.java
@@ -49,6 +49,7 @@ protected void init()
     public void trackPage(HttpServletRequest request, String pageName)
     {
 
+        log.debug("Piwik tracks " + pageName);
         String pageURL = getFullURL(request);
         tracker.setPageUrl(pageURL);
 

diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
@@ -421,7 +421,7 @@ else if (name != null)
                 }
             }
 
-            if(is_item_bitstream && ConfigurationManager.getBooleanProperty("lr", "lr.tracker.enabled")) {
+            if(is_item_bitstream && ConfigurationManager.getBooleanProperty("lr", "lr.tracker.enabled") && IOUtils.requestRangeContainsStart(request)) {
                 // Track the download for analytics platform
                 TrackerFactory.createInstance(TrackingSite.BITSTREAM).trackPage(request,"Bitstream Download / Single File");
             }

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
@@ -175,10 +175,11 @@
                 </property>
             </bean>
         </property>
+        <!--
         <property name="moreLikeThisConfiguration">
             <bean class="org.dspace.discovery.configuration.DiscoveryMoreLikeThisConfiguration">
-                <!--When altering this list also alter the "xmlui.Discovery.RelatedItems.help" key as it describes
-                the metadata fields below-->
+                <!- -When altering this list also alter the "xmlui.Discovery.RelatedItems.help" key as it describes
+                the metadata fields below- ->
                 <property name="similarityMetadataFields">
                     <list>
                         <value>dc.title</value>
@@ -187,14 +188,16 @@
                         <value>dc.subject</value>
                     </list>
                 </property>
-                <!--The minimum number of matching terms across the metadata fields above before an item is found as related -->
+                <!- -The minimum number of matching terms across the metadata fields above before an item is found as
+                 related - ->
                 <property name="minTermFrequency" value="5"/>
-                <!--The maximum number of related items displayed-->
+                <!- -The maximum number of related items displayed- ->
                 <property name="max" value="3"/>
-                <!--The minimum word length below which words will be ignored-->
+                <!- -The minimum word length below which words will be ignored- ->
                 <property name="minWordLength" value="5"/>
             </bean>
         </property>
+        -->
         <!-- When true a "did you mean" example will be displayed, value can be true or false -->
         <property name="spellCheckEnabled" value="true"/>
     </bean>