Menu
▾
▴
csms-cvs — Notification of CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(157) |
Nov
(121) |
Dec
(19) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(34) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <le...@us...> - 2002-11-03 23:12:45
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv1148
Modified Files:
teams.xml
Log Message:
Renamed "Man United" to "Man Utd".
Index: teams.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/teams.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** teams.xml 3 Nov 2002 20:59:28 -0000 1.3
--- teams.xml 3 Nov 2002 23:12:41 -0000 1.4
***************
*** 34,38 ****
</team>
<team id="MAN">
! <commonName>Man United</commonName>
</team>
<team id="MCY">
--- 34,38 ----
</team>
<team id="MAN">
! <commonName>Man Utd</commonName>
</team>
<team id="MCY">
|
|
From: <rga...@us...> - 2002-11-03 22:16:01
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv16149
Modified Files:
footballEvents.xml
Log Message:
Solved problem of wrong name for bookings appearing in the first line (bug 633006)
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** footballEvents.xml 2 Nov 2002 18:07:42 -0000 1.5
--- footballEvents.xml 3 Nov 2002 22:15:57 -0000 1.6
***************
*** 76,80 ****
<part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
</pattern>
! </event>
<event type="assist">
--- 76,80 ----
<part name="player">(?:(?:[Mac|Mc|A-Z][a-z]*\s)(?!\d)){1,3}</part>
</pattern>
! </event>substitu
<event type="assist">
***************
*** 134,138 ****
<part name="injuryTimeSeconds"/>
<part name="player"/>
! </duplicateDetection>
<pattern>
--- 134,138 ----
<part name="injuryTimeSeconds"/>
<part name="player"/>
! </duplicateDetection>
<pattern>
***************
*** 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>
--- 146,167 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>(?:\s*[Bb]ooking\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>
!
! <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>(?:\s*[Bb]ooking)?</unwantedPart>
! <unwantedPart>(?:[^\d\.]*\.\s*){1,10}</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
<unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
|
|
From: <rga...@us...> - 2002-11-03 21:50:43
|
Update of /cvsroot/csms/csms-core/src/resources/conf In directory usw-pr-cvs1:/tmp/cvs-serv7745 Modified Files: players.xml Log Message: Added Lucic of Leeds Index: players.xml =================================================================== RCS file: /cvsroot/csms/csms-core/src/resources/conf/players.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** players.xml 28 Oct 2002 13:54:22 -0000 1.1 --- players.xml 3 Nov 2002 21:50:40 -0000 1.2 *************** *** 2793,2796 **** --- 2793,2811 ---- <cost>2.5</cost> </player> + + <player id="298"> + <firstName type="main">Teddy</firstName> + <firstName type="initial">T.</firstName> + <surname>Lucic</surname> + <registeredTeam>LEE</registeredTeam> + <team>LEE</team> + <cost></cost> + <nationality>Swedish</nationality> + <dateOfBirth> + <day>15</day> + <month>04</month> + <year>1973</year> + </dateOfBirth> + </player> <player id="600"> |
|
From: <rga...@us...> - 2002-11-03 21:02:21
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/prefs
In directory usw-pr-cvs1:/tmp/cvs-serv21716
Modified Files:
PreferenceManager.java
Log Message:
DOH!
I broke the build (now fixed)
Index: PreferenceManager.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/prefs/PreferenceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PreferenceManager.java 3 Nov 2002 20:46:49 -0000 1.1
--- PreferenceManager.java 3 Nov 2002 21:02:17 -0000 1.2
***************
*** 54,78 ****
Preferences systemPrefs = Preferences.systemRoot();
/** Where to write log info */
! final Logger logger = Logger.getLogger( CSLAS_NAME );
/** The classname of this class (used by logger) */
! final static String CLASS_NAME = "org.fanfoot.prefs.PreferenceManager";
/** String indicating the AutoScorer class of properties */
! final static String AUTO_SCORER_CLASS = "org/fanfoot/AutoScorer";
/** Key for AutoScorer EventConfigurationFile path */
! final static String AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY
= "EventConfigurationFile";
/** Key for AutoScorer Scores configuration XSL path */
! final static String AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY
= "ScoresConfigurationFile";
/** Key for AutoScorer Scores to HTML XSL path */
! final static String AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY
= "Scores2HTMLStylesheet";
/** Control Centre class name * */
! final static String CONTROL_CENTRE_CLASS = "org/fanfoot/gui/ControlCentre";
/** String indicating the GUI CONTROLCENTRE class of properties */
! final static String GUI_CONTROL_CENTRE_CLASS = CONTROL_CENTRE_CLASS;
/** Key for AutoScorer EventConfigurationFile path */
! final static String GUI_CONTROL_CENTRE_DEBUG_KEY = "debug";
--- 54,78 ----
Preferences systemPrefs = Preferences.systemRoot();
/** Where to write log info */
! final Logger logger = Logger.getLogger( CLASS_NAME );
/** The classname of this class (used by logger) */
! public final static String CLASS_NAME = "org.fanfoot.prefs.PreferenceManager";
/** String indicating the AutoScorer class of properties */
! public final static String AUTO_SCORER_CLASS = "org/fanfoot/AutoScorer";
/** Key for AutoScorer EventConfigurationFile path */
! public final static String AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY
= "EventConfigurationFile";
/** Key for AutoScorer Scores configuration XSL path */
! public final static String AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY
= "ScoresConfigurationFile";
/** Key for AutoScorer Scores to HTML XSL path */
! public final static String AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY
= "Scores2HTMLStylesheet";
/** Control Centre class name * */
! public final static String CONTROL_CENTRE_CLASS = "org/fanfoot/gui/ControlCentre";
/** String indicating the GUI CONTROLCENTRE class of properties */
! public final static String GUI_CONTROL_CENTRE_CLASS = CONTROL_CENTRE_CLASS;
/** Key for AutoScorer EventConfigurationFile path */
! public final static String GUI_CONTROL_CENTRE_DEBUG_KEY = "debug";
|
|
From: <le...@us...> - 2002-11-03 20:59:31
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv20682
Modified Files:
teams.xml
Log Message:
Corrected spelling mistake "Sunderalnd" to "Sunderland", which was causing errors when calculatiing scores for Sunderland players.
Index: teams.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/teams.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** teams.xml 2 Nov 2002 22:26:37 -0000 1.2
--- teams.xml 3 Nov 2002 20:59:28 -0000 1.3
***************
*** 49,53 ****
</team>
<team id="SUN">
! <commonName>Sunderalnd</commonName>
</team>
<team id="TOT">
--- 49,53 ----
</team>
<team id="SUN">
! <commonName>Sunderland</commonName>
</team>
<team id="TOT">
|
|
From: <rga...@us...> - 2002-11-03 20:46:53
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/prefs In directory usw-pr-cvs1:/tmp/cvs-serv16995 Added Files: PreferenceManager.java Log Message: Improved handling of preferences. Now uses a separate Preferences manager. The user no longer needs to define parameters in the editor window, they are there by default. If the user has customised any settings they will be retained inbetween installs. --- NEW FILE: PreferenceManager.java --- /* * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is Community Sports Management System. * * The Initial Developer of the Original Code is * We know What you Want.net * * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * * Contributor(s): * * Ross Gardler <ross [at] saafe.org> * Mike Lever <mikel [at] fanfoot.com> * Stuart Gardler <stuart [at] wkwyw.net> * * ***** END LICENSE BLOCK ***** */ /* * PreferenceManager.java */ package org.fanfoot.prefs; import java.awt.Frame; import java.util.logging.Level; import java.util.logging.Logger; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; import org.saafe.ui.gui.prefs.PreferencesEditor; /** * Manages the preferences of the current user. * *@author rgardler *@created 02 November 2002 */ public class PreferenceManager { /** User preferences */ Preferences userPrefs = Preferences.userRoot(); /** System preferences */ Preferences systemPrefs = Preferences.systemRoot(); /** Where to write log info */ final Logger logger = Logger.getLogger( CSLAS_NAME ); /** The classname of this class (used by logger) */ final static String CLASS_NAME = "org.fanfoot.prefs.PreferenceManager"; /** String indicating the AutoScorer class of properties */ final static String AUTO_SCORER_CLASS = "org/fanfoot/AutoScorer"; /** Key for AutoScorer EventConfigurationFile path */ final static String AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY = "EventConfigurationFile"; /** Key for AutoScorer Scores configuration XSL path */ final static String AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY = "ScoresConfigurationFile"; /** Key for AutoScorer Scores to HTML XSL path */ final static String AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY = "Scores2HTMLStylesheet"; /** Control Centre class name * */ final static String CONTROL_CENTRE_CLASS = "org/fanfoot/gui/ControlCentre"; /** String indicating the GUI CONTROLCENTRE class of properties */ final static String GUI_CONTROL_CENTRE_CLASS = CONTROL_CENTRE_CLASS; /** Key for AutoScorer EventConfigurationFile path */ final static String GUI_CONTROL_CENTRE_DEBUG_KEY = "debug"; /** * Creates a new preferences manager for the version of of the * application indicated. */ public PreferenceManager() { super(); initPrefs(); } /** * Initialise the preferences to the values for this release. If a * user value is already set then this value is retained, unless * there is a conflict between versions. If no user value exists * then the default is added. This is so that the preferencesEditor * contains the necessary preference items. */ private void initPrefs() { initAutoScorerPrefs(); initGUIControlCentrePrefs(); } /** Initialise the preferecnes of class org/fanfoot/AutoScorer */ private void initAutoScorerPrefs() { Preferences prefs = userPrefs.node( AUTO_SCORER_CLASS ); if ( prefs.get( AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY, null ) == null ) { prefs.put( AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY, "http://www.fanfoot.com/test/footballEvents.xml" ); } if ( prefs.get( AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY, null ) == null ) { prefs.put( AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY, "http://www.fanfoot.com/test/ScoringConfig.xsl" ); } if ( prefs.get( AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY, null ) == null ) { prefs.put( AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY, "http://www.fanfoot.com/test/Scores2HTML.xsl" ); } } /** Initialise the preferecnes of class org/fanfoot/AutoScorer */ private void initGUIControlCentrePrefs() { Preferences prefs = userPrefs.node( GUI_CONTROL_CENTRE_CLASS ); if ( prefs.get( GUI_CONTROL_CENTRE_DEBUG_KEY, null ) == null ) { prefs.put( GUI_CONTROL_CENTRE_DEBUG_KEY, "true" ); } } /** * Get the value corresponding to the supplied node. * *@param strClass the name of the class of preference *@param strName the name of the preference requried *@return Description of the Return Value */ public String get( String strClass, String strName ) { String strResult = null; strResult = userPrefs.node( strClass ).get( strName, null ); return strResult; } /** * Get the default value for the preference indicated for this * version of the software. @ param strKey the key of the * preference requried * *@param strKey Description of the Parameter *@return The default value *@refactor The names of preferences should be in a hashtable or * something as they are duplicated here and in the * org.fanfoot.prefs.gui.preferenceEditor */ public String getDefault( String strKey ) { String strResult = null; logger.fine( "Processing request for " + strKey ); /** The path from which default fiules are retrieved */ String strConfigPath = "http://www.fanfoot.com/test/"; if ( strKey.equals( this.AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY + this.AUTO_SCORER_SCORES_CONFIGURATION_FILE_KEY ) ) { strResult = strConfigPath + "ScoringConfig.xsl"; } else if ( strKey.equals( this.AUTO_SCORER_CLASS + this.AUTO_SCORER_EVENT_CONFIGURATION_FILE_KEY ) ) { strResult = strConfigPath + "footballEvents.xml"; } else if ( strKey.equals( this.AUTO_SCORER_CLASS + this.AUTO_SCORER_SCORES_TO_HTML_STYLESHEET_KEY ) ) { strResult = strConfigPath + "Scores2HTML.xsl"; } else if ( strKey.equals( "org/fanfoot/gui/ControlCentre/debug" ) ) { strResult = "false"; } logger.fine( "Returning value: " + strResult ); return strResult; } /** * Set the user value corresponding to the supplied key to the * supplied value. * *@param strClass the class of the preferences we are setting *@param strKey Key of the preference to set *@param strValue the value of the preference */ public void set( String strClass, String strKey, String strValue ) { Preferences classPrefs = userPrefs.node( strClass ); classPrefs.put( strKey, strValue ); } /** * Return a graphical editor for the user preferences for the * indicated class. * *@param strClass the class of prefeserence we wish to edit *@param frame the parent frame for the dialog *@return The editorDialog value */ public PreferencesEditor getEditorDialog( String strClass, Frame frame ) { Preferences preferences = userPrefs.node( strClass ); PreferencesEditor pe = null; try { pe = new PreferencesEditor( frame, true, preferences ); } catch ( BackingStoreException bse ) { // FIXME: handle this error gracefully logger.log( Level.SEVERE, "Unable to create preference editor", bse ); } return pe; } } |
|
From: <rga...@us...> - 2002-11-03 20:46:39
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv16929
Modified Files:
ControlCentre.java
Log Message:
Improved handling of preferences. Now uses a separate Preferences manager. The user no longer needs to define parameters in the editor window, they are there by default. If the user has customised any settings they will be retained inbetween installs.
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ControlCentre.java 1 Nov 2002 22:40:47 -0000 1.9
--- ControlCentre.java 3 Nov 2002 20:46:36 -0000 1.10
***************
*** 35,40 ****
*/
package org.fanfoot.gui;
-
import java.awt.Dimension;
import java.io.File;
import java.io.FileNotFoundException;
--- 35,41 ----
*/
package org.fanfoot.gui;
import java.awt.Dimension;
[...1002 lines suppressed...]
--- 636,654 ----
*@param e Description of the Parameter
*/
! public void retrievedCommentary( EventObject e ) {
}
/**
! *@param args the command line arguments
*/
! public static void main( String args[] ) {
! try {
! new ControlCentre().show();
! } catch ( Exception e ) {
! System.out.println( "Unable to load configuration file." );
! e.printStackTrace();
! }
! }
}
|
|
From: <rga...@us...> - 2002-11-03 20:46:20
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv16885
Modified Files:
status.xml
Log Message:
Improved handling of preferences. Now uses a separate Preferences manager. The user no longer needs to define parameters in the editor window, they are there by default. If the user has customised any settings they will be retained inbetween installs.
Index: status.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/status.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** status.xml 1 Nov 2002 22:05:44 -0000 1.8
--- status.xml 3 Nov 2002 20:46:16 -0000 1.9
***************
*** 1,91 ****
<?xml version="1.0"?>
! <?xml-stylesheet type="text/xsl" href="tools/antipede/resources/stylesheets/status.xsl"?>
<status>
-
<developers>
! <!-- in strict id alphabetical order -->
! <person name="Ross D. Gardler" id="rdg" email="ro...@sa..."/>
! <person name="Stuart Gardler" id="smgardler" email="st...@wk..."/>
! <person name="Michael Lever" id="leverm" email="mi...@fa..."/>
</developers>
!
<todo>
! <actions priority="high">
! <action context="design" assigned-to="all">
! Design the data structures for team management in the core system.
! </action>
! <action context="code" assigned-to="all">
! Make the 0.1.1alpha release accessible as a Cocoon web app.
! </action>
! </actions>
</todo>
<changes>
<release version="" date="">
! <description>This is release moves the prior 0.1.1alpha release to
! a Cocoon application rather than a standalone application. This enable
! the creation of a web based interface to the system. The first part of which
! is the Auot Scoring facilites found inthe previous release.</description>
! <action dev="rdg" type="update">
! Added additional feedback via the log when calculating score and made
! information panes appear in the GUI in a different order. This is so
! the system doesn't look "dead" whilst calculating.
! </action>
! <action dev="rdg" type="bugfix" id="630866">
! Fixed bug preventing local files being loaded into the browser on Windows.
! </action>
! <action dev="rdg" type="add">
! Added basic ANT support. For compile and run targets Ant is much faster because
! it does not have the overhead that comes with starting Centipede. However, Centipede
! remains as the main build tool.
! </action>
</release>
<release version="0.1.1alpha1" date="29 October 2002">
! <description>Scrapes BBC textual commentaries of Barclaycard Premiership games and
! generates scores accordingly. How the events are scraped and how the scores are
! calculated is defined in configuration files.</description>
! <action dev="rdg" type="add">
! Added ability to override preferences so that config files are stored
! locally rather than remotely.
! </action>
! <action dev="rdg" type="add">
! Addition of CSMS skin for the community web site.
! </action>
! <action dev="rdg" type="add">
! Addition of JDepend metrics report to the community site.
! </action>
! <action dev="rdg" type="update">
! Various refactorings and code style checks in response to checkstyle reports.
! </action>
! <action dev="rdg" type="update">
! Local browser now displays commentary before any other files are loaded, this improves performance
! because the browser will download the file in parallel to the configuration files.
! </action>
! <action dev="rdg" type="update">
! Local browser now displays contents of local file as well as remote urls when parsing.
! </action>
! <action dev="rdg" type="update">
! Now able tp check for duplicate events in the event parser using the <duplicateDetection>
! element of the the event definition in the parser config file.
! </action>
! <action dev="rdg" type="update">
! Removed permanent tab panes for Events XML, Scores XML and Scores HTML.
! These are now created as they are needed.
! </action>
! <action dev="rdg" type="update">
! Added list BBC commentary URLs to the getURL dialog used to enter
! the URL of a page to parse. You can now either type an URL or select one
! in the combo box.
! </action>
! <action dev="rdg" type="add">
! Added Event notification to EventParser and EventParserListener to allow feedback to the
! application.
! </action>
! <action dev="rdg" type="add">
! ControlCentre now controls the native broswer to display the commentary page.
! This should assist in verifying calculated scores.
! </action>
</release>
! </changes>
</status>
--- 1,99 ----
<?xml version="1.0"?>
! <?xml-stylesheet type="text/xsl"
! href="tools/antipede/resources/stylesheets/status.xsl"?>
<status>
<developers>
! <!-- in strict id alphabetical order -->
! <person name="Ross D. Gardler" id="rdg" email="ro...@sa..." />
!
! <person name="Stuart Gardler" id="smgardler" email="st...@wk..." />
!
! <person name="Michael Lever" id="leverm" email="mi...@fa..." />
</developers>
!
<todo>
! <actions priority="high">
! <action context="design" assigned-to="all">Design the data structures
! for team management in the core system.</action>
!
! <action context="code" assigned-to="all">Make the 0.1.1alpha release
! accessible as a Cocoon web app.</action>
! </actions>
</todo>
<changes>
<release version="" date="">
! <description>This is release moves the prior 0.1.1alpha release to a
! Cocoon application rather than a standalone application. This enable the
! creation of a web based interface to the system. The first part of which
! is the Auot Scoring facilites found inthe previous
! release.</description>
!
! <action dev="rdg" type="update">Improved handling of preferences. Now
! uses a separate Preferences manager. The user no longer needs to define
! parameters in the editor window, they are there by default. If the
! user has customised any settings they will be retained inbetween installs.</action>
!
! <action dev="rdg" type="update">Added additional feedback via the log
! when calculating score and made information panes appear in the GUI in a
! different order. This is so the system doesn't look "dead" whilst
! calculating.</action>
!
! <action dev="rdg" type="bugfix" id="630866">Fixed bug preventing local
! files being loaded into the browser on Windows.</action>
!
! <action dev="rdg" type="add">Added basic ANT support. For compile and
! run targets Ant is much faster because it does not have the overhead
! that comes with starting Centipede. However, Centipede remains as the
! main build tool.</action>
</release>
+
<release version="0.1.1alpha1" date="29 October 2002">
! <description>Scrapes BBC textual commentaries of Barclaycard Premiership
! games and generates scores accordingly. How the events are scraped and
! how the scores are calculated is defined in configuration
! files.</description>
!
! <action dev="rdg" type="add">Added ability to override preferences so
! that config files are stored locally rather than remotely.</action>
!
! <action dev="rdg" type="add">Addition of CSMS skin for the community web
! site.</action>
!
! <action dev="rdg" type="add">Addition of JDepend metrics report to the
! community site.</action>
!
! <action dev="rdg" type="update">Various refactorings and code style
! checks in response to checkstyle reports.</action>
!
! <action dev="rdg" type="update">Local browser now displays commentary
! before any other files are loaded, this improves performance because the
! browser will download the file in parallel to the configuration
! files.</action>
!
! <action dev="rdg" type="update">Local browser now displays contents of
! local file as well as remote urls when parsing.</action>
!
! <action dev="rdg" type="update">Now able tp check for duplicate events
! in the event parser using the <duplicateDetection> element of the
! the event definition in the parser config file.</action>
!
! <action dev="rdg" type="update">Removed permanent tab panes for Events
! XML, Scores XML and Scores HTML. These are now created as they are
! needed.</action>
!
! <action dev="rdg" type="update">Added list BBC commentary URLs to the
! getURL dialog used to enter the URL of a page to parse. You can now
! either type an URL or select one in the combo box.</action>
!
! <action dev="rdg" type="add">Added Event notification to EventParser and
! EventParserListener to allow feedback to the application.</action>
!
! <action dev="rdg" type="add">ControlCentre now controls the native
! broswer to display the commentary page. This should assist in verifying
! calculated scores.</action>
</release>
! </changes>
</status>
+
|
|
From: <rga...@us...> - 2002-11-03 19:09:32
|
Update of /cvsroot/csms/csms-core/src/test/resources/testHTML In directory usw-pr-cvs1:/tmp/cvs-serv18319 Added Files: FulVWestHam_23_10.html Log Message: Test commentary (contains a sending off) --- NEW FILE: FulVWestHam_23_10.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- saved from url=(0092)http://news.bbc.co.uk/sport/hi/english/static/football/statistics/teams/f/fulham/live_hi.stm --> <!--SOLIndexTemplate--><HTML><HEAD><TITLE>BBC SPORT | FOOTBALL | STATISTICS | TEAMS | FULHAM STATISTICS LIVE TEXT COMMENTARY</TITLE> <META http-equiv=Content-Type content="text/html; charset=windows-1252"> <META content=noindex name=robots> <META http-equiv=expires content=now> <META http-equiv=pragma content=no-cache> <META http-equiv=Refresh content=120;url=/sport/hi/english/static/football/statistics/teams/f/fulham/live_hi.stm> <META content="BBC Sport world uk international foreign british online service" name=keywords> <META content="2002/10/23 19:30:38" name=OriginalPublicationDate><!-- NOLMaps--> <SCRIPT language=JavaScript src="FUL v WES_files/sport.js"></SCRIPT> <MAP name=aroundukmap><AREA shape=RECT alt=Scotland coords=7,18,96,30 href="http://news.bbc.co.uk/sport/hi/english/scotland/default.stm"><AREA shape=RECT alt=Wales coords=7,30,96,42 href="http://news.bbc.co.uk/sport/hi/english/wales/default.stm"><AREA shape=RECT alt="Northern Ireland" coords=7,44,96,58 href="http://news.bbc.co.uk/sport/hi/english/northern_ireland/default.stm"></MAP><MAP [...2607 lines suppressed...] Pundits</A> | <A class=index href="http://news.bbc.co.uk/sport/hi/english/static/tv_and_radio/question_of_sport/default.stm">Question of Sport</A> | <A class=index href="http://news.bbc.co.uk/sport/hi/english/funny_old_game/default.stm">Funny Old Game</A></B> <BR><B><SPAN style="COLOR: #cccccc">------------------------------------------------------------</SPAN> <BR><A class=footer href="http://news.bbc.co.uk/">BBC News >></A> | <A class=footer href="http://www.bbc.co.uk/weather">BBC Weather >></A></B> <BR><SPAN style="COLOR: #cccccc">----------------------------------------------------------------------------------</SPAN><BR><A class=footer href="http://news.bbc.co.uk/sport/hi/english/static/help/copyright.stm"><SPAN style="FONT-SIZE: 10px">© MMII</SPAN></A> <FONT size=1>|</FONT> <A class=footer href="http://news.bbc.co.uk/sport/hi/english/static/help/sources.stm"><SPAN style="FONT-SIZE: 10px">News Sources</SPAN></A> <FONT size=1>|</FONT> <A class=footer href="http://www.bbc.co.uk/privacy/"><SPAN style="FONT-SIZE: 10px">Privacy</SPAN></A></B> <BR><BR></TD></TR></TBODY></TABLE><LINK href="FUL v WES_files/sport.css" type=text/css rel=stylesheet></BODY></HTML> |
|
From: <rga...@us...> - 2002-11-03 19:06:08
|
Update of /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall
In directory usw-pr-cvs1:/tmp/cvs-serv17531
Modified Files:
configuration.xml
Log Message:
Tidied up a little
Index: configuration.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/documentation/xdocs/downloadAndInstall/configuration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configuration.xml 28 Oct 2002 13:04:51 -0000 1.1
--- configuration.xml 3 Nov 2002 19:06:05 -0000 1.2
***************
*** 14,94 ****
<section>
<title>Introduction</title>
! <p>Currently the Community Sports Management System consists
! of the very beginnings of one of the sports modules. This module
! provides facilites to manage a fantasy Football (that's Soccer to
! our American friends), However, this module can easily be adapted
! to provide other Fantasy Sports games by providing additional
! configuration files that define the rules for the game.</p>
!
! <p>These configuration files are, in the default installation,
! loaded from the internet, however, you can configure the locations they
! are loaded from in the configuraiton dialog of the GUI interface as described below. Example
! configuration files (the same ones available on the Internet are avilable in
! the <code>src/resources/conf</code> directory of the source distributions. If you
! wish to fix any bugs found in the online config files, please configure your
! application to use these local files, edit them and supply patches to us
! via the <link href="http://sourceforge.net/tracker/?atid=509510&group_id=65029&func=browse">patch tracking system</link>. In fact, changing the settings
! to the local versions of the files will make the system run faster since it will not
! have to download the files from the Internet, however, you will not automatically
! benifit from fixes in the files.</p>
!
! <fixme author="rdg">Move all docs about the config files to here from the wiki site. In the
! meantime, visitors can view the docs on <link href="http://www.fanfoot.com/wiki/Wiki.jsp?page=AutomatedScoring">our Wkii</link></fixme>
!
</section>
<section>
<title>Configuring The Fantasy Sports Module</title>
! <p>The following preferneces will define where the configuration files will be loaded from.
! You can change the default settings by selecting the <code>Preferences</code> option in the
! <code>Configuration</code> menu.</p>
<table>
! <caption>Config File Load Paths</caption>
<tr>
<th>Preference Name</th>
<th>Description</th>
<th>Default</th>
</tr>
<tr>
<td>EventConfigurationFile</td>
! <td>The URL from which the Event configuration file should be loaded.
! This file defines a set of regular expression patterns that are used to extract
! events from an information source concerning a real sports game. This file
! is used to generate Events.xml a file that describes all the events in a real game
! that may result in a scoring opportunity in the fantasy game.</td>
<td>http://www.fanfoot.com/test/footballEvents.xml</td>
</tr>
<tr>
<td>ScoringConfigurationFile</td>
! <td>The URL from which to load the Scoring Configuration file will be loaded.
! This file defines how events in real games are converted nto scores in the fantasy game.
! It is an XSL file that processes the Events.xml file. When Events.xml is processed
! with this stylesheet it should produce Scores.xml, a file representing all the
! scoring events in a game.</td>
<td>http://www.fanfoot.com/test/ScoringConfig.xsl</td>
</tr>
<tr>
<td>Scores2HTMLStylsheet</td>
! <td>The URL from which to download an XSL file used to convert the Scores.xml file
! to an HTML file for display in the application.</td>
<td>http://www.fanfoot.com/test/Scores2HTML.xsl</td>
</tr>
</table>
- <section>
- <title>Misc Config Options</title>
- <table>
- <caption>Misc Config Options</caption>
- <tr>
- <th>Preference Name</th>
- <th>Description</th>
- <th>Default</th>
- </tr>
- <tr>
- <td>debug</td>
- <td>Defines whether the appliation runs in debug mode or not.</td>
- <td>true</td>
- </tr>
- </table>
- </section>
</section>
</body>
</document>
--- 14,129 ----
<section>
<title>Introduction</title>
!
! <p>Currently the Community Sports Management System consists of the very
! beginnings of one of the sports modules. This module provides facilites
! to manage a fantasy Football (that's Soccer to our American friends),
! However, this module can easily be adapted to provide other Fantasy
! Sports games by providing additional configuration files that define the
! rules for the game.</p>
!
! <p>These configuration files are, in the default installation, loaded
! from the internet, however, you can configure the locations they are
! loaded from in the configuraiton dialog of the GUI interface as
! described below. Example configuration files (the same ones available on
! the Internet are avilable in the
! <code>src/resources/conf</code>
!
! directory of the source distributions. If you wish to fix any bugs found
! in the online config files, please configure your application to use
! these local files, edit them and supply patches to us via the
! <link
! href="http://sourceforge.net/tracker/?atid=509510&group_id=65029&func=browse">
! patch tracking system</link>
!
! . In fact, changing the settings to the local versions of the files will
! make the system run faster since it will not have to download the files
! from the Internet, however, you will not automatically benifit from
! fixes in the files.</p>
!
! <fixme author="rdg">Move all docs about the config files to here from
! the wiki site. In the meantime, visitors can view the docs on
! <link href="http://www.fanfoot.com/wiki/Wiki.jsp?page=AutomatedScoring">
! our Wkii</link>
! </fixme>
</section>
+
<section>
<title>Configuring The Fantasy Sports Module</title>
!
! <p>The following preferneces will define where the configuration files
! will be loaded from. You can change the default settings by selecting
! the
! <code>Preferences</code>
!
! option in the
! <code>Configuration</code>
!
! menu.</p>
!
<table>
! <caption>Auto Scorer Preferences</caption>
!
<tr>
<th>Preference Name</th>
+
<th>Description</th>
+
<th>Default</th>
</tr>
+
+ <tr>
+ <th colspan="3">Configuration Files</th>
+ </tr>
+
<tr>
<td>EventConfigurationFile</td>
!
! <td>The URL from which the Event configuration file should be
! loaded. This file defines a set of regular expression patterns that
! are used to extract events from an information source concerning a
! real sports game. This file is used to generate Events.xml a file
! that describes all the events in a real game that may result in a
! scoring opportunity in the fantasy game.</td>
!
<td>http://www.fanfoot.com/test/footballEvents.xml</td>
</tr>
+
<tr>
<td>ScoringConfigurationFile</td>
!
! <td>The URL from which to load the Scoring Configuration file will
! be loaded. This file defines how events in real games are converted
! nto scores in the fantasy game. It is an XSL file that processes the
! Events.xml file. When Events.xml is processed with this stylesheet
! it should produce Scores.xml, a file representing all the scoring
! events in a game.</td>
!
<td>http://www.fanfoot.com/test/ScoringConfig.xsl</td>
</tr>
+
<tr>
<td>Scores2HTMLStylsheet</td>
!
! <td>The URL from which to download an XSL file used to convert the
! Scores.xml file to an HTML file for display in the application.</td>
!
<td>http://www.fanfoot.com/test/Scores2HTML.xsl</td>
</tr>
+
+ <tr>
+ <th colspan="3">Miscellaneous</th>
+ </tr>
+
+ <tr>
+ <td>debug</td>
+
+ <td>Defines whether the appliation runs in debug mode or not.</td>
+
+ <td>true</td>
+ </tr>
</table>
</section>
</body>
</document>
+
+
|
|
From: <rga...@us...> - 2002-11-03 17:42:42
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv20384
Modified Files:
build.xml
Log Message:
Added clean target
Index: build.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml 2 Nov 2002 22:16:51 -0000 1.3
--- build.xml 3 Nov 2002 17:42:39 -0000 1.4
***************
*** 37,49 ****
<property name="lib.dir" value="./lib"/>
- <target name="compile" description="Compile all files">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${work.dir}"/>
- <mkdir dir="${temp.dir}"/>
-
<property name="project.name" value="csms-core"/>
<property name="project.build.dir" value="${build.dir}/${project.name}" />
<property name="project.work.dir" value="${build.dir}/${project.name}/work" />
<property name="project.src.dir" value="${src.dir}/java" />
--- 37,49 ----
<property name="lib.dir" value="./lib"/>
<property name="project.name" value="csms-core"/>
<property name="project.build.dir" value="${build.dir}/${project.name}" />
<property name="project.work.dir" value="${build.dir}/${project.name}/work" />
<property name="project.src.dir" value="${src.dir}/java" />
+
+ <target name="compile" description="Compile all files">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${work.dir}"/>
+ <mkdir dir="${temp.dir}"/>
***************
*** 91,94 ****
--- 91,98 ----
</classpath>
</java>
+ </target>
+
+ <target name="clean" description="Clean all build files">
+ <delete dir="${project.build.dir}"/>
</target>
</project>
|
|
From: <rga...@us...> - 2002-11-02 23:43:57
|
Update of /cvsroot/csms/csms-core/lib In directory usw-pr-cvs1:/tmp/cvs-serv10602 Added Files: xalan.jar Removed Files: xalan-2.3.1.jar Log Message: Upgrading to the latest version of Xalan --- NEW FILE: xalan.jar --- (This appears to be a binary file; contents omitted.) --- xalan-2.3.1.jar DELETED --- |
|
From: <rga...@us...> - 2002-11-02 22:26:40
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv15161
Modified Files:
teams.xml
Log Message:
Correcting id for Newcastle United
Index: teams.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/teams.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** teams.xml 1 Nov 2002 22:49:55 -0000 1.1
--- teams.xml 2 Nov 2002 22:26:37 -0000 1.2
***************
*** 42,46 ****
<commonName>Middlesbrough</commonName>
</team>
! <team id="New">
<commonName>Newcastle United</commonName>
</team>
--- 42,46 ----
<commonName>Middlesbrough</commonName>
</team>
! <team id="NEW">
<commonName>Newcastle United</commonName>
</team>
|
|
From: <rga...@us...> - 2002-11-02 22:16:56
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv11491
Modified Files:
build.xml
Log Message:
COmpile with debug and deprecation information
Index: build.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml 31 Oct 2002 18:42:55 -0000 1.2
--- build.xml 2 Nov 2002 22:16:51 -0000 1.3
***************
*** 61,65 ****
<javac srcdir= "${project.src.dir}"
! destdir= "${project.build.dir}/classes">
<classpath>
<fileset dir="${lib.dir}">
--- 61,67 ----
<javac srcdir= "${project.src.dir}"
! destdir= "${project.build.dir}/classes"
! debug= "on"
! deprecation= "on">
<classpath>
<fileset dir="${lib.dir}">
|
|
From: <rga...@us...> - 2002-11-02 18:07:45
|
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>
|
|
From: <rga...@us...> - 2002-11-02 18:06:46
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv19623
Modified Files:
ScoringConfig.xsl
Log Message:
Fixed issues with points for red and yellow cards
Index: ScoringConfig.xsl
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/ScoringConfig.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScoringConfig.xsl 2 Nov 2002 16:54:31 -0000 1.2
--- ScoringConfig.xsl 2 Nov 2002 18:06:42 -0000 1.3
***************
*** 389,402 ****
<!-- Any player receiving a straight Red Card will lose 3 points. -->
! <!-- FIXME ensure a player sent off for two yellows does not get the -3 penalty, just the two -1's for the yellows -->
! <!-- FIXME ensure a player recieveing 1 yellow and 1 red gets - 4 points (-1 + -3) -->
! <xsl:template name="sendingOffs">
! <xsl:for-each select="//event[type='sendingOff']">
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="player"/></xsl:with-param>
<xsl:with-param name="points">-3</xsl:with-param>
! <xsl:with-param name="eventType">Sending Off</xsl:with-param>
</xsl:call-template>
</xsl:for-each>
</xsl:template>
--- 389,404 ----
<!-- Any player receiving a straight Red Card will lose 3 points. -->
! <xsl:template name="redCards">
! <xsl:for-each select="//event[type='redCard']">
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="player"/></xsl:with-param>
<xsl:with-param name="points">-3</xsl:with-param>
! <xsl:with-param name="eventType">Red Card</xsl:with-param>
</xsl:call-template>
</xsl:for-each>
+ </xsl:template>
+
+ <xsl:template name="sendingOffs">
+ <!-- no additional points for a sending off -->
</xsl:template>
|
|
From: <rga...@us...> - 2002-11-02 16:54:36
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv7768
Modified Files:
ScoringConfig.xsl
Log Message:
Fixed problem of picking up the wrong player from players.xml (bug 629932)
Fixed problem with conceeding goal points being deducted (bug 632605)
Index: ScoringConfig.xsl
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/ScoringConfig.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScoringConfig.xsl 28 Oct 2002 13:54:22 -0000 1.1
--- ScoringConfig.xsl 2 Nov 2002 16:54:31 -0000 1.2
***************
*** 15,20 ****
<xsl:output method="text/xml"/>
- <!-- fixme the following pathname should be an URL -->
<xsl:variable name="playersDataSource">http://www.fanfoot.com/test/players.xml</xsl:variable>
<!-- match everything not match elsewhere and do nothing with it! -->
--- 15,20 ----
<xsl:output method="text/xml"/>
<xsl:variable name="playersDataSource">http://www.fanfoot.com/test/players.xml</xsl:variable>
+ <xsl:variable name="teamDataSource">http://www.fanfoot.com/test/teams.xml</xsl:variable>
<!-- match everything not match elsewhere and do nothing with it! -->
***************
*** 76,83 ****
--- 76,90 ----
<xsl:for-each select="//event[type='teamStarter'] | //event[type='substituteStarter']">
<xsl:variable name="playerSurname"><xsl:value-of select="./player"/></xsl:variable>
+ <xsl:variable name="teamCommonName"><xsl:value-of select="./team"/></xsl:variable>
+ <xsl:variable name="teamID">
+ <xsl:call-template name="getTeamID">
+ <xsl:with-param name="commonName"><xsl:value-of select="$teamCommonName"/></xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
<xsl:variable name="playerName">
<xsl:call-template name="getPlayerFullName">
<xsl:with-param name="playerSurname"><xsl:value-of select="$playerSurname"/></xsl:with-param>
+ <xsl:with-param name="teamID"><xsl:value-of select="$teamID"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
***************
*** 119,126 ****
<xsl:for-each select="//event[type='teamStarter'] | //event[type='substituteStarter']">
<xsl:variable name="currentTeam"><xsl:value-of select="team"/></xsl:variable>
!
<xsl:variable name="playerFullName">
<xsl:call-template name="getPlayerFullName">
<xsl:with-param name="playerSurname"><xsl:value-of select="player"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
--- 126,138 ----
<xsl:for-each select="//event[type='teamStarter'] | //event[type='substituteStarter']">
<xsl:variable name="currentTeam"><xsl:value-of select="team"/></xsl:variable>
! <xsl:variable name="teamID">
! <xsl:call-template name="getTeamID">
! <xsl:with-param name="commonName"><xsl:value-of select="$currentTeam"/></xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
<xsl:variable name="playerFullName">
<xsl:call-template name="getPlayerFullName">
<xsl:with-param name="playerSurname"><xsl:value-of select="player"/></xsl:with-param>
+ <xsl:with-param name="teamID"><xsl:value-of select="$teamID"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
***************
*** 230,268 ****
<xsl:variable name="goalMinutes"><xsl:value-of select="normalTimeMinutes"/></xsl:variable>
! <xsl:variable name="scoringTeam">
<xsl:call-template name="getPlayerTeam">
<xsl:with-param name="playerFullName"><xsl:value-of select="player"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
!
!
! <xsl:for-each select="//event[type='teamStarter'] | //event[type='substituteStarter']">
<xsl:variable name="playerFullName">
<xsl:call-template name="getPlayerFullName">
<xsl:with-param name="playerSurname"><xsl:value-of select="player"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
!
! <xsl:variable name="playerTeam">
! <xsl:call-template name="getPlayerTeam">
! <xsl:with-param name="playerSurname"><xsl:value-of select="player"/></xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
<xsl:choose>
<xsl:when test="starts-with($scoringTeam, 'ERROR')">
<error>
! <xsl:value-of select="concat('Unable to deduct conceeded goal points becuase cannot identify scoring team (', $scoringTeam, ')')"/>
! </error>
! </xsl:when>
!
! <xsl:when test="starts-with($playerTeam, 'ERROR')">
! <error>
! <xsl:value-of select="concat('Unable to deduct conceeded goal points becuase cannot identify scoring team (', $playerTeam, ')')"/>
</error>
</xsl:when>
! <xsl:when test="$playerTeam != $scoringTeam">
<!-- get player start time -->
<xsl:variable name="onMinutes">
--- 242,296 ----
<xsl:variable name="goalMinutes"><xsl:value-of select="normalTimeMinutes"/></xsl:variable>
! <xsl:variable name="scoringTeamID">
<xsl:call-template name="getPlayerTeam">
<xsl:with-param name="playerFullName"><xsl:value-of select="player"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
!
! <xsl:variable name="scoringTeam">
! <xsl:call-template name="getTeamName">
! <xsl:with-param name="teamID"><xsl:value-of select="$scoringTeamID"/></xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:variable name="conceedingTeam">
! <xsl:choose>
! <xsl:when test="//event[type='result']/homeTeam = $scoringTeam">
! <xsl:value-of select="//event[type='result']/awayTeam"/>
! </xsl:when>
! <xsl:otherwise>
! <xsl:value-of select="//event[type='result']/homeTeam"/>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:variable>
!
! <xsl:variable name="conceedingTeamID">
! <xsl:call-template name="getTeamID">
! <xsl:with-param name="commonName"><xsl:value-of select="$conceedingTeam"/></xsl:with-param>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:for-each select="//event[type='teamStarter' and team=$conceedingTeam] | //event[type='substituteStarter' and team=$conceedingTeam]">
<xsl:variable name="playerFullName">
<xsl:call-template name="getPlayerFullName">
<xsl:with-param name="playerSurname"><xsl:value-of select="player"/></xsl:with-param>
+ <xsl:with-param name="teamID"><xsl:value-of select="$conceedingTeamID"/></xsl:with-param>
</xsl:call-template>
</xsl:variable>
!
<xsl:choose>
<xsl:when test="starts-with($scoringTeam, 'ERROR')">
<error>
! <xsl:value-of select="concat('Unable to deduct conceeded goal points from ', $playerFullName, ' of ', $conceedingTeam, ' because cannot identify scoring team (', $scoringTeam, ')')"/>
</error>
</xsl:when>
! <xsl:when test="starts-with($playerFullName, 'ERROR')">
! <error>
! <xsl:value-of select="concat('Unable to deduct goalkeepers/defenders conceeding points for ', $playerFullName, ' of ', $conceedingTeam)"/>
! </error>
! </xsl:when>
+ <xsl:otherwise>
<!-- get player start time -->
<xsl:variable name="onMinutes">
***************
*** 291,298 ****
</xsl:choose>
</xsl:variable>
!
<!-- test to see if the player was on the pitch when the goal was scored -->
! <xsl:if test="$offMinutes != 'Did Not Play'">
! <xsl:if test="$goalMinutes < $offMinutes and $goalMinutes > onMinutes">
<xsl:variable name="playerPosition">
<xsl:call-template name="getPlayerPosition">
--- 319,326 ----
</xsl:choose>
</xsl:variable>
!
<!-- test to see if the player was on the pitch when the goal was scored -->
! <xsl:if test="$onMinutes != 'Did Not Play'">
! <xsl:if test="$goalMinutes < $offMinutes and $goalMinutes > $onMinutes">
<xsl:variable name="playerPosition">
<xsl:call-template name="getPlayerPosition">
***************
*** 300,309 ****
</xsl:call-template>
</xsl:variable>
!
<xsl:choose>
<xsl:when test="$playerPosition = 'Goalkeeper'">
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$playerTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Goalkeeper Conceeded Goal</xsl:with-param>
--- 328,337 ----
</xsl:call-template>
</xsl:variable>
!
<xsl:choose>
<xsl:when test="$playerPosition = 'Goalkeeper'">
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$conceedingTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Goalkeeper Conceeded Goal</xsl:with-param>
***************
*** 313,317 ****
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$playerTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Full Back Conceeded Goal</xsl:with-param>
--- 341,345 ----
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$conceedingTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Full Back Conceeded Goal</xsl:with-param>
***************
*** 321,325 ****
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$playerTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Centre Back Conceeded Goal</xsl:with-param>
--- 349,353 ----
<xsl:call-template name="getPointsNode">
<xsl:with-param name="playerName"><xsl:value-of select="$playerFullName"/></xsl:with-param>
! <xsl:with-param name="playersTeam"><xsl:value-of select="$conceedingTeam"/></xsl:with-param>
<xsl:with-param name="points">-1</xsl:with-param>
<xsl:with-param name="eventType">Centre Back Conceeded Goal</xsl:with-param>
***************
*** 332,336 ****
<xsl:otherwise>
<error>
! <xsl:value-of select="concat('Unable to determine player position to deduct conceeded goal points (', $playerFullName, ' of ', $playerTeam, ')')"/>
</error>
</xsl:otherwise>
--- 360,364 ----
<xsl:otherwise>
<error>
! <xsl:value-of select="concat('Unable to determine player position to deduct conceeded goal points (', $playerFullName, ' of ', $conceedingTeam, ')')"/>
</error>
</xsl:otherwise>
***************
*** 338,344 ****
</xsl:if>
</xsl:if>
! </xsl:when>
</xsl:choose>
</xsl:for-each>
</xsl:for-each>
</xsl:template>
--- 366,377 ----
</xsl:if>
</xsl:if>
! </xsl:otherwise>
</xsl:choose>
+
+
</xsl:for-each>
+
+
+
</xsl:for-each>
</xsl:template>
***************
*** 368,383 ****
</xsl:template>
! <!-- Return the full player name -->
<xsl:template name="getPlayerFullName">
<xsl:param name="playerSurname"/>
<xsl:variable name="playerFirstName">
! <xsl:value-of select="document($playersDataSource)/players/player[surname=$playerSurname]/firstName[@type='main']"/>
</xsl:variable>
!
<!-- Return the result -->
<xsl:choose>
<xsl:when test="string-length($playerFirstName) > 0"><xsl:value-of select="concat($playerFirstName, ' ', $playerSurname)"/></xsl:when>
! <xsl:otherwise><xsl:value-of select="concat('ERROR: Unknown Player (', $playerSurname, ')')"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
--- 401,447 ----
</xsl:template>
! <!-- Return team ID given the teams common name -->
! <xsl:template name="getTeamID">
! <xsl:param name="commonName"/>
!
! <xsl:variable name="teamID">
! <xsl:value-of select="document($teamDataSource)/teams/team[commonName=$commonName]/@id"/>
! </xsl:variable>
!
! <!-- Return the result -->
! <xsl:choose>
! <xsl:when test="string-length($teamID) > 0"><xsl:value-of select="$teamID"/></xsl:when>
! <xsl:otherwise><xsl:value-of select="concat('ERROR: Unknown Team (', $commonName, ')')"/></xsl:otherwise>
! </xsl:choose>
! </xsl:template>
!
! <!-- Return team common name given the teams id -->
! <xsl:template name="getTeamName">
! <xsl:param name="teamID"/>
!
! <xsl:variable name="teamName">
! <xsl:value-of select="document($teamDataSource)/teams/team[@id=$teamID]/commonName"/>
! </xsl:variable>
!
! <!-- Return the result -->
! <xsl:choose>
! <xsl:when test="string-length($teamName) > 0"><xsl:value-of select="$teamName"/></xsl:when>
! <xsl:otherwise><xsl:value-of select="concat('ERROR: Unknown Team (', $teamID, ')')"/></xsl:otherwise>
! </xsl:choose>
! </xsl:template>
!
! <!-- Return the full player name, given the surname and team ID -->
<xsl:template name="getPlayerFullName">
<xsl:param name="playerSurname"/>
+ <xsl:param name="teamID"/>
<xsl:variable name="playerFirstName">
! <xsl:value-of select="document($playersDataSource)/players/player[surname=$playerSurname and team=$teamID]/firstName[@type='main']"/>
</xsl:variable>
!
<!-- Return the result -->
<xsl:choose>
<xsl:when test="string-length($playerFirstName) > 0"><xsl:value-of select="concat($playerFirstName, ' ', $playerSurname)"/></xsl:when>
! <xsl:otherwise><xsl:value-of select="concat('ERROR: Unknown Player (', $playerSurname, ' of ', $teamID, ')')"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
|
|
From: <rga...@us...> - 2002-11-01 22:50:00
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv22894
Added Files:
teams.xml
Log Message:
Added teams database file
--- NEW FILE: teams.xml ---
<teams>
<team id="ARS">
<commonName>Arsenal</commonName>
</team>
<team id="AST">
<commonName>Aston Villa</commonName>
</team>
<team id="BIR">
<commonName>Birmingham City</commonName>
</team>
<team id="BLA">
<commonName>Blackburn Rovers</commonName>
</team>
<team id="BOL">
<commonName>Bolton Wanderers</commonName>
</team>
<team id="CHA">
<commonName>Charlton Athletic</commonName>
</team>
<team id="CHE">
<commonName>Chelsea</commonName>
</team>
<team id="EVE">
<commonName>Everton</commonName>
</team>
<team id="FUL">
<commonName>Fulham</commonName>
</team>
<team id="LEE">
<commonName>Leeds United</commonName>
</team>
<team id="LIV">
<commonName>Liverpool</commonName>
</team>
<team id="MAN">
<commonName>Man United</commonName>
</team>
<team id="MCY">
<commonName>Man City</commonName>
</team>
<team id="MID">
<commonName>Middlesbrough</commonName>
</team>
<team id="New">
<commonName>Newcastle United</commonName>
</team>
<team id="SOT">
<commonName>Southampton</commonName>
</team>
<team id="SUN">
<commonName>Sunderalnd</commonName>
</team>
<team id="TOT">
<commonName>Tottenham Hotspur</commonName>
</team>
<team id="WBA">
<commonName>West Bromwich Albion</commonName>
</team>
<team id="WES">
<commonName>West Ham Utd</commonName>
</team>
</teams>
|
|
From: <rga...@us...> - 2002-11-01 22:40:51
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv19427
Modified Files:
ControlCentre.java
Log Message:
Put back events tab which had been accidentally removed
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ControlCentre.java 1 Nov 2002 22:06:02 -0000 1.8
--- ControlCentre.java 1 Nov 2002 22:40:47 -0000 1.9
***************
*** 448,451 ****
--- 448,452 ----
tabpneEvents.removeAll();
addEventPanes(evts);
+ addEventsPane(evts);
addScoresPane(evts);
addSummaryPane();
|
|
From: <rga...@us...> - 2002-11-01 22:06:21
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/scoring
In directory usw-pr-cvs1:/tmp/cvs-serv4042
Modified Files:
Scores.java
Log Message:
Added additional feedback to user (via log) and changed order panes are displayed. This gives less "dead" time whilst calculating scores
Index: Scores.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/scoring/Scores.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Scores.java 21 Oct 2002 12:01:14 -0000 1.2
--- Scores.java 1 Nov 2002 22:06:16 -0000 1.3
***************
*** 47,52 ****
* collection.
*
! *@author rgardler
! *@created 21 October 2002
*/
public class Scores {
--- 47,52 ----
* collection.
*
! *@author rgardler
! *@created 21 October 2002
*/
public class Scores {
***************
*** 68,78 ****
* Creates a new instance of calculator
*
! *@param evts the events to calculate
! * the score from
! *@param sc Description of the
! * Parameter
! *@exception ScoringConfigurationException Description of the
* Exception
! *@throws ScoringConfigurationException if unable to calculate
* scores
*/
--- 68,76 ----
* Creates a new instance of calculator
*
! *@param evts the events to calculate the score from
! *@param sc Description of the Parameter
! *@exception ScoringConfigurationException Description of the
* Exception
! *@throws ScoringConfigurationException if unable to calculate
* scores
*/
***************
*** 88,92 ****
* Getter for property events.
*
! *@return Value of property events.
*/
public Events getEvents() {
--- 86,90 ----
* Getter for property events.
*
! *@return Value of property events.
*/
public Events getEvents() {
***************
*** 99,103 ****
* Setter for property events.
*
! *@param events New value of property events.
*/
public void setEvents(Events events) {
--- 97,101 ----
* Setter for property events.
*
! *@param events New value of property events.
*/
public void setEvents(Events events) {
***************
*** 109,113 ****
* Getter for property conf.
*
! *@return Value of property conf.
*/
public ScoringConfiguration getConfiguration() {
--- 107,111 ----
* Getter for property conf.
*
! *@return Value of property conf.
*/
public ScoringConfiguration getConfiguration() {
***************
*** 120,124 ****
* Setter for property conf.
*
! *@param conf New value of property conf.
*/
public void setConfiguration(ScoringConfiguration conf) {
--- 118,122 ----
* Setter for property conf.
*
! *@param conf New value of property conf.
*/
public void setConfiguration(ScoringConfiguration conf) {
***************
*** 130,148 ****
* Calculate the scores.
*
! *@return DOM document representing
! * the scores
! *@throws ScoringConfigurationException if unalb to calculate
* scores
*/
public Document calculate()
throws ScoringConfigurationException {
- logger.entering("org.fanfoot.scoring.scores", "calculate()");
Document doc = null;
try {
- logger.finest(
- "Events document root element is named "
- + getEvents().toXMLDoc().getDocumentElement().getNodeName());
doc = XMLUtils.transform(getEvents().toXMLDoc(),
getConfiguration().getXSL());
--- 128,141 ----
* Calculate the scores.
*
! *@return DOM document representing the scores
! *@throws ScoringConfigurationException if unalb to calculate
* scores
*/
public Document calculate()
throws ScoringConfigurationException {
Document doc = null;
try {
doc = XMLUtils.transform(getEvents().toXMLDoc(),
getConfiguration().getXSL());
***************
*** 154,161 ****
setScoresDocument(doc);
- logger.finest(
- "Scores document root element is named "
- + getScoresDocument().getDocumentElement().getNodeName());
- logger.exiting("org.fanfoot.scoring.scores", "calculate()");
return doc;
--- 147,150 ----
***************
*** 166,170 ****
* Getter for property scoresDocument.
*
! *@return Value of property scoresDocument.
*/
public Document getScoresDocument() {
--- 155,159 ----
* Getter for property scoresDocument.
*
! *@return Value of property scoresDocument.
*/
public Document getScoresDocument() {
***************
*** 177,181 ****
* Setter for property scoresDocument.
*
! *@param scoresDocument New value of property scoresDocument.
*/
public void setScoresDocument(Document scoresDocument) {
--- 166,170 ----
* Setter for property scoresDocument.
*
! *@param scoresDocument New value of property scoresDocument.
*/
public void setScoresDocument(Document scoresDocument) {
|
|
From: <rga...@us...> - 2002-11-01 22:06:06
|
Update of /cvsroot/csms/csms-core/src/java/org/fanfoot/gui
In directory usw-pr-cvs1:/tmp/cvs-serv3847
Modified Files:
ControlCentre.java
Log Message:
Added additional feedback to user (via log) and changed order panes are displayed. This gives less "dead" time whilst calculating scores
Index: ControlCentre.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/java/org/fanfoot/gui/ControlCentre.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ControlCentre.java 31 Oct 2002 21:11:25 -0000 1.7
--- ControlCentre.java 1 Nov 2002 22:06:02 -0000 1.8
***************
*** 382,397 ****
*/
private void generateScores(URL url) {
! Events evts;
! // the events parsed from the file
- /*
- * FIXME: currently we download the URL twice,
- * once to display in the Browser and once in the EventParser
- */
org.saafe.utils.BrowserControl.displayURL(url);
try {
eventParser.loadConfiguration(strDefaultEventConfigFile);
! logger.info("Loaded Event Config file: " + strDefaultEventConfigFile);
} catch(EventParserConfigurationException epc) {
logger.severe("Cannot load parser config file");
--- 382,393 ----
*/
private void generateScores(URL url) {
! Events evts;// the events parsed from the file
org.saafe.utils.BrowserControl.displayURL(url);
try {
+ logger.info("Atempting to load Event config file at: " + strDefaultEventConfigFile);
eventParser.loadConfiguration(strDefaultEventConfigFile);
! logger.info("Loaded Event Config file.");
} catch(EventParserConfigurationException epc) {
logger.severe("Cannot load parser config file");
***************
*** 401,404 ****
--- 397,401 ----
try {
//FIXME the type of file should be user selectable
+ logger.info("Starting to parse file of type: " + strBBCType);
evts = eventParser.parse(url, strBBCType);
logger.info("Parsed events from file at: " + url.toString());
***************
*** 447,463 ****
*/
private void populateEventTables(Events evts) {
!
! logger.entering("org.fanfoot.gui", "populateEventTables(evts)");
tabpneEvents.removeAll();
! addSummaryPane();
! addEventsPane(evts);
addScoresPane(evts);
summaryPane.setText(createScoreSummary());
- addEventPanes(evts);
this.pack();
-
- logger.exiting("org.fanfoot.gui", "populateEventTables(evts)");
}
--- 444,456 ----
*/
private void populateEventTables(Events evts) {
! logger.info("Populating GUI with Event info");
tabpneEvents.removeAll();
! addEventPanes(evts);
addScoresPane(evts);
+ addSummaryPane();
summaryPane.setText(createScoreSummary());
this.pack();
}
***************
*** 567,571 ****
summaryPane.setContentType("text/html");
scrPane.setViewportView(summaryPane);
! tabpneEvents.add("Summary", scrPane);
}
--- 560,564 ----
summaryPane.setContentType("text/html");
scrPane.setViewportView(summaryPane);
! tabpneEvents.insertTab("Summary", null, scrPane, "Human readable scores summary", 0);
}
***************
*** 582,586 ****
xmlTree.setDocument(evts.toXMLDoc());
scrPane.setViewportView(xmlTree);
! tabpneEvents.add("Events", scrPane);
} catch(ParserConfigurationException pce) {
// FIXME Tell the user of this error
--- 575,579 ----
xmlTree.setDocument(evts.toXMLDoc());
scrPane.setViewportView(xmlTree);
! tabpneEvents.insertTab("Events", null, scrPane, "XML representation of events", 0);
} catch(ParserConfigurationException pce) {
// FIXME Tell the user of this error
***************
*** 599,603 ****
--- 592,598 ----
try {
+ logger.info("Starting to calculate scores.");
scores = new Scores(evts, scoringConfig);
+ logger.info("Finished calculating scores.");
} catch(ScoringConfigurationException sce) {
logger.log(Level.WARNING, "Unable to calculate scores", sce);
***************
*** 607,611 ****
xmlTree.setDocument(scores.getScoresDocument());
scrPane.setViewportView(xmlTree);
! tabpneEvents.add("Scores", scrPane);
}
--- 602,606 ----
xmlTree.setDocument(scores.getScoresDocument());
scrPane.setViewportView(xmlTree);
! tabpneEvents.insertTab("Scores", null, scrPane, "XML representation of scores", 0);
}
|
|
From: <rga...@us...> - 2002-11-01 22:05:49
|
Update of /cvsroot/csms/csms-core
In directory usw-pr-cvs1:/tmp/cvs-serv3667
Modified Files:
status.xml
Log Message:
Added additional feedback to user (via log) and changed order panes are displayed. This gives less "dead" time whilst calculating scores
Index: status.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/status.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** status.xml 31 Oct 2002 21:11:04 -0000 1.7
--- status.xml 1 Nov 2002 22:05:44 -0000 1.8
***************
*** 27,30 ****
--- 27,35 ----
the creation of a web based interface to the system. The first part of which
is the Auot Scoring facilites found inthe previous release.</description>
+ <action dev="rdg" type="update">
+ Added additional feedback via the log when calculating score and made
+ information panes appear in the GUI in a different order. This is so
+ the system doesn't look "dead" whilst calculating.
+ </action>
<action dev="rdg" type="bugfix" id="630866">
Fixed bug preventing local files being loaded into the browser on Windows.
|
|
From: <rga...@us...> - 2002-11-01 16:40:13
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv28205
Modified Files:
footballEvents.xml
Log Message:
Prevented duplicate assists being registered
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** footballEvents.xml 1 Nov 2002 12:34:01 -0000 1.3
--- footballEvents.xml 1 Nov 2002 16:40:06 -0000 1.4
***************
*** 79,82 ****
--- 79,89 ----
<event type="assist">
+ <duplicateDetection>
+ <part name="normalTimeMinutes"/>
+ <part name="normalTimeSeconds"/>
+ <part name="injuryTimeMinutes"/>
+ <part name="injuryTimeSeconds"/>
+ <part name="player"/>
+ </duplicateDetection>
<pattern>
<sourceType>BBC Text Commentary</sourceType>
|
|
From: <rga...@us...> - 2002-11-01 12:34:04
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv6681
Modified Files:
footballEvents.xml
Log Message:
Fixed bug resulting in incorrect entries for bookings (bug #629121)
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** footballEvents.xml 31 Oct 2002 23:27:47 -0000 1.2
--- footballEvents.xml 1 Nov 2002 12:34:01 -0000 1.3
***************
*** 131,135 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
<unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
--- 131,135 ----
<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>
***************
*** 148,153 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
<unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
--- 148,153 ----
<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>
***************
*** 166,172 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
! <unwantedPart>[^\.]*\.\s*</unwantedPart>
<part name="player">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>
<unwantedPart>[^)]*\)\s*[Bb]ooked\sfor\s</unwantedPart>
--- 166,172 ----
<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>
|
|
From: <rga...@us...> - 2002-10-31 23:27:54
|
Update of /cvsroot/csms/csms-core/src/resources/conf
In directory usw-pr-cvs1:/tmp/cvs-serv26360
Modified Files:
footballEvents.xml
Log Message:
Ensuring substitutions that are not in the first line of the commentaty are n detected (see bug 629930)
Index: footballEvents.xml
===================================================================
RCS file: /cvsroot/csms/csms-core/src/resources/conf/footballEvents.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** footballEvents.xml 28 Oct 2002 13:54:22 -0000 1.1
--- footballEvents.xml 31 Oct 2002 23:27:47 -0000 1.2
***************
*** 203,207 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s\(\)\.,\-]*[Ss]ubstitution\s?:\s?</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
--- 203,207 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s?</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
***************
*** 223,229 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s\(\)\.,\-]*[Ss]ubstitution\s?:\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s\(\)\.,\-]*[Ss]ubstitution\s?:\s</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
--- 223,230 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s?</unwantedPart>
!
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
***************
*** 245,252 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
!
! <unwantedPart>[a-zA-Z]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
--- 246,253 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9\s\(\)\.,\-]*[Ss]ubstitution\s?:\s</unwantedPart>
!
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
***************
*** 268,281 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
! <unwantedPart>replaced\sby\s</unwantedPart>
! <part name="playerOn">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>]
! <unwantedPart>\s?\(\s?</unwantedPart>
! <part name="reason">[a-zA-Z\s]*</part>
<unwantedPart>\s?\)</unwantedPart>
</pattern>
--- 269,284 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
!
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <part
! name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
! <unwantedPart>replaced\sby\s</unwantedPart> <part
! name="playerOn">(?:(?:[Mac|Mc|A-Z][A-Za-z']*\s)(?!\))){1,3}</part>]
! <unwantedPart>\s?\(\s?</unwantedPart> <part
! name="reason">[a-zA-Z\s]*</part>
<unwantedPart>\s?\)</unwantedPart>
</pattern>
***************
*** 292,301 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
--- 295,305 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
!
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
***************
*** 317,327 ****
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
! <unwantedPart>[a-zA-Z\s]*:[a-zA-Z\s]*\([a-zA-Z\)]*\.\s?</unwantedPart>
!
! <unwantedPart>[a-zA-Z]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
--- 321,331 ----
<part name="injuryTimeSeconds">\d?\d?</part>
<unwantedPart>\)?</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
! <unwantedPart>[a-zA-Z0-9]+\s?[a-zA-Z]*\s?[Ss]ubstitution\s?:\s</unwantedPart>
!
<part name="playerOff">(?:(?:[Mac|Mc|A-Z][a-z]*\s)){1,3}</part>
<unwantedPart>replaced\sby\s</unwantedPart>
|
