Index: mythplugins/mythweb/program_detail.php
===================================================================
--- mythplugins/mythweb/program_detail.php	(revision 6740)
+++ mythplugins/mythweb/program_detail.php	(working copy)
@@ -44,6 +44,23 @@
         exit;
     }
 
+// The user tried to update the recommendation settings - update the database and the variable in memory
+    
+    if (isset($_POST['recommendation_save'])) {
+        if ($_POST['recommend']){
+            //REPLACE
+            save_recommendout($_GET['chanid'], $_GET['starttime'], "", $_POST['recommendation_text']);
+            }
+        else {
+            //DELETE
+            delete_recommendout($_GET['chanid'], $_GET['starttime']);
+            
+            
+            
+            }
+    }
+    
+
 // If there is a program for this, import its values into the schedule
     if ($program) {
         $schedule->chanid      = $program->chanid;
@@ -135,6 +152,12 @@
     else
         $channel =& load_one_channel($schedule->chanid);
 
+// Load the recommendation
+    if ($program)
+        $recommendout = fetch_recommendout($program->chanid, $program->starttime);
+    else
+        $recommendout = NULL;
+
 // Load the class for this page
     require_once theme_dir.'program_detail.php';
 
@@ -142,7 +165,7 @@
     $Page = new Theme_program_detail();
 
 // Display the page
-    $Page->print_page($program, $schedule, $channel);
+    $Page->print_page($program, $schedule, $channel, $recommendout);
 
 // Exit
     exit;
Index: mythplugins/mythweb/themes/Default/channel_detail.php
===================================================================
--- mythplugins/mythweb/themes/Default/channel_detail.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/channel_detail.php	(working copy)
@@ -18,7 +18,7 @@
 <table align="center" width="90%" cellspacing="2" cellpadding="2">
 <tr>
 <?php   if (show_channel_icons && is_file($this_channel->icon)) { ?>
-    <td align="right"><img src="<?php echo $this_channel->icon?>" height="30" width="30"></td>
+    <td align="right"><img src="<?php echo $this_channel->icon?>" height="50" width="50"></td>
 <?      } ?>
     <td width="66%" valign="center" class="huge">
         Channel <?php echo $this_channel->channum?>:  <?php echo $this_channel->callsign ?> on <?php echo strftime('%B %e, %Y', $_SESSION['list_time'])?></td>
@@ -55,7 +55,7 @@
     <td><a href="scheduled_recordings.php?sortby=airdate"><?php echo t('Time') ?></a></td>
     <td><a href="scheduled_recordings.php?sortby=title"><?php echo t('Show') ?></a></td>
     <td><?php echo t('Episode') ?></td>
-    <td><?php t('Description') ?></td>
+    <td><?php echo t('Description') ?></td>
     <td><a href="scheduled_recordings.php?sortby=length"><?php echo t('Length') ?></a></td>
 </tr><?php
 
@@ -90,7 +90,20 @@
              .$show->title.$additional.'</a>';
         ?></td>
     <td><?php echo $show->subtitle ?></td>
-    <td><?php echo $show->description ?></td>
+    <td><?php echo $show->description ;
+	if ($show->recommendations)
+        foreach ($show->recommendations as $recommendation) {
+                if ($recommendation->source->icon) {
+                    echo "<br><img src=\"". $recommendation->source->icon . "\" height=\"40\"><br>";
+                }
+                else {
+                    echo "<br>*" . $recommendation->source->name . "*<br>";
+                }
+                echo $recommendation->description ;
+                if ($recommendation->icon) echo "<br><img src=\"". $recommendation->icon . "\" ><br>";
+                
+        }
+    ?></td>
     <td nowrap><?php echo nice_length($show->length)?></td>
 </tr><?php
             $row++;
Index: mythplugins/mythweb/themes/Default/program_detail.css
===================================================================
--- mythplugins/mythweb/themes/Default/program_detail.css	(revision 6740)
+++ mythplugins/mythweb/themes/Default/program_detail.css	(working copy)
@@ -49,10 +49,10 @@
 
 #program_details {
 }
-#program_details dl, #program_extra_details dl {
+#program_details dl, #program_extra_details dl, #program_recommendation_details dl {
     margin: 5px 0px;
 }
-#program_details dl dt, #program_extra_details dl dt {
+#program_details dl dt, #program_extra_details dl dt, #program_recommendation_details dl dt {
     clear:       left;
     float:       left;
     width:       8em;
@@ -61,12 +61,12 @@
     color:       #ffe;
     white-space: nowrap;
 }
-#program_details dl dd, #program_extra_details dl dd {
+#program_details dl dd, #program_extra_details dl dd, #program_recommendation_details dl dd {
     padding-top: 3px;
     margin-left: 8.5em;
 }
 
-#program_extra_details {
+#program_extra_details, #program_recommendation_details {
 }
 
 #local_links {
Index: mythplugins/mythweb/themes/Default/program_listing.php
===================================================================
--- mythplugins/mythweb/themes/Default/program_listing.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/program_listing.php	(working copy)
@@ -159,7 +159,7 @@
                 if (is_file($channel->icon)) {
                     ?><a href="channel_detail.php?chanid=<?php echo $channel->chanid?>&time=<?php echo $start_time?>"
                         onmouseover="return wstatus('Details for: <?php echo preg_replace("/([\"'])/", '\\$1', $channel->channum.' '.$channel->callsign) ?>')"
-                        onmouseout="return wstatus('')"><img src="<?php echo $channel->icon?>" height="30" width="30"></a><?php
+                        onmouseout="return wstatus('')"><img src="<?php echo $channel->icon?>" height="50" width="50"></a><?php
                 } else {
                     echo '&nbsp;';
                 }?></td>
@@ -259,7 +259,37 @@
             $parens = "<i>Rerun</i>";
         if ($parens)
             echo "<BR>($parens)";
+            
+        if ($program->recommendations){
+            echo "<BR>";
+            
+            foreach ($program->recommendations as $recommendation) {
+                if (show_popup_info) {
+                    static $recommendation_id_counter = 0;
+                    $recommendation_id_counter++;
+                }
+                echo '<a';
+                if (show_popup_info)
+                    echo show_popup("recommendation_$recommendation_id_counter", $recommendation->details_list(), NULL, 'popup', $wstatus);
+                else
+                    echo " onmouseover=\"wstatus('".str_replace('\'', '\\\'', $wstatus)."');return true\" onmouseout=\"wstatus('');return true\"";
+                echo ' href="program_detail.php?chanid='.$program->chanid.'&starttime='.$program->starttime.'">';
+                
+                if ($recommendation->source->icon) {
+                echo "<img src=" . $recommendation->source->icon . " height=\"10\" >";
+                }
+                else {
+                echo $recommendation->source->name;
+                }
+                echo '</a> ';
 
+                
+            }
+            
+        }
+        
+
+
     ?></td>
 <?php
     }
Index: mythplugins/mythweb/themes/Default/recorded_programs.php
===================================================================
--- mythplugins/mythweb/themes/Default/recorded_programs.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/recorded_programs.php	(working copy)
@@ -14,7 +14,7 @@
     // Print the main page header
         parent::print_header("MythWeb - Recorded Programs");
     // Print the page contents
-        global $All_Shows, $Total_Time;
+        global $All_Shows, $Total_Time, $Total_Size;
 ?>
 
 <script language="JavaScript" type="text/javascript">
@@ -205,9 +205,10 @@
 <?php
     echo '<p align="right" style="padding-right: 75px">'
         .t('$1 programs, using $2 ($3) out of $4.', t($GLOBALS['Total_Programs']),
-                                                    nice_filesize(disk_used),
+                                                    nice_filesize($Total_Size),
                                                     nice_length($Total_Time),
                                                     nice_filesize(disk_size))
+        .' with ' .nice_filesize(disk_size-disk_used) .' free'
         .'</p>';
 
     // Print the main page footer
Index: mythplugins/mythweb/themes/Default/search.php
===================================================================
--- mythplugins/mythweb/themes/Default/search.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/search.php	(working copy)
@@ -24,7 +24,7 @@
             return;
 
     // Print the search name
