csms-cvs

[<rga...@us...>]

Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv20888

Modified Files:
	footballEvents.xml 
Log Message:
Detected a booking resulting in a sending off
Tidied up detection of bookings.

Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** footballEvents.xml	1 Nov 2002 16:40:06 -0000	1.4
--- footballEvents.xml	2 Nov 2002 18:07:42 -0000	1.5
***************
*** 101,105 ****
      </event>
      
!     <event type="booking">
          <duplicateDetection>
            <part name="normalTimeMinutes"/>
--- 101,105 ----
      </event>
      
!     <event type="redCare">
          <duplicateDetection>
            <part name="normalTimeMinutes"/>
***************
*** 110,117 ****
          </duplicateDetection>    
  
!     	<!-- Get a booking that is the first sentence in the commentary snippet -->
!         <pattern>
!             <sourceType>BBC Text Commentary</sourceType>
!             <part name="normalTimeMinutes">\d\d?</part>
              <unwantedPart>:</unwantedPart>
              <part name="normalTimeSeconds">\d\d</part>
--- 110,116 ----
          </duplicateDetection>    
  
! 	<pattern>
! 	    <sourceType>BBC Text Commentary</sourceType>
! 	    <part name="normalTimeMinutes">\d\d?</part>
              <unwantedPart>:</unwantedPart>
              <part name="normalTimeSeconds">\d\d</part>
***************
*** 121,148 ****
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>\s*Booking\s*</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
  	    <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
  	    <part name="reason">[^\.]*</part>
          </pattern>
  
!         <!-- Get a booking that is the second sentence in the commentary snippet -->
!         <pattern>
!             <sourceType>BBC Text Commentary</sourceType>
!             <part name="normalTimeMinutes">\d\d?</part>
!             <unwantedPart>:</unwantedPart>
!             <part name="normalTimeSeconds">\d\d</part>
!             <unwantedPart>\s*\(?</unwantedPart>
!             <part name="injuryTimeMinutes">\d?\d?</part>
!             <unwantedPart>:?</unwantedPart>
!             <part name="injuryTimeSeconds">\d?\d?</part>
!             <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
!             <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
!             <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
!             <part name="reason">[^\.]*</part>
!         </pattern>
  
-         <!-- Get a booking that is the third sentence in the commentary snippet -->
          <pattern>
              <sourceType>BBC Text Commentary</sourceType>
--- 120,139 ----
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>\s*Sent Off(FIXME)\s*</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
  	    <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
  	    <part name="reason">[^\.]*</part>
          </pattern>
+     </event>
  
!     <event type="booking">
!         <duplicateDetection>
!           <part name="normalTimeMinutes"/>
!           <part name="normalTimeSeconds"/>
!           <part name="injuryTimeMinutes"/>
!           <part name="injuryTimeSeconds"/>
!           <part name="player"/>
!         </duplicateDetection>    
  
          <pattern>
              <sourceType>BBC Text Commentary</sourceType>
***************
*** 155,160 ****
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
              <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
--- 146,150 ----
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>(?:[^\d\.]*\.\s*){0,10}</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
              <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
***************
*** 162,166 ****
          </pattern>
  
!         <!-- Get a booking that is the fourth sentence in the commentary snippet -->
          <pattern>
              <sourceType>BBC Text Commentary</sourceType>
--- 152,156 ----
          </pattern>
  
!     	<!-- Get a booking that is a second offence -->
          <pattern>
              <sourceType>BBC Text Commentary</sourceType>
***************
*** 173,182 ****
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
!             <unwantedPart>[^\d\.]*\.\s*</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
!             <unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
!             <part name="reason">[^\.]*</part>
          </pattern>
      </event>
--- 163,170 ----
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>\s*Sent\s[Oo]ff\s*</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
! 	    <unwantedPart>[^)]*\)\s*dismissed\sfor\s</unwantedPart>
! 	    <part name="reason">[^\.]*</part>
          </pattern>
      </event>