sportdb-parser 0.6.20 → 0.7.0

data/lib/sportdb/parser/racc_parser.rb

@@ -30,7 +30,7 @@ def initialize( txt,  debug: false )
   end
 
 
-  def debug( value ) @debug = value; end
+  def debug( value ) @debug = value; end   ### fix: use setter-style e.g. debug=(value) !!!
   def debug?()  @debug == true; end
 
   ## debug - trace / print message

data/lib/sportdb/parser/racc_tree.rb

@@ -4,6 +4,7 @@
 
 class RaccMatchParser
 
+=begin
 RefereeLine = Struct.new( :name, :country ) do 
   def pretty_print( printer )
     printer.text( "<RefereeLine " )
@@ -12,6 +13,29 @@ RefereeLine = Struct.new( :name, :country ) do
     printer.text( ">" )
   end
 end
+=end
+
+## support multiple referees (incl. assistant refs etc.)
+RefereeLine = Struct.new( :referees ) do 
+  def pretty_print( printer )
+    printer.text( "<RefereeLine " )
+    printer.text( self.referees.pretty_inspect )
+    printer.text( ">" )
+  end
+end
+
+Referee = Struct.new( :name, :country ) do
+  def to_s
+    buf = String.new
+    buf <<  self.name
+    buf << " (#{self.country})"    if self.country 
+    buf
+  end
+
+  def pretty_print( printer )
+    printer.text( to_s )
+  end  
+end
 
 AttendanceLine = Struct.new( :att ) do 
   def pretty_print( printer )
@@ -29,15 +53,17 @@ PenaltiesLine = Struct.new( :penalties ) do
   end
 end
 
+
 Penalty = Struct.new( :name, :score, :note ) do
   def to_s
     buf = String.new
-    buf << "#{self.score} "   if self.score
+    buf << "#{self.score[0]}-#{self.score[1]} "   if self.score
     buf <<  self.name
     buf << " (#{self.note})"    if self.note 
     buf
   end
 
+
   def pretty_print( printer )
     printer.text( to_s )
   end  
@@ -82,11 +108,12 @@ LineupLine = Struct.new( :team, :lineup, :coach ) do
 end
 
 
-Lineup     = Struct.new( :name, :card, :sub ) do
+Lineup     = Struct.new( :name, :captain, :cards, :sub ) do
   def pretty_print( printer )
     buf = String.new
     buf <<  self.name 
-    buf << " card=" + self.card.pretty_inspect    if card
+    buf << " [c]"   if captain
+    buf << " cards=" + self.cards.pretty_inspect    if cards
     buf << " sub=" + self.sub.pretty_inspect      if sub
     printer.text( buf ) 
   end
@@ -134,54 +161,171 @@ RoundDef   = Struct.new( :name, :date, :duration )  do
   def pretty_print( printer )
     printer.text( "<RoundDef " )
     printer.text( self.name )
-    printer.text( " date=" + self.date.pretty_inspect ) if date
-    printer.text( " duration=" + self.duration.pretty_inspect ) if duration
+    printer.text( " date=" + self.date.pretty_inspect ) if self.date
+    printer.text( " duration=" + self.duration.pretty_inspect ) if self.duration
     printer.text( ">" )
   end
 end
 
-DateHeader = Struct.new( :date, :time, :geo, :timezone ) do
+DateHeader = Struct.new( :date, :year ) do
   def pretty_print( printer )
     printer.text( "<DateHeader " )
-    printer.text( "#{self.date.pretty_inspect}" )
-    printer.text( " time=#{self.time.pretty_inspect}" )          if self.time
-    printer.text( " geo=#{self.geo.pretty_inspect}" )            if self.geo
-    printer.text( " timezone=#{self.timezone}")             if self.timezone
+    printer.text( "#{self.date.pretty_inspect}" )  if self.date
+    printer.text( "#{self.year.pretty_inspect}" )  if self.year
+    printer.text( ">")
+  end
+end
+
+DateHeaderLegs = Struct.new( :date1, :date2 ) do
+  def pretty_print( printer )
+    printer.text( "<DateHeaderLegs " )
+    printer.text( "leg1=#{self.date1.pretty_inspect}" )
+    printer.text( " leg2=#{self.date2.pretty_inspect}" )
     printer.text( ">")
   end
 end
 
