Changeset 402

Show
Ignore:
Timestamp:
06/16/06 11:16:35 (2 years ago)
Author:
sven
Message:

schema: lengthen feed_posts.url to better cope with silly URLs, and remove unused index on the field
feeds: use magpie's item timestamp if it finds one, and reduce the number of calls to time() for efficiency and consistency.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/db/mysql.php

    r379 r402  
    3232                              KEY `name` (`name`) 
    3333                            ) TYPE=MyISAM;"); 
    34     } 
    35  
    36     if ($oldversion < 2005122800) { 
    37         execute_sql('SELECT * FROM datalists'); 
    3834    } 
    3935 
    …… 
    307303    } 
    308304     
     305    if ($oldversion < 2006061600) { 
     306        modify_database('',"ALTER TABLE `feed_posts` DROP INDEX `url` ;"); 
     307        table_column('feed_posts','url','url','varchar',255,'',''); 
     308    } 
     309     
    309310    return $result;  
    310311} 

  • devel/lib/db/mysql.sql

    r379 r402  
    452452  `title` text NOT NULL, 
    453453  `body` text NOT NULL, 
    454   `url` varchar(128) NOT NULL default '' COMMENT 'post-specific or permalink URL', 
    455   PRIMARY KEY (`ident`), 
    456   KEY `url` (`url`), 
     454  `url` varchar(255) NOT NULL default '' COMMENT 'post-specific or permalink URL', 
     455  PRIMARY KEY (`ident`), 
    457456  KEY `feed` (`feed`), 
    458457  KEY `posted` (`posted`,`added`), 

  • devel/lib/db/postgres7.php

    r379 r402  
    3131 
    3232        modify_database('',"CREATE INDEX prefix_datalists_name_idx ON prefix_datalists (name);"); 
    33     } 
    34  
    35     if ($oldversion < 2005122800) { 
    36         execute_sql('SELECT * FROM datalists'); 
    3733    } 
    3834 
    …… 
    242238    if ($oldversion < 2006052100) { 
    243239        // add some missing indexes 
    244         modify_database('CREATE INDEX prefix_tags_access_idx ON prefix_tags (access)'); 
     240        modify_database('','CREATE INDEX prefix_tags_access_idx ON prefix_tags (access)'); 
    245241    } 
    246242 
    …… 
    266262     
    267263    if ($oldversion < 2006060600) { 
    268         modify_database('CREATE INDEX prefix_feed_posts_added_idx ON prefix_feed_posts (added)'); 
     264        modify_database('','CREATE INDEX prefix_feed_posts_added_idx ON prefix_feed_posts (added)'); 
     265    } 
     266     
     267    if ($oldversion < 2006061600) { 
     268        modify_database('','DROP INDEX prefix_feed_posts_url_idx'); 
     269        table_column('feed_posts','url','url','varchar',255,'',''); 
    269270    } 
    270271     

  • devel/lib/db/postgres7.sql

    r379 r402  
    321321  title text NOT NULL, 
    322322  body text NOT NULL, 
    323   url varchar(128) NOT NULL default '' 
    324 ); 
    325  
    326 CREATE INDEX prefix_feed_posts_url_idx ON prefix_feed_posts (url); 
     323  url varchar(255) NOT NULL default '' 
     324); 
     325 
    327326CREATE INDEX prefix_feed_posts_feed_idx ON prefix_feed_posts (feed); 
    328327CREATE INDEX prefix_feed_posts_posted_idx ON prefix_feed_posts (posted,added); 

  • devel/units/magpie/function_update.php

    r401 r402  
    2828    $update_time = 3600; 
    2929 
     30    $timenow = time(); 
    3031     
    31     if ($feed->last_updated < (time() - $update_time)) { 
    32         set_field('feeds','last_updated',time(),'ident',$parameter); 
     32    if ($feed->last_updated < ($timenow - $update_time)) { 
     33        set_field('feeds','last_updated',$timenow,'ident',$parameter); 
    3334        if ($rss = run("rss:get", $feed->url)) { 
    3435             
    …… 
    5556            if (sizeof($rss->items > 0)) { 
    5657                 
    57                 $mintime = time() - ($CFG->rsspostsmaxage * 86400); 
     58                $mintime = $timenow - ($CFG->rsspostsmaxage * 86400); 
    5859                 
    5960                foreach($rss->items as $item) { 
    …… 
    8182                     
    8283                    $url = trim(stripslashes($item['link'])); 
    83                     if (!($added = @strtotime($posted)) || $posted == "") { 
    84                         $added = time(); 
     84                    $url = substr($url, 0, 255); // trim urls down to the max length in the db, just in case. CURSE YOU, GUARDIAN BLOGGERS! 
     85                     
     86                    if ($item['date_timestamp']) { 
     87                        $added = (int) $item['date_timestamp']; 
    8588                    } 
    86                     if ($added > time() || $added == -1) { 
    87                         $added = time(); 
     89                    if (!$added && ($posted == "" || !($added = @strtotime($posted))) ) { 
     90                        $added = $timenow; 
     91                    } 
     92                    if ($added > $timenow || $added == -1) { 
     93                        $added = $timenow; 
    8894                    } 
    8995                     

  • devel/version.php

    r379 r402  
    77// whether upgrades should be performed (see lib/db/*.php) 
    88 
    9    $version = 2006060600;  // YYYYMMDD   = Elgg Date 
     9   $version = 2006061600;  // YYYYMMDD   = Elgg Date 
    1010                           //         X  = Elgg Point release (0,1,2...) 
    1111                           //          Y = Interim incrementer