[csms-cvs] csms-core/src/resources/conf footballEvents.xml,1.6,1.7

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

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

Modified Files:
	footballEvents.xml 
Log Message:
Fixed issues with own goals meaning that a player was credited for scoring it and the wrong teams defenders were deducted points for conceeding. (bug 630445)
We now have a new ownGoal event allowing additional penalty points if a defender scores one.

Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** footballEvents.xml	3 Nov 2002 22:15:57 -0000	1.6
--- footballEvents.xml	4 Nov 2002 21:27:52 -0000	1.7
***************
*** 73,80 ****
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>\s[Gg]oal\s-\s</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
          </pattern>
!     </event>substitu
      
      <event type="assist">
--- 73,105 ----
              <part name="injuryTimeSeconds">\d?\d?</part>
              <unwantedPart>\)?</unwantedPart>
!             <unwantedPart>[A-Za-z\d\s-]*\.(?:[^Oo](?![Oo]wn))*[Gg]oal\sby\s</unwantedPart>
              <part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
          </pattern>
!     </event>
!     
!     <!-- Extract own goal events -->
!     <event type="ownGoal">
!         <duplicateDetection>
!           <part name="normalTimeMinutes"/>
!           <part name="normalTimeSeconds"/>
!           <part name="injuryTimeMinutes"/>
!           <part name="injuryTimeSeconds"/>
!           <part name="player"/>
!         </duplicateDetection>    
! 
!         <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>(?:[^\.]*\.)*[A-Za-z\s]*[Oo]wn\sgoal\sby\s</unwantedPart>
!             <part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
!         </pattern>
!     </event>
      
      <event type="assist">