-GroupHeader = Struct.new( :name ) do
+
+
+RoundOutline = Struct.new( :outline, :level ) do
   def pretty_print( printer )
-    printer.text( "<GroupHeader " )
-    printer.text( "#{self.name}>" )
+    printer.text( "<RoundOutline #{self.outline}, level=#{self.level}>" )
   end
 end
 
-RoundHeader = Struct.new( :names, :group ) do
+
+
+class BlankLine
   def pretty_print( printer )
-    printer.text( "<RoundHeader " )
-    printer.text( "#{self.names.join(', ')}" )
-    printer.text( " group=#{self.group}")    if self.group
-    printer.text( ">" )
+    printer.text( "<BlankLine>" )
+  end
+end
+
+## todo/check - find a better name for hruler - divider?  or ??? - why? why not?
+class HRuler   ## h(orizontal) ruler (for breaks; new scopes) 
+  def pretty_print( printer )
+    printer.text( "<HRuler>" )
+  end
+end
+
+
+
+NoteLine = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<NoteLine #{self.text}>" )
+  end
+end
+
+NotaBene = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<NotaBene #{self.text}>" )
+  end
+end
+
+
+##  todo/check - rename TableHeading to TableHeader - why? why not?
+TableHeading = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<TableHeading #{self.text}>" )
+  end
+end
+
+##  todo/check - rename TableDivider to TableRule/TableRuler/TableLine - why? why not?
+TableDivider = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<TableDivider #{self.text}>" )
+  end
+end
+
+TableLine = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<TableLine #{self.text}>" )
+  end
+end
+
+TableNote = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<TableNote #{self.text}>" )
+  end
+end
+
+
+
+## todo/check - use a generic Heading instead of Heading1/2/3 - why? why not?
+Heading1 = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<Heading1 #{self.text}>" )
   end
 end
 
+Heading2 = Struct.new( :text ) do
+  def pretty_print( printer )
+    printer.text( "<Heading2 #{self.text}>" )
+  end
+end
 
-RoundOutline = Struct.new( :outline ) do
+Heading3 = Struct.new( :text ) do
   def pretty_print( printer )
-    printer.text( "<RoundOutline #{self.outline}>" )
+    printer.text( "<Heading3 #{self.text}>" )
   end
 end
 
 
-MatchLine   = Struct.new( :ord, :date, :time, :wday,
+
+MatchLineBye   = Struct.new( :team, :note ) do
+  def pretty_print( printer )
+    printer.text( "<MatchLineBye " )
+    printer.text( "#{self.team} bye")
+    printer.text( " note=#{self.note.pretty_inspect}" )  if self.note
+    printer.text( ">" )
+  end  
+end
+
+MatchLineWalkover   = Struct.new( :team1, :team2, :note ) do
+  def pretty_print( printer )
+    printer.text( "<MatchLineWalkover " )
+    printer.text( "#{self.team1} w/o #{self.team2}")
+    printer.text( " note=#{self.note.pretty_inspect}" )  if self.note
+    printer.text( ">" )
+  end  
+end
+
+MatchLineLegs   = Struct.new( :team1, :team2, 
+                              :score )  do   ## change to geos - why? why not?
+  def pretty_print( printer )
+    printer.text( "<MatchLineLegs " )
+    printer.text( "#{self.team1} v #{self.team2}")
+    printer.breakable
+
+    members.zip(values) do |name, value|
+      next if [:team1, :team2].include?( name )
+      next if value.nil?
+      
+      printer.text( "#{name}=#{value.pretty_inspect}" )
+    end    
+
+    printer.text( ">" )
+  end  
+end
+
+
+#
+#  note: use two status attributes for now
+#         1) inline_status and 2) (note_)status
+#              for now  e.g.  A abd. B     vs   A  v B [abadoned] 
+#                             A 3-0 awd B  vs   A  3-0 B [awarded]
+#   note - BOTH might be present at the same time
+
+
+MatchLine   = Struct.new( :header,  :tty,   ## tty = TELETYPE MODE for teams and score!!
+                          :num, :date, :time, :time_local, :year,
                           :team1, :team2, 
-                          :score, :score_note,
-                          :status,  
+                          :score,
+                          :status,  :status_inline, :status_note,
                           :geo,
-                          :timezone,
-                          :note )  do   ## change to geos - why? why not?
+                          :neutral,  ## true/false - NOT -home/away - neutral ground
+                          :note,
+                          :att )  do   ## change to geos - why? why not?
 
   def pretty_print( printer )
     printer.text( "<MatchLine " )
