Changeset 1762

Timestamp:

10/17/07 22:58:01 (11 months ago)

Author:

cfriesen

Message:

Refresh interval in the feed properties.

Location:

trunk/gregarius

Files:

• admin/channels.php (modified) (5 diffs)
• extlib/rss_dbcache.inc (modified) (2 diffs)
• schema.php (modified) (1 diff)
• util.php (modified) (4 diffs)

trunk/gregarius/admin/channels.php

@@ -489 +489 @@
             // Delete properties
             deleteProperty($id,'rss.input.allowupdates');
+            
+            deleteProperty($id,'rss.config.refreshinterval');
 
             // Invalidate cache
@@ -647 +649 @@
         $old_priv = ($_POST['old_priv'] == '1');
 
-
         // Feed Properties
         $prop_rss_input_allowupdates = rss_real_escape_string($_POST['prop_rss_input_allowupdates']);
@@ -655 +656 @@
             setProperty($cid, 'rss.input.allowupdates' , 'feed', ($prop_rss_input_allowupdates == 1));
         }
-
+        
+        deleteProperty($cid, 'rss.config.refreshinterval');
+        
+        $rss_config_refreshinterval = rss_real_escape_string($_POST['rss_config_refreshinterval']);
+        if($rss_config_refreshinterval > 60) {
+                    setProperty($cid, 'rss.config.refreshinterval', 'feed', $rss_config_refreshinterval);   
+                }        
 
         if ($priv != $old_priv) {
@@ -905 +912 @@
     if(!empty($daterefreshed)) {
         echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
-        ."<p><label>" . __('Last Update') . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n";
+        ."<p><label>" . __('Last Update') . ": ".date("M-d-Y H:i", strtotime($daterefreshed))." (Age: " . round(((time() - strtotime($daterefreshed))/60)) . " minutes)</label></p>\n";
     } else {
         echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
@@ -1039 +1046 @@
 
     ."</p>\n";
+    
+    echo "<p>"
+    ."<span style=\"float:left;\">Refresh Interval (minutes): </span>"
+    ."&nbsp;"
+    ."</p>";
+    
+    $rss_config_refreshinterval_default_current = getProperty($cid, 'rss.config.refreshinterval');
+    
+    echo "<p id=\"rss_config_refreshinterval_options\">"
+    ."<input type=\"text\" id=\"rss_config_refreshinterval\" name=\"rss_config_refreshinterval\" value=\"" . (true == empty($rss_config_refreshinterval_default_current) ? 60 : $rss_config_refreshinterval_default_current) . "\">"
+    ."</p>";
     echo "</fieldset>\n";
 
 
-    echo "<p style=\"clear:both; padding: 1em 0\"><input type=\"submit\" name=\"action_\" value=\"". __('Submit Changes') ."\" /></p>";
+        echo "<p style=\"clear:both; padding: 1em 0\"><input type=\"submit\" name=\"action_\" value=\"". __('Submit Changes') ."\" /></p>";
 
     echo "</form></div>\n";

trunk/gregarius/extlib/rss_dbcache.inc

@@ -109 +109 @@
         }
 
-        $res = rss_query("select UNIX_TIMESTAMP(daterefreshed) as ts, refreshinterval from " . getTable("channels")
+        $res = rss_query("select UNIX_TIMESTAMP(daterefreshed) as ts from " . getTable("channels")
                          . " where id=$cid");
         if ( ! $res ) {
@@ -116 +116 @@
         }
 
-        list($dateRefreshed, $refreshInterval) = rss_fetch_row($res);
-
-        // Lets hope that the web server and sql server have their clocks in sync
+        list($dateRefreshed) = rss_fetch_row($res);
+        $refreshInterval = getProperty($cid, 'rss.config.refreshinterval');
+        if(true == empty($refreshInterval)) {
+            $refreshInterval = 60;
+        }
+        
+          // Lets hope that the web server and sql server have their clocks in sync
         $age = time() - $dateRefreshed;
+        
         if (!$refreshInterval || ($refreshInterval < 10)) {
             // We should change the Gregarius UA if we allow refreshInterval to be small

trunk/gregarius/schema.php

@@ -144 +144 @@
             // date feed was last refreshed, added in 0.5.3
             rss_query('alter table ' .getTable('channels') .' add column daterefreshed datetime null default 1');
-            if (rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR)) {
-                $updated++;
-                rss_error("updated schema for table " . getTable('channels'), RSS_ERROR_NOTICE);
-            } else {
-                rss_error("Failed updating schema for table " . getTable('channels')
-                .": " . rss_sql_error_message(), RSS_ERROR_ERROR
-                );
-            }
-        // break; - fallthrough allowed on purpose because these are added at the same time
-        case 'c.refreshinterval':
-        case 'refreshinterval':
-            // refresh interval of a feed (in minutes), added in 0.5.3
-            rss_query('alter table ' .getTable('channels') .' add column refreshinterval int(16) not null default 60');
             if (rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR)) {
                 $updated++;

trunk/gregarius/util.php

@@ -456 +456 @@
         $np = "0";
     }
-
+            
     // Here we go!
     //error_reporting(E_ALL);
@@ -463 +463 @@
     error_reporting($old_level);
 
-
     if ($rss) {
         if ($title_) {
@@ -484 +483 @@
             $siteurl = "";
         }
+
+                $refreshinterval = 0;
+                if(is_object($rss) && array_key_exists('syn', $rss->channel)) {
+                        $syn = $rss->channel['syn'];
+
+                        if(array_key_exists('updateperiod', $syn)) {
+                                if("hourly" == $syn['updateperiod']) {
+                                        if(array_key_exists('updatefrequency', $syn)) {
+                                                $refreshinterval = 60 * $syn['updatefrequency'];
+                                        }
+                                }
+                        }
+                }
 
         if ($descr_) {
@@ -546 +558 @@
                 __exp__submitTag($newid,$tags,"'channel'");
             }
+            
+            if(false == empty($refreshinterval)) {
+                setProperty($newid, 'rss.config.refreshinterval', $refreshinterval);
+                        }
 
             return array ($newid, "");