Changeset 1155 for trunk/rss/extlib/rss_fetch.inc

Timestamp:

01/07/06 15:15:26 (3 years ago)

Author:

sdcosta

Message:

Important: Please see these important notes before svn'ing up
past this changeset.

This merges the no-magpie-cache branch back into the trunk.
svn merge -r 1114:1154 http://svn.gregarius.net/svn/branches/no-magpie-cache

Files:

• trunk/rss/extlib/rss_fetch.inc (modified) (3 diffs)

trunk/rss/extlib/rss_fetch.inc

@@ -29 +29 @@
 
 require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once( MAGPIE_DIR . 'rss_dbcache.inc' ); //sameer: changed to use db
 
 // for including 3rd party libraries
@@ -131 +131 @@
         // 4. if remote fails, return stale object, or error
         
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+    // sameer: changed to use db
+        $cache = new RSSdbCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
         
         if (MAGPIE_DEBUG and $cache->ERROR) {
@@ -145 +146 @@
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        //$cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+    // sameer: removed the encoding from the key
+        $cache_key       = $url;
         
         if (!$cache->ERROR) {