Pick old results from fotballresultater_2123.

diff --git a/sync.pl b/sync.pl
index 178866de7d438812b473d25c59ba5773c574b54a..d57af449979c05672fc658b0c930e7e28cf744ef 100755 (executable)
--- a/sync.pl
+++ b/sync.pl
@@ -53,6 +53,7 @@ $sdbh->{RaiseError} = 1;
 sync_table($mdbh, $sdbh, "Fotballbrukere");
 sync_table($mdbh, $sdbh, "Fotballdeltagere");
 sync_table($mdbh, $sdbh, "Fotballresultater");
+sync_table($mdbh, $sdbh, "Fotballresultater_2123");
 sync_table($mdbh, $sdbh, "Fotballserier");
 
 # Just for backup.

diff --git a/train.pl b/train.pl
index 19d9271455a509d7392ae70e1342bf4e4382c7f3..aaafde473c6b84f3cd7b3855057c5b6baf21b748 100755 (executable)
--- a/train.pl
+++ b/train.pl
@@ -19,7 +19,7 @@ sub fetch_games {
 SELECT
   deltager1.id as p1, deltager2.id as p2, maalfor, maalmot, least(pow(2.0, (sesong - ? + 3) / 3.0), 1.0) AS vekt
 FROM
-  Fotballresultater resultater
+  ( SELECT * FROM fotballresultater UNION ALL SELECT * FROM fotballresultater_2123 ) resultater
   JOIN Fotballdeltagere deltager1 ON resultater.Lagrecno=deltager1.Nr AND resultater.Serie=deltager1.Serie
   JOIN Fotballdeltagere deltager2 ON resultater.Motstander=deltager2.Nr AND resultater.Serie=deltager2.Serie
   JOIN Fotballserier serier ON resultater.Serie=serier.Nr

diff --git a/www/index.pl b/www/index.pl
index 9bf692ce288ef7f0461f82d4d5e69edfe3d9f7d4..a039cea1cf9831a66782b1916c42f9780abe25f4 100755 (executable)
--- a/www/index.pl
+++ b/www/index.pl
@@ -135,7 +135,7 @@ sub get_matches {
        my $q = $dbh->prepare('
        SELECT
          d1.id AS p1, d2.id AS p2, maalfor AS score1, maalmot AS score2
-       FROM fotballresultater r
+       FROM ( SELECT * FROM fotballresultater UNION ALL SELECT * FROM fotballresultater_2123 ) r
          JOIN fotballserier s ON r.serie=s.nr
           JOIN fotballspraak sp ON s.spraak=sp.id
          JOIN fotballdeltagere d1 ON r.lagrecno=d1.nr AND r.serie=d1.serie