-        echo '<p class="normal" align="center">'.t('Search for:  $1', $search_name).'</p>';
+        if ($search_name) echo '<p class="normal" align="center">'.t('Search for:  $1', $search_name).'</p>';
 
     // Search, but nothing found - notify the user
         if (empty($results)) {
@@ -106,7 +106,20 @@
              .$show->title . $additional.'</a>';
         ?></td>
     <td><?php echo $show->subtitle?></td>
-    <td><?php echo $show->description?></td>
+    <td><?php echo $show->description ;
+	if ($show->recommendations)
+        foreach ($show->recommendations as $recommendation) {
+                if ($recommendation->source->icon) {
+                    echo "<br><img src=\"". $recommendation->source->icon . "\" height=\"40\"><br>";
+                }
+                else {
+                    echo "<br>*" . $recommendation->source->name . "*<br>";
+                }
+                echo $recommendation->description ;
+                if ($recommendation->icon) echo "<br><img src=\"". $recommendation->icon . "\" ><br>";
+                
+        }
+    ?></td>
     <td><?php echo $show->channel->channum.' - '.$show->channel->name?></td>
     <td nowrap><?php
             echo '<br><a href="program_detail.php?chanid='. $show->chanid.
Index: mythplugins/mythweb/themes/Default/program_detail.php
===================================================================
--- mythplugins/mythweb/themes/Default/program_detail.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/program_detail.php	(working copy)
@@ -9,7 +9,7 @@
 
 class Theme_program_detail extends Theme {
 
-    function print_page(&$program, &$schedule, &$channel) {
+    function print_page(&$program, &$schedule, &$channel, &$recommendout) {
     // Load this page's custom stylesheet
         $this->headers[] = '<link rel="stylesheet" type="text/css" href="'.theme_dir.'program_detail.css" />';
     // Print the main page header
@@ -32,7 +32,7 @@
                         onmouseover="return wstatus('Details for: <?php echo $channel->channum.' '.$channel->callsign?>')"
                         onmouseout="return wstatus('')">
 <?php       if (show_channel_icons === true && is_file($channel->icon)) { ?>
-                    <img src="<?php echo $channel->icon?>" height="30" width="30"></a>
+                    <img src="<?php echo $channel->icon?>" height="50" width="50"></a>
 <?php       } ?>
                     <span class="preferred"><?php echo _or(prefer_channum ? $channel->channum : $channel->callsign, '&nbsp') ?></span><br />
                     <?php echo (prefer_channum ? $channel->callsign : $channel->channum)."\n" ?>
@@ -164,7 +164,29 @@
 <?php           } ?>
             </dl>
         </div>
-<?php   } ?>
+        
+<?php           if ($program->recommendations) {  ?>
+        <div id="program_recommendation_details">
+            <dl>
+<?php           foreach ($program->recommendations as $recommendation) {
+?>              <dt><?php echo t('Source') ?>:&nbsp;</dt> 
+<?php               if ($recommendation->source->icon) { ?>
+                <dd><img src="<?php echo $recommendation->source->icon ?>" height="40" ></dd>
+<?php               }
+                    else { ?>
+                <dd><?php echo $recommendation->source->name ?></dd>
+<?php               } ?>
+                <dt><?php echo t('Description') ?>:&nbsp;</dt>
+                <dd><?php echo nl2br($recommendation->description) ?></dd>
+<?php               if ($recommendation->icon) { ?>
+                <dt><?php echo t('Icon') ?>:&nbsp;</dt> 
+                <dd><img src="<?php echo $recommendation->icon ?>" ></dd>
+<?php               } ?>
+<?php           } ?>
+            </dl>
+        </div>
+<?php           } ?>
+<?php       } ?>
 
         <div id="local_links">
 <?php       if ($_GET['recordid']) { ?>
@@ -359,9 +381,34 @@
         </form>
 
     </div>
+<?php       if ($program) { ?>
 
+    <div id="recording_info" class="command command_border_l command_border_t command_border_b command_border_r clearfix">
+
+        <form name="program_recommendation" method="post" action="program_detail.php?<?php
+                echo 'chanid='.urlencode($_GET['chanid']).'&starttime='.urlencode($_GET['starttime'])
+            ?>">
+            
+        <div id="advanced_options">
+            <h3><?php echo t('Recommend') ?>:</h3>
+            <dl class="clearfix">
+                <dt><? echo t('Recommend') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="recommend"<?php if ($recommendout) echo ' CHECKED' ?> value="1" /></dd>
+            </dl>
+                <textarea name="recommendation_text" cols=45 rows=10><?php echo $recommendout->description ?></textarea>
+            <p align="center">
+                <input type="submit" class="submit" name="recommendation_save" value="<?php echo t('Update Recommendation Settings') ?>">
+            </p>
+
+        </div>
+
+        </form>
+
+    </div>
+<?php  } ?>
     </td>
 
+
 </tr>
 </table>
 
Index: mythplugins/mythweb/themes/Default/theme.php
===================================================================
--- mythplugins/mythweb/themes/Default/theme.php	(revision 6740)
+++ mythplugins/mythweb/themes/Default/theme.php	(working copy)
@@ -103,6 +103,10 @@
                             <input type="checkbox" class="radio" id="search_category_type" name="search_category_type" value="1"<?php echo $_SESSION['search']['search_category_type'] ? ' CHECKED' : '' ?>>
                             <a onclick="get_element('search_category_type').checked=get_element('search_category_type').checked ? false : true;"><?php echo t('Category Type') ?></a>
                         </div>
+                        <div>
+                            <input type="checkbox" class="radio" id="search_recommendation_source" name="search_recommendation_source" value="1"<?php echo $_SESSION['search']['search_recommendation_source'] ? ' CHECKED' : '' ?>>
+                            <a onclick="get_element('search_recommendation_source').checked=get_element('search_recommendation_source').checked ? false : true;"><?php echo t('Recommendation Source') ?></a>
+                        </div>
                     </div>
                     <hr/>
                     <?php echo t('Search options') ?>:<br />
@@ -115,6 +119,10 @@
                             <input type="checkbox" class="radio" id="search_hd" name="search_hd" value="1"<?php echo $_SESSION['search']['search_hd'] ? ' CHECKED' : '' ?>>
                             <a onclick="get_element('search_hd').checked=get_element('search_hd').checked ? false : true;"><?php echo t('HD Only') ?></a>
                         </div>
+                        <div>
+                            <input type="checkbox" class="radio" id="search_recommended" name="search_recommended" value="1"<?php echo $_SESSION['search']['search_recommended'] ? ' CHECKED' : '' ?>>
+                            <a onclick="get_element('search_recommended').checked=get_element('search_recommended').checked ? false : true;"><?php echo t('Recommended Only') ?></a>
+                        </div>
                     </div>
 
                     <hr/>
Index: mythplugins/mythweb/recorded_programs.php
===================================================================
--- mythplugins/mythweb/recorded_programs.php	(revision 6740)
+++ mythplugins/mythweb/recorded_programs.php	(working copy)
@@ -66,6 +66,7 @@
 // Parse the program list
     $recordings     = get_backend_rows('QUERY_RECORDINGS Delete');
     $Total_Time     = 0;
+    $Total_Size     = 0;
     $Total_Programs = 0;
     $All_Shows      = array();
     $Programs       = array();
@@ -83,6 +84,7 @@
                 continue;
         // Keep track of the total time
             $Total_Time += $show->length;
+            $Total_Size += $show->filesize;
         // Skip programs the user doesn't want to look at, but keep track of their names and how many episodes we have recorded
             $Total_Programs++;
             $Program_Titles[$record[0]]++;
Index: mythplugins/mythweb/search.php
===================================================================
--- mythplugins/mythweb/search.php	(revision 6740)
+++ mythplugins/mythweb/search.php	(working copy)
@@ -24,6 +24,7 @@
         $_SESSION['search']['search_description']   = _or($_GET['search_description'],   $_POST['search_description']);
         $_SESSION['search']['search_category']      = _or($_GET['search_category'],      $_POST['search_category']);
         $_SESSION['search']['search_category_type'] = _or($_GET['search_category_type'], $_POST['search_category_type']);
+        $_SESSION['search']['search_recommendation_source'] = _or($_GET['search_recommendation_source'], $_POST['search_recommendation_source']);
     }
 
 
@@ -43,6 +44,8 @@
         $_SESSION['search']['search_exact'] = _or($_GET['search_exact'], $_POST['search_exact']);
     if ($_GET['search_hd'] || $_POST['search_hd'])
         $_SESSION['search']['search_hd'] = _or($_GET['search_hd'], $_POST['search_hd']);
+    if ($_GET['search_recommended'] || $_POST['search_recommended'])
+        $_SESSION['search']['search_recommended'] = _or($_GET['search_recommended'], $_POST['search_recommended']);
 
 // Flags that apply in all cases
     $nodups = _or($_GET['nodups'], $_POST['nodups']);
@@ -59,6 +62,8 @@
 // HDTV only?
     if ($_SESSION['search']['search_hd'])
         $extra_query[] = 'hdtv=1';
+    if ($_SESSION['search']['search_recommended'])
+        $extra_query[] = 'recommendationsource.id'; 
 
 // Canned search query
     if (preg_match('/^\s*canned:\s*(.+)\s*$/', $_SESSION['search']['searchstr'], $search_name)) {
@@ -83,7 +88,7 @@
         $joiner = ' OR ';
     // If it starts with a pair of stars, it's a movie rating query
         if (preg_match('#(\\*+\s*(1/2\b|0?\.5\b|-)?)\s*#', $search_str, $stars)) {
-            $starcount = substr_count($stars[1], '*') / 4.0;
+            $starcount = substr_count($stars[1], '*') / max_stars;
             if (preg_match( "/1\\/2|\\.5|-/", $stars[1]))
                 $starcount += 0.125;
         // Add this to the query -- convert european decimal to something mysql can understand
@@ -109,6 +114,8 @@
             $query[] = "program.category$compare$search";
         if ($_SESSION['search']['search_category_type'])
             $query[] = "program.category_type$compare$search";
+        if ($_SESSION['search']['search_recommendation_source'])
+            $query[] = "recommendationsource.name$compare$search";
     // No query formed - default to quicksearch
         if (!count($query)) {
             $query[] = "program.title$compare$search";
@@ -184,7 +191,7 @@
     $Page = new Theme_search();
 
 // Display the page
-    $Page->print_page($search_name, &$Results);
+    $Page->print_page($search_name, $Results);
 
 // Exit
     exit;
Index: mythplugins/mythweb/config/canned_searches.php
===================================================================
--- mythplugins/mythweb/config/canned_searches.php	(revision 6740)
+++ mythplugins/mythweb/config/canned_searches.php	(working copy)
@@ -29,6 +29,8 @@
     "Science Fiction Movies"
         => "category_type='".movie_word."' AND category='science fiction'",
 
+    "Recommended"
+        => "recommendationsource.id",
     );
 
 ?>
Index: mythplugins/mythweb/config/theme_Default.php
===================================================================
--- mythplugins/mythweb/config/theme_Default.php	(revision 6740)
+++ mythplugins/mythweb/config/theme_Default.php	(working copy)
@@ -26,7 +26,7 @@
     define('prefer_channum', true);
 
 // The number of time slots to display in the channel listing
-    define('num_time_slots', 36);
+    define('num_time_slots', 42);
 
 // How many timeslots to block together in headers and listing "now" rounds
     define('timeslot_blocks', 3);
@@ -38,7 +38,7 @@
     define('timeslotbar_skip', 20);
 
 // Display controls for movie "star" ratings
-    define('max_stars', 4);                 // maximum star rating for movies
+    define('max_stars', 5);                 // maximum star rating for movies
     define('star_character', '&diams;');    // the character(s) to represent stars with
 
 /*
Index: mythplugins/mythweb/includes/programs.php
===================================================================
--- mythplugins/mythweb/includes/programs.php	(revision 6740)
+++ mythplugins/mythweb/includes/programs.php	(working copy)
@@ -7,6 +7,7 @@
 
 // Make sure the "Channels" class gets loaded   (yes, I know this is recursive, but require_once will handle things nicely)
     require_once 'includes/channels.php';
+    require_once 'includes/recommendations.php';
 
 // Reasons a recording wouldn't be happening (from libs/libmythtv/programinfo.h)
     $RecStatus_Types = array(
@@ -114,6 +115,8 @@
                  .' IFNULL(programrating.system, "") AS rater,'
                  .' IFNULL(programrating.rating, "") AS rating'
                  .' FROM program LEFT JOIN programrating USING (chanid, starttime)'
+                 .' LEFT JOIN recommendation ON recommendation.chanid = program.chanid AND recommendation.starttime = program.starttime'
+                 .' LEFT JOIN recommendationsource ON recommendation.sourceid = recommendationsource.id'
                  .' WHERE';
     // Only loading a single channel worth of information
         if ($chanid > 0)
@@ -231,6 +234,7 @@
     var $is_movie;
 
     var $credits = array();
+    var $recommendations = array();
 
     function Program($data) {
     // This is a mythbackend-formatted program - info about this data structure is stored in libs/libmythtv/programinfo.cpp
@@ -367,7 +371,9 @@
     // Find out which css category this program falls into
         if ($this->chanid != '')
             $this->class = category_class($this);
-
+        global $Recommendations;
+        $this->recommendations = $Recommendations[$this->chanid][$this->starttime];
+        
     }
 
 /*
Index: mythplugins/mythweb/.htaccess
===================================================================
--- mythplugins/mythweb/.htaccess	(revision 6740)
+++ mythplugins/mythweb/.htaccess	(working copy)
@@ -1,7 +1,7 @@
-#AuthType Basic
-#AuthName "MythTV"
-#AuthUserFile /var/www/htpasswd
-#Require valid-user
+AuthType Basic
+AuthName "MythTV"
+AuthUserFile /var/www/htpasswd
+Require valid-user
 
 # If you have nuv files that are actually mpeg2 files, uncomment this
 #AddType video/mpeg .nuv
Index: mythtv/themes/blue/ui.xml
===================================================================
--- mythtv/themes/blue/ui.xml	(revision 6740)
+++ mythtv/themes/blue/ui.xml	(working copy)
@@ -240,6 +240,10 @@
         <recordstatus type="OverrideRecord" image="gg-rs-override.png"></recordstatus>
         <arrow direction="left" image="gg-arrow-left.png"></arrow>
         <arrow direction="right" image="gg-arrow-right.png"></arrow>
+        <star strength="1" image="bookmark.png"></star>
+        <star strength="2" image="bookmark.png"></star>
+        <star strength="3" image="bookmark.png"></star>
+        <star strength="4" image="bookmark.png"></star>
         <font>small-info</font>
       </guidegrid>
     </container>
@@ -523,6 +527,10 @@
         <recordstatus type="FindOneRecord" image="gg-rs-findone.png"></recordstatus>
         <arrow direction="left" image="gg-arrow-left.png"></arrow>
         <arrow direction="right" image="gg-arrow-right.png"></arrow>
+        <star strength="1" image="bookmark.png"></star>
+        <star strength="2" image="bookmark.png"></star>
+        <star strength="3" image="bookmark.png"></star>
+        <star strength="4" image="bookmark.png"></star>
         <font>small-info</font>
       </guidegrid>
     </container>
Index: mythtv/libs/libmythtv/proglist.h
===================================================================
--- mythtv/libs/libmythtv/proglist.h	(revision 6740)
+++ mythtv/libs/libmythtv/proglist.h	(working copy)
@@ -20,7 +20,8 @@
     plMovies,
     plCategory,
     plChannel,
-    plTime
+    plTime,
+    plRecommendation
 };
 
 
Index: mythtv/libs/libmythtv/tv_play.cpp
===================================================================
--- mythtv/libs/libmythtv/tv_play.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/tv_play.cpp	(working copy)
@@ -3274,8 +3274,9 @@
     bool ok;
     double fstars = stars.toFloat(&ok);
     if (ok)
-        infoMap["stars"] = QString("(%1 %2) ")
-            .arg(4.0 * fstars).arg(QObject::tr("stars"));
+         infoMap["stars"] = QString("(%1 %2) ")
+                            .arg(gContext->GetNumSetting("EPGMaxStars", 4) * stars.toFloat())
+                            .arg(QObject::tr("stars"));
     else
         infoMap["stars"] = "";
 
Index: mythtv/libs/libmythtv/siparser.cpp
===================================================================
--- mythtv/libs/libmythtv/siparser.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/siparser.cpp	(working copy)
@@ -727,6 +727,7 @@
 
     if (Table[PMT]->AddSection(head,head->table_id_ext,0))
         return;
+    int Video_taken=0;
 
     SIPARSER(QString("PMT ServiceID: %1 Version = %2").arg(head->table_id_ext).arg(head->version));
 
@@ -795,6 +796,17 @@
             case 0x04:
                 e.Type = ES_TYPE_AUDIO_MPEG2;
                 break;
+            case 0x06:
+                if (!Video_taken)
+                {
+                    e.Type = ES_TYPE_VIDEO_MPEG2;
+                    Video_taken=1;
+                }
+                else
+                {
+                    e.Type = ES_TYPE_AUDIO_MPEG2;
+                }
+                break;
             case 0x08:
             case 0x0B:
                 e.Type = ES_TYPE_DATA;
@@ -852,6 +864,7 @@
 
                     case 0x59: // Subtitling Descriptor
                         ParseDescriptorSubtitling(descriptor, descriptor_len);
+                        if (e.Type == ES_TYPE_VIDEO_MPEG2) Video_taken=0; 
                         e.Type = ES_TYPE_SUBTITLE;
                         break;
 
@@ -877,6 +890,7 @@
                 break;
             case ES_TYPE_VIDEO_MPEG2:
                 e.Description = QString("MPEG-2 Video");
+                if (e.Orig_Type == 0x06) p.PCRPID = e.PID;
                 p.hasVideo = true;
                 break;
             case ES_TYPE_AUDIO_MPEG1:
Index: mythtv/libs/libmythtv/proglist.cpp
===================================================================
--- mythtv/libs/libmythtv/proglist.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/proglist.cpp	(working copy)
@@ -277,6 +277,7 @@
                 case plChannel: value = tr("Channel Search"); break;
                 case plMovies: value = tr("Movie Search"); break;
                 case plTime: value = tr("Time Search"); break;
+                case plRecommendation: value = tr("Recommendation Search"); break;
                 default: value = tr("Unknown Search"); break;
             }
             ltype->SetText(value);
@@ -679,7 +680,8 @@
 void ProgLister::chooseView(void)
 {
     if (type == plChannel || type == plCategory || 
-        type == plMovies || type == plNewListings)
+        type == plMovies || type == plNewListings ||
+        type == plRecommendation)
     {
         if (viewList.count() < 2)
             return;
@@ -690,6 +692,7 @@
         switch (type)
         {
             case plMovies: msg = tr("Select Rating"); break;
+            case plRecommendation: msg = tr("Select Source"); break;
             case plChannel: msg = tr("Select Channel"); break;
             case plCategory: msg = tr("Select Category"); break;
             case plNewListings: msg = tr("Select List"); break;
@@ -1304,17 +1307,34 @@
     }
     else if (type == plMovies)
     {
+        int maxstars = gContext->GetNumSetting("EPGMaxStars", 4);
         viewList << "0.0";
         viewTextList << tr("All");
-        viewList << "1.0";
-        viewTextList << tr("4 stars");
-        viewList << "0.875";
-        viewTextList << tr("At least 3 1/2 stars");
-        viewList << "0.75";
-        viewTextList << tr("At least 3 stars");
-        viewList << "0.5";
-        viewTextList << tr("At least 2 stars");
-        curView = 0;
+        
+        if (maxstars > 2)
+        {
+            QString numberstr;
+            int stars = maxstars;
+            viewList << "1.0";
+            viewTextList << tr("4 stars")
+                             .replace( '4',numberstr.setNum(maxstars));
+            
+            while (stars > 2)
+            {
+                stars--;
+                viewList << numberstr.setNum((float)(stars + 0.5)/ maxstars);
+                viewTextList << tr("At least 3 1/2 stars")
+                                  .replace( '3',numberstr.setNum(stars));
+
+                viewList << numberstr.setNum((float)stars/ maxstars);
+                if (maxstars == 2)
+                     viewTextList << tr("At least 2 stars");
+                else viewTextList << tr("At least 3 stars")
+                                       .replace('3',numberstr.setNum(stars));
+
+            }
+            curView = 0;
+        }
     }
     else if (type == plTime)
     {
@@ -1322,6 +1342,28 @@
         viewList[curView] = searchTime.toString(fullDateFormat);
         viewTextList[curView] = viewList[curView];
     }
+    else if (type == plRecommendation)
+    {
+        MSqlQuery query(MSqlQuery::InitCon()); 
+        QString querystr = QString("SELECT name FROM recommendationsource "
+                                   "ORDER BY name;");
+        query.prepare(querystr);
+        query.exec();
+
+        viewList << "";
+        viewTextList << tr("All");
+
+        if (query.isActive() && query.size())
+        {
+            while (query.next())
+            {
+                QString name = QString::fromUtf8(query.value(0).toString());
+                viewList << name;
+                viewTextList << name;
+            }
+        }
+        curView = 0;
+    }
     else if (type == plSQLSearch)
     {
         curView = 0;
@@ -1488,6 +1530,14 @@
                              "INTERVAL 1 HOUR) ")
                              .arg(searchTime.toString("yyyyMMddhh0000"));
     }
+    else if (type == plRecommendation) // list movies
+    {
+        where = QString("WHERE channel.visible = 1 "
+                        "  AND program.endtime > %1 "
+                        "  AND recommendation.sourceid ").arg(startstr);
+        if (!qphrase.isEmpty())
+            where += QString(" AND recommendationsource.name = '%1' ").arg(qphrase);
+    }
 
     if (titleSort && type == plTitle)
         where += " GROUP BY subtitle ";
@@ -1579,7 +1629,9 @@
 
             QStringList starMap;
             QString starstr = "";
-            for (int i = 0; i <= 4; i++)
+            int maxstars = gContext->GetNumSetting("EPGMaxStars", 4);
+            
+            for (int i = 0; i <= maxstars; i++)
             {
                 starMap << starstr;
                 starMap << starstr + "/";
@@ -1610,7 +1662,7 @@
                 if (pi->stars > 0.0)
                     tmptitle = QString("%1 (%2, %3 )")
                                        .arg(pi->title).arg(pi->year)
-                                       .arg(starMap[(int) (pi->stars * 8)]);
+                                       .arg(starMap[(int) (pi->stars * (2 * maxstars))]);
                 else if (pi->subtitle == "")
                     tmptitle = pi->title;
                 else
Index: mythtv/libs/libmythtv/guidegrid.cpp
===================================================================
--- mythtv/libs/libmythtv/guidegrid.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/guidegrid.cpp	(working copy)
@@ -906,6 +906,7 @@
                 }
 
                 int recStat;
+                int stars;
                 if (proginfo->recstatus == rsConflict)
                     recStat = 2;
                 if (proginfo->recstatus <= rsWillRecord)
@@ -913,16 +914,20 @@
                 else
                     recStat = 0;
 
+                if (proginfo->recommendation) stars=1;
+                else stars = 0;
+                
+                
                 type->SetProgramInfo(row, cnt, tempRect, proginfo->title,
                                      proginfo->category, arrow, recFlag, 
-                                     recStat, isCurrent);
+                                     recStat, stars, isCurrent);
 
                 cnt++;
             }
         }
 
         lastprog = proginfo->startts;
-    } 
+    }
 }
 
 void GuideGrid::customEvent(QCustomEvent *e)
Index: mythtv/libs/libmythtv/programinfo.h
===================================================================
--- mythtv/libs/libmythtv/programinfo.h	(revision 6740)
+++ mythtv/libs/libmythtv/programinfo.h	(working copy)
@@ -249,6 +249,7 @@
     
     QString year;
     float stars;
+    float recommendation;
 
     QDate originalAirDate;
     QDateTime lastmodified;
Index: mythtv/libs/libmythtv/tv_rec.cpp
===================================================================
--- mythtv/libs/libmythtv/tv_rec.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/tv_rec.cpp	(working copy)
@@ -2528,8 +2528,8 @@
     }
 
     querystr += QString( "and channel.chanid = '%1' "
-                         "and starttime %3 '%2' "
-                     "order by starttime %4 limit 1;")
+                         "and program.starttime %3 '%2' "
+                     "order by program.starttime %4 limit 1;")
                      .arg(chanid).arg(starttime).arg(compare).arg(sortorder);
 
     MSqlQuery sqlquery(MSqlQuery::InitCon());
Index: mythtv/libs/libmythtv/programinfo.cpp
===================================================================
--- mythtv/libs/libmythtv/programinfo.cpp	(revision 6740)
+++ mythtv/libs/libmythtv/programinfo.cpp	(working copy)
@@ -65,6 +65,7 @@
     chanOutputFilters = "";
     year = "";
     stars = 0;
+    recommendation = 0;
     availableStatus = asAvailable;    
 
     pathname = "";
@@ -201,6 +202,7 @@
 
     originalAirDate = other.originalAirDate;
     stars = other.stars;
+    recommendation = other.recommendation;
     year = other.year;
     ignoreBookmark = other.ignoreBookmark; 
    
@@ -552,24 +554,30 @@
     progMap["catType"] = catType;
 
     progMap["year"] = year;
-    
+
     if (stars)
     {
         QString str = QObject::tr("stars");
-        if (stars > 0 && stars <= 0.25)
+        int maxstars = gContext->GetNumSetting("EPGMaxStars", 4);
+        if (stars > 0 && stars <= 1.0/maxstars)
             str = QObject::tr("star");
-
+        
         if (year != "")
             progMap["stars"] = QString("(%1, %2 %3) ")
-                                       .arg(year).arg(4.0 * stars).arg(str);
+                                       .arg(year).arg(maxstars * stars).arg(str);
         else
-            progMap["stars"] = QString("(%1 %2) ").arg(4.0 * stars).arg(str);
+            progMap["stars"] = QString("(%1 %2) ").arg(maxstars * stars).arg(str);
     }
     else
         progMap["stars"] = "";
         
     progMap["originalairdate"]= originalAirDate.toString(dateFormat);
     progMap["shortoriginalairdate"]= originalAirDate.toString(shortDateFormat);
+
+//    if (recommendation) 
+//        progMap["recommendation"]=QString("(%1) ").arg(recommendation);
+//    else 
+//        progMap["recommendation"]= "";  // CB_FIX Needs to be updated and a tr word inserted
     
 }
 
@@ -609,8 +617,8 @@
     ProgramList progList;
 
     QString querystr = QString(
-        "WHERE program.chanid = '%1' AND starttime < '%2' AND "
-        "    endtime > '%3' ")
+        "WHERE program.chanid = '%1' AND program.starttime < '%2' AND "
+        "    program.endtime > '%3' ")
         .arg(channel)
         .arg(dtime.toString("yyyyMMddhhmm50"))
         .arg(dtime.toString("yyyyMMddhhmm50"));
@@ -663,6 +671,7 @@
             p->programid = "";
             p->year = "";
             p->stars = 0.f;
+            p->recommendation = 0.f;
         }
 
         return p;
@@ -2632,10 +2641,12 @@
         if (stars > 0.0)
         {
             QString str = QObject::tr("stars");
-            if (stars > 0 && stars <= 0.25)
+            int maxstars = gContext->GetNumSetting("EPGMaxStars", 4);
+
+            if (stars > 0 && stars <= 1.0/maxstars)
                 str = QObject::tr("star");
 
-            attr += QString("%1 %2, ").arg(4.0 * stars).arg(str);
+            attr += QString("%1 %2, ").arg(maxstars * stars).arg(str);
         }
     }
 
@@ -3125,9 +3136,11 @@
         "    channel.name, program.previouslyshown, channel.commfree, "
         "    channel.outputfilters, program.seriesid, program.programid, "
         "    program.airdate, program.stars, program.originalairdate, "
-        "    program.category_type "
+        "    program.category_type, recommendation.sourceid "
         "FROM program "
         "LEFT JOIN channel ON program.chanid = channel.chanid "
+        "LEFT JOIN recommendation ON program.chanid = recommendation.chanid AND program.starttime = recommendation.starttime "
+        "LEFT JOIN recommendationsource ON recommendation.sourceid = recommendationsource.id "
         "%1 ").arg(sql);
 
     if (!sql.contains(" GROUP BY "))
@@ -3187,6 +3200,7 @@
             p->hasAirDate = true;
         }
         p->catType = query.value(18).toString();
+        if (!query.value(19).isNull()) p->recommendation = query.value(19).toString().toFloat();
 
         ProgramInfo *s;
         for (s = schedList.first(); s; s = schedList.next())
Index: mythtv/libs/libmyth/uitypes.h
===================================================================
--- mythtv/libs/libmyth/uitypes.h	(revision 6740)
+++ mythtv/libs/libmyth/uitypes.h	(working copy)
@@ -251,9 +251,11 @@
     void SetTextOffset(const QPoint &to) { textoffset = to; }
     void SetArrow(int, const QString &file);
     void LoadImage(int, const QString &file);
+    void LoadStar(int, const QString &file);
     void SetProgramInfo(int row, int col, const QRect &area,
                         const QString &title, const QString &category,
-                        int arrow, int recType, int recStat, bool selected);
+                        int arrow, int recType, int recStat, int star,
+                        bool selected);
     void ResetData();
     void ResetRow(int row);
     void SetProgPast(int ppast);
@@ -263,9 +265,10 @@
     class UIGTCon
     {
       public:
-        UIGTCon() { arrow = recType = recStat = 0; };
+        UIGTCon() { arrow = recType = recStat = star = 0; };
         UIGTCon(const QRect &drawArea, const QString &title,
-                const QString &category, int arrow, int recType, int recStat)
+                const QString &category, int arrow, int recType, int recStat,
+                int star)
         {
             this->drawArea = drawArea;
             this->title = title;
@@ -273,6 +276,7 @@
             this->arrow = arrow;
             this->recType = recType;
             this->recStat = recStat;
+            this->star = star;
         }
 
         UIGTCon(const UIGTCon &o)
@@ -284,6 +288,7 @@
             arrow = o.arrow;
             recType = o.recType;
             recStat = o.recStat;
+            star = o.star;
         }
 
         QRect drawArea;
@@ -293,6 +298,7 @@
         int arrow;
         int recType;
         int recStat;
+        int star;
     };
 
     void drawBackground(QPainter *dr, UIGTCon *data);
@@ -306,6 +312,7 @@
 
     QPixmap recImages[15];
     QPixmap arrowImages[15];
+    QPixmap starImages[15];
 
     int maxRows;
     int numRows;
Index: mythtv/libs/libmyth/xmlparse.cpp
===================================================================
--- mythtv/libs/libmyth/xmlparse.cpp	(revision 6740)
+++ mythtv/libs/libmyth/xmlparse.cpp	(working copy)
@@ -680,6 +680,7 @@
     QMap<QString, QString> catColors;
     QMap<int, QString> recImgs;
     QMap<int, QString> arrows;
+    QMap<int, QString> stars;
 
     QString name = element.attribute("name", "");
     if (name.isNull() || name.isEmpty())
@@ -794,6 +795,24 @@
                 else
                     arrows[1] = imag;
             }
+            else if (info.tagName() == "star")
+            {
+                QString strength = "";
+                QString imag = "";
+                
+                strength = info.attribute("strength");
+                imag = info.attribute("image");
+                cerr << "Found Star: " << strength << endl;
+
+                if (strength == "1")
+                    stars[1] = imag;
+                else if (strength == "2")
+                    stars[2] = imag;
+                else if (strength == "3")
+                    stars[3] = imag;
+                else
+                    stars[4] = imag;
+            }
             else if (info.tagName() == "catcolor")
             {
                 QString cat = "";
@@ -831,6 +850,8 @@
     guide->SetSelectorColor(selcolor);
     for (int i = 1; i <= 7; i++)
         guide->LoadImage(i, recImgs[i]);
+    for (int i = 1; i <= 4; i++)
+        guide->LoadStar(i, stars[i]);
     if (seltype.lower() == "box")
         guide->SetSelectorType(1);
     else
Index: mythtv/libs/libmyth/uitypes.cpp
===================================================================
--- mythtv/libs/libmyth/uitypes.cpp	(revision 6740)
+++ mythtv/libs/libmyth/uitypes.cpp	(working copy)
@@ -635,7 +635,7 @@
         {
             drawText(dr, data);
 
-            if (data->recType != 0 || data->arrow != 0)
+            if (data->recType != 0 || data->arrow != 0 || data->star != 0)
                 drawRecType(dr, data);
         }
     }
@@ -666,14 +666,30 @@
     int breakin = 1;
     QRect area = data->drawArea;
     area.addCoords(breakin, breakin, -breakin, -breakin);
+    QPixmap *recImg, *starImg;
 
     if (data->recType != 0)
     {
-        QPixmap *recImg = &recImages[data->recType];
+        recImg = &recImages[data->recType];
         dr->drawPixmap(area.right() - recImg->width(),
                        area.bottom() - recImg->height(), *recImg);
     }
 
+    if (data->star != 0)
+    {
+        cerr << "Drawing a star "  << endl;
+        starImg = &starImages[data->star];
+        if (data->recType != 0) {
+            dr->drawPixmap(area.right() - (recImg->width() + starImg->width()),
+                           area.bottom() - starImg->height(), *starImg);
+        }
+        else {
+            dr->drawPixmap(area.right() - starImg->width(),
+                           area.bottom() - starImg->height(), *starImg);
+        }
+            
+    }
+
     if (data->arrow != 0)
     {
         QPixmap *arrowImg;
@@ -845,10 +861,10 @@
 void UIGuideType::SetProgramInfo(int row, int col, const QRect &area,
                                  const QString &title, const QString &genre,
                                  int arrow, int recType, int recStat,
-                                 bool selected)
+                                 int star, bool selected)
 {
     (void)col;
-    UIGTCon *data = new UIGTCon(area, title, genre, arrow, recType, recStat);
+    UIGTCon *data = new UIGTCon(area, title, genre, arrow, recType, recStat, star);
 
     allData[row].append(data);
 
@@ -901,6 +917,20 @@
     }
 }
 
+void UIGuideType::LoadStar(int star, const QString &file)
+{
+    QString themeDir = gContext->GetThemeDir();
+    QString filename = themeDir + file;
+
+    QPixmap *pix = gContext->LoadScalePixmap(filename);
+
+    if (pix)
+    {
+        starImages[star] = *pix;
+        delete pix;
+    }
+}
+
 void UIGuideType::ResetData()
 {
     for (int i = 0; i < numRows; i++)
Index: mythtv/programs/mythfrontend/customrecord.cpp
===================================================================
--- mythtv/programs/mythfrontend/customrecord.cpp	(revision 6740)
+++ mythtv/programs/mythfrontend/customrecord.cpp	(working copy)
@@ -188,6 +188,9 @@
               "AND DAYNAME(program.starttime) = \"Friday\" \n"
               "AND HOUR(program.starttime) >= 12 ");
 
+    m_clause->insertItem(tr("Recommended (Radio Times)"));
+    m_csql << QString("recommendationsource.name = \"Radio Times\" ");
+
     vbox->addWidget(m_clause);
 
     // Preview box
@@ -371,7 +374,14 @@
     else
     {
         MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare(QString("SELECT NULL FROM program,channel WHERE\n%1")
+        query.prepare(QString("SELECT NULL FROM program "
+                              "LEFT JOIN channel ON program.chanid = channel.chanid "
+                              "LEFT JOIN recommendation ON "
+                              "program.chanid = recommendation.chanid AND "
+                              "program.starttime = recommendation.starttime "
+                              "LEFT JOIN recommendationsource ON "
+                              "recommendation.sourceid = recommendationsource.id "
+                              "WHERE\n%1")
                               .arg(desc));
 
         if (query.exec() && query.isActive())
Index: mythtv/programs/mythfrontend/globalsettings.cpp
===================================================================
--- mythtv/programs/mythfrontend/globalsettings.cpp	(revision 6740)
+++ mythtv/programs/mythfrontend/globalsettings.cpp	(working copy)
@@ -1839,6 +1839,15 @@
     return gs;
 }
 
+static HostSpinBox *EPGMaxStars()
+{
+    HostSpinBox *gs = new HostSpinBox("EPGMaxStars", 1, 10, 1);
+    gs->setLabel(QObject::tr("Maximum Number of Stars"));
+    gs->setHelpText(QObject::tr("How many stars should programs be graded out of"));
+    gs->setValue(4);
+    return gs;
+}
+
 static HostSpinBox *EPGTimeDisplay()
 {
     HostSpinBox *gs = new HostSpinBox("timePerPage", 1, 5, 1);
@@ -3064,6 +3073,7 @@
     gen->setLabel(QObject::tr("Program Guide") + " 2/2");
     gen->addChild(UnknownTitle());
     gen->addChild(UnknownCategory());
+    gen->addChild(EPGMaxStars());
     gen->addChild(DefaultTVChannel());
     gen->addChild(SelectChangesChannel());
     gen->addChild(EPGRecThreshold());
Index: mythtv/programs/mythfrontend/main.cpp
===================================================================
--- mythtv/programs/mythfrontend/main.cpp	(revision 6740)
+++ mythtv/programs/mythfrontend/main.cpp	(working copy)
@@ -155,6 +155,16 @@
     qApp->lock();
 }
 
+void startSearchRecommendation(void)
+{
+    ProgLister searchRecommendation(plRecommendation, "",
+                           gContext->GetMainWindow(), "proglist");
+
+    qApp->unlock();
+    searchRecommendation.exec();
+    qApp->lock();
+}
+
 void startManaged(void)
 {
     ViewScheduled vsb(gContext->GetMainWindow(), "view scheduled");
@@ -404,6 +414,8 @@
         startSearchNew();
     else if (sel == "tv_search_time")
         startSearchTime();
+    else if (sel == "tv_search_recommendation")
+        startSearchRecommendation();
     else if (sel == "tv_previous")
         startPrevious();
     else if (sel == "settings appearance") 
Index: mythtv/programs/mythfrontend/tv_lists.xml
===================================================================
--- mythtv/programs/mythfrontend/tv_lists.xml	(revision 6740)
+++ mythtv/programs/mythfrontend/tv_lists.xml	(working copy)
@@ -75,4 +75,19 @@
       <action>TV_SEARCH_TIME</action>
    </button>
 
+   <button>
+      <type>TV_SEARCH_RECOMMENDATIONS</type>
+      <text>Recommendations</text>
+      <text lang="DE"> </text>
+      <text lang="SV"> </text>
+      <text lang="FR"> </text>
+      <text lang="JA"> </text>
+      <text lang="NL"> </text>
+      <text lang="FI"> </text>
+      <text lang="ZH_TW"> </text>
+      <text lang="SI"> </text>
+      <text lang="ET"> </text>
+      <action>TV_SEARCH_RECOMMENDATION</action>
+   </button>
+
 </mythmenu>
Index: mythtv/programs/mythfilldatabase/filldata.cpp
===================================================================
--- mythtv/programs/mythfilldatabase/filldata.cpp	(revision 6740)
+++ mythtv/programs/mythfilldatabase/filldata.cpp	(working copy)
@@ -172,6 +172,49 @@
     QString content;
 };
 
+class RecommendationInfo
+{
+  public:
+    RecommendationInfo() { }
+    RecommendationInfo(const RecommendationInfo &other)
+                                    { channel = other.channel;
+                                      chanid = other.chanid;
+                                      startts = other.startts;
+                                      start = other.start;
+                                      title = other.title;
+                                      desc = other.desc;
+                                      recommendationsource = other.recommendationsource;
+                                      iconpath = other.iconpath;
+                                    }
+
+    QString channel;
+    int chanid;
+    QString startts;
+    QString start;
+    QString title;
+    QString desc;
+    QString recommendationsource;
+    QString iconpath;
+};
+
+class RecommendationsourceInfo
+{
+  public:
+    RecommendationsourceInfo() { }
+    RecommendationsourceInfo(const RecommendationsourceInfo &other)
+                                    { id = other.id;
+                                      name = other.name;
+                                      icon = other.icon;
+                                      weight = other.weight;
+                                    }
+
+    QString id;
+    QString name;
+    QString icon;
+    QString weight;
+};
+
+
 bool operator<(const ProgInfo &a, const ProgInfo &b)
 {
     return (a.start < b.start);
@@ -1576,9 +1619,159 @@
 
     return pginfo;
 }
+
+RecommendationInfo *parseRecommendation(QDomElement &element, int localTimezoneOffset)
+{
+    QString uniqueid, seriesid, season, episode;
+    RecommendationInfo *rcminfo = new RecommendationInfo;
+    QDateTime start;
+ 
+    rcminfo->title = rcminfo->desc = rcminfo->channel =
+    rcminfo->recommendationsource = rcminfo->iconpath= "";
+    rcminfo->chanid= 0;
+
+    QString text = element.attribute("start", "");
+    fromXMLTVDate(text, start, localTimezoneOffset);
+    rcminfo->start = start.toString(Qt::ISODate);    
+    rcminfo->startts = text;
+
+    rcminfo->channel = element.attribute("channel", "");
+    rcminfo->recommendationsource = element.attribute("source", "");
+
+    for (QDomNode child = element.firstChild(); !child.isNull();
+         child = child.nextSibling())
+    {
+        QDomElement info = child.toElement();
+        if (!info.isNull())
+        {
+            if (info.tagName() == "title")
+            {
+                rcminfo->title = getFirstText(info);
+            }
+            else if (info.tagName() == "desc" && rcminfo->desc == "")
+            {
+                rcminfo->desc = getFirstText(info);
+            }
+            else if (info.tagName() == "icon")
+            {
+                rcminfo->iconpath = info.attribute("src", "");
+            }
+        }
+    }
+
+    return rcminfo;
+}
+
+RecommendationsourceInfo *parseRecommendationsource(QDomElement &element)
+{
+    QString uniqueid, seriesid, season, episode;
+    RecommendationsourceInfo *rcmsrcinfo = new RecommendationsourceInfo;
+ 
+ 
+    rcmsrcinfo->id = rcmsrcinfo->name = rcmsrcinfo->icon = "";
+    rcmsrcinfo->weight = "1";
+
+    rcmsrcinfo->name = element.attribute("name", "");
+
+    for (QDomNode child = element.firstChild(); !child.isNull();
+         child = child.nextSibling())
+    {
+        QDomElement info = child.toElement();
+        if (!info.isNull())
+        {
+            if (info.tagName() == "icon")
+            {
+                rcmsrcinfo->icon = info.attribute("src", "");
+            }
+        }
+    }
+
+    return rcmsrcinfo;
+}
+
+// Recommendation export stuff
+void ExportRecommendations(const QString &filename)
+{
+    if (!quiet)
+    {
+        cout << QString("Exporting recommendations to %1...").arg(filename)
+             << endl;
+    }
+    QFile xml_file(filename);
+    if (dash_open(xml_file, filename, IO_WriteOnly))
+    {
+        QTextStream os(&xml_file);
+        os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+        os << "<!-- generated by mythfilldatabase -->\n";
+
+        QDomDocument recommendations;
+        QDomElement roote = recommendations.createElement("tv");
+
+        MSqlQuery query(MSqlQuery::InitCon());
+        query.exec("SELECT recommendout.description, "
+                   "DATE_FORMAT(recommendout.starttime, '%Y%m%d%k%i%s') AS starttime, "
+                   "channel.name, program.title, recommendout.icon "
+                   "FROM recommendout LEFT JOIN program USING (chanid, starttime) "
+                   "LEFT JOIN channel ON  channel.chanid = recommendout.chanid "
+                   "WHERE recommendout.starttime > (CURRENT_DATE - 7)"
+                   "ORDER BY recommendout.starttime");
+
+        QString sourcename = gContext->GetSetting("LocalRecommendationSourceName", "Unnamed MythTV Source");
+        
+        QDomElement recommendationsource = 
+                            recommendations.createElement("recommendationsource");
+        recommendationsource.setAttribute("name", sourcename);
+        roote.appendChild(recommendationsource);
+                            
+        
+        if (query.isActive() && query.numRowsAffected() > 0)
+        {
+            int offset = (60*24 - QDateTime(QDate(1970, 1, 2)).toTime_t()/60);
+            QString offset_str;
+            offset_str.sprintf("%+03d%02d", offset/60, offset%60);
+            while (query.next())
+            {
+                QDomElement newrecommendation = 
+                            recommendations.createElement("recommendation");
+                newrecommendation.setAttribute("source", sourcename);
+                newrecommendation.setAttribute("channel", query.value(2).toString());
+                newrecommendation.setAttribute("start", QString("%1 %2").arg(query.value(1).toString()).arg(offset_str));
+                
+                QDomElement title = recommendations.createElement("title");
+                QDomText title_text  = recommendations.createTextNode(query.value(3).toString());
+                title.appendChild(title_text);
+                newrecommendation.appendChild(title);
+
+
+                if (!query.value(0).toString().isEmpty()){
+                    QDomElement description = recommendations.createElement("desc");
+                    QDomText description_text  = recommendations.createTextNode(
+                                query.value(0).toString());
+                    description.appendChild(description_text);
+                    newrecommendation.appendChild(description);
+                }
+                
+                roote.appendChild(newrecommendation);
+            }
+        }
+
+
+        recommendations.appendChild(roote);
+        recommendations.save(os, 4);
+    }
+    else
+    {
+        cerr << QString("Error unable to open '%1' for writing.") << endl;
+    }
+}
+
+
+
                   
 bool parseFile(QString filename, QValueList<ChanInfo> *chanlist,
-               QMap<QString, QValueList<ProgInfo> > *proglist)
+               QMap<QString, QValueList<ProgInfo> > *proglist,
+               QValueList<RecommendationInfo> *recommendationlist,
+               QValueList<RecommendationsourceInfo> *recommendationsourcelist)
 {
     QDomDocument doc;
     QFile f;
@@ -1719,6 +1912,20 @@
                 }
                 delete pginfo;
             }
+            else if (e.tagName() == "recommendationsource")
+            {
+                RecommendationsourceInfo *rcmsrcinfo = parseRecommendationsource(e);
+                recommendationsourcelist->push_back(*rcmsrcinfo);
+                delete rcmsrcinfo;
+            }
+            else if (e.tagName() == "recommendation")
+            {
+                RecommendationInfo *rcminfo = parseRecommendation(e, localTimezoneOffset);
+                recommendationlist->push_back(*rcminfo);
+                delete rcminfo;
+            }
+
+            
         }
         n = n.nextSibling();
     }
@@ -2491,16 +2698,222 @@
     }
 }
 
+void handleRecommendations(int id, QValueList<RecommendationInfo> *recommendationlist)
+{
+    QValueList<RecommendationInfo>::iterator i = recommendationlist->begin();
+    for (; i != recommendationlist->end(); i++)
+    {
+        MSqlQuery query(MSqlQuery::InitCon());
+
+        int sourceid = 0;
+        
+        
+        if (!(*i).chanid & !(*i).channel.isEmpty()){
+            query.prepare("SELECT chanid FROM channel WHERE sourceid = :ID AND "
+                          "(xmltvid = :CHANNEL OR name = :CHANNEL OR callsign = :CHANNEL);"); 
+            query.bindValue(":ID", id);
+            query.bindValue(":CHANNEL", (*i).channel.utf8());
+
+            query.exec();
+
+            if (query.isActive() && query.numRowsAffected() > 0)
+            {
+                query.next();
+                (*i).chanid = query.value(0).toInt();
+            }
+            else
+            {
+                cerr << "Unknown channel identifier: " << (*i).channel.utf8()
+                     << endl << "Skipping recommendation.\n";
+                continue;
+            }
+        }
+        
+        if (!(*i).chanid || (*i).start.isEmpty()){
+            
+            cerr << "Having to go and find the program\n";
+            
+            if ((*i).title.isEmpty()){
+                cerr << "Not enough info to find program (no Title and no Time or Channel)\n";
+                continue;
+            }
+
+            if ((*i).chanid){
+                query.prepare("SELECT chanid, starttime FROM program WHERE title=:TITLE AND chanid=:CHANID");
+                query.bindValue(":TITLE", (*i).title.utf8());
+                query.bindValue(":CHANID", (*i).chanid);
+                query.exec();
+            }
+            else if (!(*i).start.isEmpty()){
+                query.prepare("SELECT chanid, starttime FROM program WHERE title=:TITLE AND starttime=:START");
+                query.bindValue(":TITLE", (*i).title.utf8());
+                query.bindValue(":START", (*i).start);
+                query.exec();
+            }
+            else {
+                query.prepare("SELECT chanid, starttime FROM program WHERE title=:TITLE");
+                query.bindValue(":TITLE", (*i).title.utf8());
+                query.exec();
+            }
+            
+
+            if (!query.isActive()){
+                continue;
+                }
+
+            if (!query.numRowsAffected())
+            {
+                cerr << "Unable to find program for recommendation: "  << (*i).title.utf8() << "\n";;
+                continue;
+            }
+
+            if (query.numRowsAffected() > 2)
+            {
+                cerr << "Too many possible matches for recommendation: "  << (*i).title.utf8() << "\n";;
+                continue;
+            }
+
+
+            while (query.next()){
+                RecommendationInfo *rcminfo = new RecommendationInfo(*i);
+                rcminfo->chanid = query.value(0).toInt();
+                rcminfo->start = query.value(1).toString();
+                recommendationlist->push_back(*rcminfo);
+                cerr << "Found instances\n";
+            }
+            continue;
+        }
+        
+        
+
+        query.prepare("SELECT id FROM recommendationsource WHERE "
+                      "name=:NAME;");
+        query.bindValue(":NAME", (*i).recommendationsource.utf8());
+        query.exec();
+        if (query.isActive() && query.numRowsAffected() > 0)
+        {
+            query.next();
+            sourceid = query.value(0).toInt();
+        }
+        else
+        {
+            cerr << "Unknown recommendation source: " << (*i).recommendationsource.utf8()
+                 << endl << "Skipping recommendation.\n";
+            continue;
+        }
+        
+        query.prepare("SELECT * FROM recommendation WHERE "
+                      "chanid=:CHANID AND "
+                      "starttime=:START AND "
+                      "description=:DESC AND "
+                      "icon=:ICON AND "
+                      "sourceid=:SOURCEID;");
+        query.bindValue(":CHANID", (*i).chanid);
+        query.bindValue(":START", (*i).start);
+        query.bindValue(":DESC", (*i).desc.utf8());
+        query.bindValue(":ICON", (*i).iconpath.utf8());
+        query.bindValue(":SOURCEID", sourceid);
+        query.exec();
+
+        if (query.isActive() && query.numRowsAffected() > 0)
+        {
+            cerr << "Already present recommendation\n";
+            continue;
+        }
+        
+
+        query.prepare("DELETE FROM recommendation WHERE "
+                      "chanid=:CHANID AND "
+                      "starttime=:START AND "
+                      "sourceid=:SOURCEID;");
+        query.bindValue(":CHANID", (*i).chanid);
+        query.bindValue(":START", (*i).start);
+        query.bindValue(":SOURCEID", sourceid);
+        query.exec();
+        if (!query.exec())
+        {
+            MythContext::DBError("recommendation removal", query);
+        }
+
+        
+        // Delete the old entries!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
+        
+        
+        query.prepare("REPLACE INTO recommendation (chanid,starttime,"
+                      "description,icon,sourceid) "
+                      "VALUES(:CHANID,:START,:DESC,"
+                      ":ICON,:SOURCEID);");
+        query.bindValue(":CHANID", (*i).chanid);
+        query.bindValue(":START", (*i).start);
+        query.bindValue(":DESC", (*i).desc.utf8());
+        query.bindValue(":ICON", (*i).iconpath.utf8());
+        query.bindValue(":SOURCEID", sourceid);
+        if (!query.exec())
+        {
+            MythContext::DBError("recommendation insert", query);
+        }
+        
+        
+        
+        
+        
+        
+        
+        
+    }
+}
+
+void handleRecommendationsources(QValueList<RecommendationsourceInfo> *recommendationcourcelist)
+{
+    QValueList<RecommendationsourceInfo>::iterator i = recommendationcourcelist->begin();
+    for (; i != recommendationcourcelist->end(); i++)
+    {
+        MSqlQuery query(MSqlQuery::InitCon());
+        query.prepare("SELECT * FROM recommendationsource WHERE name = :NAME;"); 
+        query.bindValue(":NAME", (*i).name.utf8());
+        query.exec();
+
+        if (query.isActive() && query.numRowsAffected() > 0)
+        {
+            query.prepare("UPDATE recommendationsource SET icon=:ICON "
+                          "WHERE name = :NAME;");
+            query.bindValue(":NAME", (*i).name.utf8());
+            query.bindValue(":ICON", (*i).icon.utf8());
+            if (!query.exec())
+            {
+                MythContext::DBError("recommendationsource update", query);
+            }
+        }
+        else 
+        {
+            query.prepare("INSERT INTO recommendationsource (name, icon) "
+                          "VALUES(:NAME,:ICON);");
+            query.bindValue(":NAME", (*i).name.utf8());
+            query.bindValue(":ICON", (*i).icon.utf8());
+            if (!query.exec())
+            {
+                MythContext::DBError("recommendationsource insert", query);
+            }
+        }
+        
+    }
+}
+
+
 bool grabDataFromFile(int id, QString &filename)
 {
     QValueList<ChanInfo> chanlist;
     QMap<QString, QValueList<ProgInfo> > proglist;
+    QValueList<RecommendationInfo> recommendationlist;
+    QValueList<RecommendationsourceInfo> recommendationsourcelist;
 
-    if (!parseFile(filename, &chanlist, &proglist))
+    if (!parseFile(filename, &chanlist, &proglist, &recommendationlist, &recommendationsourcelist))
         return false;
 
     handleChannels(id, &chanlist);
     handlePrograms(id, &proglist);
+    handleRecommendationsources(&recommendationsourcelist);
+    handleRecommendations(id, &recommendationlist);
     return true;
 }
 
@@ -2756,6 +3169,10 @@
                      "OR type = %d OR type = %d) AND enddate < NOW();",
                      kSingleRecord, kOverrideRecord, kDontRecord);
     query.exec(querystr);
+
+    querystr.sprintf("DELETE FROM recommendation WHERE starttime <= "
+                     "DATE_SUB(CURRENT_DATE, INTERVAL %d DAY);", offset);
+    query.exec(querystr);
 }
 
 bool fillData(QValueList<Source> &sourcelist)
@@ -3171,6 +3588,9 @@
 
     bool grab_data = true;
 
+    bool export_recommendations = false;
+    QString export_recommendations_filename("recommendations.xml");
+
     bool export_iconmap = false;
     bool import_iconmap = false;
     bool reset_iconmap = false;
@@ -3402,6 +3822,25 @@
                 }
             }
         }
+        else if (!strcmp(a.argv()[argpos], "--export-recommendations"))
+        {
+            export_recommendations = true;
+            grab_data = false;
+
+            if ((argpos + 1) >= a.argc() ||
+                    !strncmp(a.argv()[argpos + 1], "--", 2))
+            {
+                if (!isatty(fileno(stdout)))
+                {
+                    quiet = true;
+                    export_recommendations_filename = "-";
+                }
+            }
+            else
+            {
+                export_recommendations_filename = a.argv()[++argpos];
+            }
+        }
         else if (!strcmp(a.argv()[argpos], "-h") ||
                  !strcmp(a.argv()[argpos], "--help"))
         {
@@ -3477,6 +3916,10 @@
             cout << "   Resets your icon map (pass all to reset channel icons as well)\n";
             cout << "\n";
             cout << "--mark-repeats\n";
+            cout << "   Marks any programs with a OriginalAirDate earlier than their start date as a repeat\n";
+            cout << "--export-recommendations [<filename>]\n";
+            cout << "   Exports your recommendations to <filename> (default: "
+                    << export_recommendations_filename << ")\n";
             cout << "   Marks any programs with a OriginalAirDate earlier\n";
             cout << "   than their start date as a repeat\n";
             cout << "\n";
@@ -3664,6 +4107,11 @@
         }
     }
 
+    if (export_recommendations)
+    {
+        ExportRecommendations(export_recommendations_filename);
+    }
+
     if (grab_data)
     {
         if (!quiet)