Merge branch 'w2p-67668_Porting-IRUS-patch-to-DSpace-7' of https://github.com/atmire/DSpace into w2p-67668_Porting-IRUS-patch-to-DSpace-7

dspace/config/log4j2.xml

@@ -70,8 +70,6 @@
                 additivity='false'>
             <AppenderRef ref='A2'/>
         </logger>
-        
-        <logger name='org.dspace.statistics.export.ExportUsageEventListener' level='DEBUG' />
 
         # Block services logging except on exceptions
         <logger name='org.dspace.kernel'

dspace/config/modules/stats.cfg

@@ -12,7 +12,7 @@
 # This lists a comma separated list of values that will be excluded for the given field.
 # stats.tracker.type-value = Article, Postprint
 
-# This lists a comma separated list of entity that will be included
+# This lists a comma separated list of entities that will be included
 # When no list is provided, the default value "Publication" will be used
 # stats.tracker.entity-types = Publication
 
@@ -27,13 +27,12 @@ stats.tracker.produrl = https://irus.jisc.ac.uk/counter/
 # Identifies data as OpenURL 1.0
 stats.tracker.urlversion = Z39.88-2004
 
-# The deployed user interface should be provided to build correct links to files.
+# Add the agentregex configuration below uncommented to local.cfg to include the bot agents list by
-# The dspace.type field can be set to either "xmlui" or "jspui".
+# Project COUNTER when filtering bots in DSpace. The agents file is downloaded by the Apache ant
-stats.dspace.type = xmlui
+# stage of the build process.
 
-# Spider options
+# Location of the COUNTER agents file
-stats.spider.ipmatch.enabled = true
+# stats.spider.agentregex.regexfile = ${dspace.dir}/config/spiders/agents/COUNTER_Robots_list.txt
-stats.spider.agentempty.enabled = false
+
-stats.spider.agentregex.enabled = true
+# External URL to COUNTER the agents file
-#  Default is downloaded during build: ${dspace.dir}/config/COUNTER_Robots_list.txt
+# stats.spider.agentregex.url = https://raw.githubusercontent.com/atmire/COUNTER-Robots/master/generated/COUNTER_Robots_list.txt
-stats.spider.agentregex.regexfile = ${dspace.dir}/config/COUNTER_Robots_list.txt

dspace/config/spring/rest/event-service-listeners.xml

@@ -22,8 +22,8 @@
     </bean>
 
     <!--  Irus statistics tracking  -->
-    <bean class="org.dspace.statistics.export.ExportUsageEventListener">
+<!--    <bean class="org.dspace.statistics.export.ExportUsageEventListener">-->
-        <property name="eventService" ref="org.dspace.services.EventService"/>
+<!--        <property name="eventService" ref="org.dspace.services.EventService"/>-->
-    </bean>
+<!--    </bean>-->
 
 </beans>

dspace/src/main/config/build.xml

@@ -926,15 +926,20 @@ You may manually install this file by following these steps:
 
     <!-- installs and/or updates Project Counter Robot List resolution database -->
     <target name="update_spiders">
-        <echo>Downloading: https://raw.githubusercontent.com/atmire/COUNTER-Robots/master/generated/COUNTER_Robots_list.txt</echo>
+        <echo>Downloading: ${stats.spider.agentregex.url}</echo>
-        <get src="https://raw.githubusercontent.com/atmire/COUNTER-Robots/master/generated/COUNTER_Robots_list.txt" dest="${dspace.dir}/config/COUNTER_Robots_list.txt" verbose="true" />
+        <get src="${stats.spider.agentregex.url}" dest="${stats.spider.agentregex.regexfile}" verbose="true" />
     </target>
 
     <target name="check_spiders">
         <condition property="need.spiders">
-            <not>
+            <and>
-                <available file="${dspace.dir}/config/COUNTER_Robots_list.txt" />
+                <not>
-            </not>
+                    <available file="${stats.spider.agentregex.regexfile}" />
+                </not>
+                <not>
+                    <contains string="${stats.spider.agentregex.url}" substring="stats.spider.agentregex.url"/>
+                </not>
+            </and>
         </condition>
     </target>