@@ -200,6 +344,59 @@ MatchLine   = Struct.new( :ord, :date, :time, :wday,
 
 end
 
+
+GoalLine    = Struct.new( :goals1, :goals2 ) do
+  def pretty_print( printer )
+    printer.text( "<GoalLine " )
+    printer.text( "goals1=" + self.goals1.pretty_inspect + "," )
+    printer.breakable
+    printer.text( "goals2=" + self.goals2.pretty_inspect + ">" )
+  end  
+
+##  def clone
+##         _clone = GoalLine.new( goals1: goals1.clone, 
+##                           goals2: goals2.clone )
+##                  
+##         puts "[debug] clone #{self.pretty_inspect} => #{_clone.pretty_inspect}"
+##
+##         _clone
+##  end
+end
+
+
+###
+##  change/rename Goal to GoalScorer  - why? why not?
+
+Goal        = Struct.new( :player, :minutes, :count ) do
+  def to_s
+    buf = String.new
+    buf << "#{self.player}"
+    if count
+       buf << (" " + count.pretty_inspect + ",")
+    else
+      if minutes.nil? || minutes.empty?
+        ## add nothing if no minutes available/present
+      else
+        buf << " "
+        buf << minutes.map { |min| min.to_s }.join(' ')
+      end
+    end
+    buf
+  end
+
+  def pretty_print( printer )
+    printer.text( to_s )
+  end  
+
+##  def clone
+##      puts "[debug] clone #{self.pretty_inspect}"
+##      Goal.new( player: player.clone,
+##                minutes: minutes.clone,
+##                count: count.clone )
+##  end
+end
+
+
 ## check - use a different name e.g. GoalLineScore or such - why? why not?
 GoalLineAlt = Struct.new( :goals ) do
   def pretty_print( printer )
@@ -208,12 +405,19 @@ GoalLineAlt = Struct.new( :goals ) do
   end  
 end
 
-GoalAlt   = Struct.new( :score, :player, :minute ) do
+
+##
+##   score and player REQUIRED
+##   note - (goal) minute is optional
+##          if no minute goal type is optional e.g. "standalone" (p), (og), etc.
+
+GoalAlt   = Struct.new( :score, :player, :minute, :goal_type ) do
   def to_s
     buf = String.new
-    buf << "#{score} "
-    buf << "#{self.player}"
-    buf << " #{self.minute}"  if self.minute
+    buf << "#{self.score[0]}-#{self.score[1]}"
+    buf << " #{self.player}"
+    buf << " #{self.minute}"     if self.minute
+    buf << " #{self.goal_type}"  if self.goal_type
     buf
   end
 
@@ -224,42 +428,124 @@ end
 
 
 
-GoalLine    = Struct.new( :goals1, :goals2 ) do
+GoalLineCompat = Struct.new( :goals ) do
   def pretty_print( printer )
-    printer.text( "<GoalLine " )
-    printer.text( "goals1=" + self.goals1.pretty_inspect + "," )
-    printer.breakable
-    printer.text( "goals2=" + self.goals2.pretty_inspect + ">" )
+    printer.text( "<GoalLineCompat " )
+    printer.text( "goals=" + self.goals.pretty_inspect + ">" )
   end  
 end
 
-Goal        = Struct.new( :player, :minutes ) do
+##
+##   minute and player REQUIRED
+##   note - score (e.g. 1-1) is optional
+##          goal type is optional e.g. "standalone" (p), (og), etc.
+
+GoalCompat    = Struct.new( :score, :player, :minute, :goal_type ) do
   def to_s
     buf = String.new
-    buf << "#{self.player}"
-    buf << " "
-    buf << minutes.map { |min| min.to_s }.join(' ')
+    buf << "#{self.minute}"    
+    buf << " #{self.player}"
+    buf << " #{self.goal_type}"                  if self.goal_type
+    buf << " #{self.score[0]}-#{self.score[1]}"  if self.score
     buf
   end
 
   def pretty_print( printer )
     printer.text( to_s )
   end  
-
 end
 
 
+
+##   FIX/FIX/FIX
+##   split into Minute and
+##             GoalMinute  (Minute+GoalType)
 ##
 ##  fix - move :og, :pen  to Goal if possible - why? why not?
 ##  or change to GoalMinute ???
-Minute      = Struct.new( :m, :offset, :og, :pen )  do
+##
+##  fix!!! split into GoalMinute and Minute
+##            goal_minute incl. :og, :pen, :freekick, :header,
+##                     seconds etc.
+##
+##  GoalMinute = Minute + GoalType !!!
+
+GoalMinute      = Struct.new( :m, :offset, :secs,
+                             :og, :pen, :header, :freekick,
+                         )  do
     def to_s
       buf = String.new
       buf << "#{self.m}"
-      buf << "+#{self.offset}"  if self.offset 
       buf << "'"
+      buf << "+#{self.offset}"  if self.offset 
+      buf << " (og)"   if self.og
+      buf << " (pen)"  if self.pen
+      buf << " (f)"  if self.freekick
+      buf << " (h)"  if self.header
+      buf << " (#{self.secs} secs)"   if self.secs
+      buf
+    end
+ 
+    def pretty_print( printer ) 
+       printer.text( to_s ) 
+    end  
+
+    ### quick hack:
+    ### split struct into  Minute+GoalType structs
+    def to_minute
+        Minute.new( m:      self.m, 
+                    offset: self.offset,
+                    secs:   self.secs )
+    end
+
+    def to_goal_type
+        if self.og || self.pen || self.header || self.freekick   
+          GoalType.new( og:       self.og, 
+                        pen:      self.pen, 
+                        header:   self.header,
+                        freekick: self.freekick )
+        else
+           nil   ## note - return nil; if no goal type present!!
+        end
+    end
+
+##    def clone
+##        puts "[debug] clone #{self.pretty_inspect}"
+##        GoalMinute.new( m: m.clone, 
+##                        offset: offset.clone, 
+##                        secs: secs.clone,
+##                        og: og.clone, 
+##                        pen: pen.clone, 
+##                        header: header.clone, 
+##                        freekick: freekick.clone )
+##                 
+##    end
+end
+
+
+GoalType  = Struct.new( :og, :pen, :header, :freekick )  do
+    def to_s
+      buf = String.new
       buf << "(og)"   if self.og
       buf << "(pen)"  if self.pen
+      buf << "(f)"    if self.freekick
+      buf << "(h)"    if self.header
+      buf
+    end
+ 
+    def pretty_print( printer ) 
+       printer.text( to_s ) 
+    end  
+end
+
+
+Minute      = Struct.new( :m, :offset, :secs )  do
+    def to_s
+      buf = String.new
+      buf << "#{self.m}"
+      buf << "'"
+      buf << "+#{self.offset}"      if self.offset 
+      buf << "/#{self.secs} secs"   if self.secs
       buf
     end