BitKeeper patch
Ashley Jones <ajones-tp0iMJ/[email protected]> Thu, 2 Dec 2004 16:11:40 -0800
| Newsgroups | gmane.comp.cms.xaraya.patches |
|---|---|
| Message-ID | <[email protected]> |
This BitKeeper patch contains the following changesets: ajones-tp0iMJ/[email protected]|ChangeSet|20041203001123|63826 # ID: [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b # User: ajones # Host: schwabfoundation.org # Root: /home/ajones/vanilla-module # Patch vers: 1.3 # Patch type: REGULAR == ChangeSet == [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b jojodee-CZ0/[email protected]|ChangeSet|20041201121829|65017 D 1.1465 04/12/02 16:11:23-08:00 ajones-tp0iMJ/[email protected] +7 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c New schema and templates to support articles in newsletter. K 63826 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|BitKeeper/etc/ignore|20020928140945|53618|6c5923e8709751f2 ajones-tp0iMJ/[email protected]|BitKeeper/etc/ignore|20041203001118|01919 > caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xarinit.php|20040519165036|29934|c1652f51dfed7296 ajones-tp0iMJ/[email protected]|newsletter/xarinit.php|20041203001118|09134 > caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-text.xd|20040519165033|39136|3faf6fcaef74469e ajones-tp0iMJ/[email protected]|newsletter/templates/publication-template-text.xd|20041203001118|24333 > caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-html.xd|20040519165033|36292|7b05eb041c3fd165 ajones-tp0iMJ/[email protected]|newsletter/templates/publication-template-html.xd|20041203001118|62273 > caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xaruserapi/getstory.php|20040519165039|32146|fa88bc7e55d4458b ajones-tp0iMJ/[email protected]|newsletter/xaruserapi/getstory.php|20041203001118|08850 > caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xarversion.php|20040519165040|29188|d561106e9940a3c0 ajones-tp0iMJ/[email protected]|newsletter/xarversion.php|20041203001118|24844 > [email protected]|BitKeeper/etc/logging_ok|20020928141157|31740|a891b4fe9b65f332 ajones-tp0iMJ/[email protected]|BitKeeper/etc/logging_ok|20041203001122|06325 == newsletter/templates/publication-template-html.xd == caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-html.xd|20040519165033|36292|7b05eb041c3fd165 caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-html.xd|20040519165034|02997 D 1.2 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +36 -3 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c can now handle articles as stories K 62273 O -rw-rw-r-- P newsletter/templates/publication-template-html.xd ------------------------------------------------ D34 1 I34 11 \ <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a title, then it will use it. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['title'])"> #$loop:item['article']['title']# <xar:else/> #$loop:item['title']# </xar:if> D51 1 I51 11 <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a title, then it will use it. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['title'])"> #$loop:item['article']['title']# <xar:else/> #$loop:item['title']# </xar:if> D63 1 I63 14 \ <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a sumarry and a body, then it will use the summary first. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['summary'])"> <p>#$loop:item['article']['summary']#</p> <xar:elseif condition="!empty($loop:item['article']['body'])"/> <p>#$loop:item['article']['body']#</p> <xar:else/> <p>#$loop:item['content']#</p> </xar:if> == newsletter/templates/publication-template-text.xd == caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-text.xd|20040519165033|39136|3faf6fcaef74469e caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/templates/publication-template-text.xd|20040603000311|33987 D 1.4 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +1 -1 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c can now handle articles as stories K 24333 O -rw-rw-r-- P newsletter/templates/publication-template-text.xd ------------------------------------------------ D1 1 N1 1 <xar:if condition="!empty($publication['introduction'])">#$publication['introduction']#</xar:if> <xar:if condition="!empty($issue['editorNote'])"> <br /> <br />Editor's Note: #$issue['editorNote']# <br /></xar:if> <xar:if condition="!empty($issue['headlines']) and count($issue['headlines']) gt 0"> <br /> <br />------------------------------------------------------------ <br /> <xar:loop name="$issue['headlines']">#$loop:item['category']# Headlines <br /> <xar:loop name="$loop:item['stories']"> <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a title, then it will use it. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['title'])"> **#$loop:item['article']['title']# <xar:else/> **#$loop:ite! m['title']# </xar:if> <br /></xar:loop> <br/> </xar:loop> </xar:if>------------------------------------------------------------ <xar:loop name="$issue['headlines']"> <br />#$loop:item['category']#: News <br /> <xar:loop name="$loop:item['stories']"> <br /> <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a title, then it will use it. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['title'])"> ***#$loop:item['article']['title']# <xar:else/> ***#$loop:item['title']# </xar:if> <br />(#$loop:item['source']# <xar:if condition="$loop:item['storyDate']['timestamp'] != 0">, #$loop:item['storyDate'] ['mon']#/#$loop:item['storyDate']['day']#/#$loop:item['storyDate']['year']# <xar:if con! dition="!empty($loop:item['altDate'])"> #$loop:item['alt! Date']# </xar:if> <xar:else /> #$loop:item['altDate']# </xar:if>) <br /> <br /> <xar:comment> this if statement checks to see if there is an article in use. If there is AND the article has a sumarry and a body, then it will use the summary first. If not, it will default to the newsletter story title </xar:comment> <xar:if condition="!empty($loop:item['article']['summary'])"> <p>#$loop:item['article']['summary']#</p> <xar:elseif condition="!empty($loop:item['article']['body'])"/> <p>#$loop:item['article']['body']#</p> <xar:else/> <p>#$loop:item['content']#</p> </xar:if> <xar:if condition="!empty($loop:item['comme ntarySource']) && !empty($loop:item['commentarySource'])"> <br /> <br />#$loop:item['comm! entarySource']#: #$loop:item['commentary']# <br /></xar:if> <xar:if condition="$loop:item['linkExpired'] eq true"> <br /> <br />Full text (expired): #$loop:item['fullTextLink']# <xar:else /> <br /> <br />Full text: <a href="#$loop:item['fullTextLink']#">#$loop:item['fullTextLink']#</a></xar:if> <xar:if condition="$loop:item['registerLink'] eq 1"> <br />#$publication['linkRegistration']#</xar:if> <br /> <br />------------------------------------------------------------</xar:loop></xar:loop> <br /> <br />#$issue['ownerName']# <xar:if condition="!empty($issue['ownerSignature'])"> <br />#$issue['ownerSignature']#</xar:if> <xar:if condition="!empty($publication['disclaimer'])"> <br />Disclaimer: #$publication['disclaimer']#</xar:if> == newsletter/xarinit.php == caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xarinit.php|20040519165036|29934|c1652f51dfed7296 ajones-V/[email protected]|newsletter/xarinit.php|20041122193850|34879 D 1.12 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +38 -5 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c incorporated new schema that allows newsletter module to use articles as stories. title and content in newsletter stories table can now be null. Also added article id to same table. K 9134 O -rw-rw-r-- P newsletter/xarinit.php ------------------------------------------------ D186 1 I186 1 'xar_title' => array('type'=>'varchar','size'=>255,'null'=>TRUE), D188 1 I188 1 'xar_content' => array('type'=>'text','null'=>TRUE), D363 2 I370 4 \ // Get the newsletter publication table $nwsltrPublications = $xartable['nwsltrPublications']; D393 1 I393 32 // we added support for using articles as stories. this means that // an articles title and content can be used in place of story thus // title and content of a story can be null. Also, we need to store the // article ID of the choosen article. // Add the column 'xar_articleid' to the stories table $query = xarDBAlterTable('xar_nwsltr_stories', array('command' => 'add', 'field' => 'xar_articleid', 'type' => 'integer')); $result = & $dbconn->Execute($query); if (!$result) return; // change the title field to allow for null $query = xarDBAlterTable($xartable['nwsltrStories'], array('command' => 'modify', 'field' => 'xar_title', 'null' => false)); $result =& $dbconn->Execute($query); if (!$result) return; // change the content field to allow for null $query = xarDBAlterTable($xartable['nwsltrStories'], array('command' => 'modify', 'field' => 'xar_content', 'null' => false)); $result =& $dbconn->Execute($query); if (!$result) return; \ case '1.1.1': // Code to upgrade from version 1.1.1 goes here == newsletter/xaruserapi/getstory.php == caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xaruserapi/getstory.php|20040519165039|32146|fa88bc7e55d4458b ajones-V/[email protected]|newsletter/xaruserapi/getstory.php|20041122193850|31499 D 1.6 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +0 -7 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c removed comments from earlier testing that never should have been in the repository. K 8850 O -rw-rw-r-- P newsletter/xaruserapi/getstory.php ------------------------------------------------ D183 2 D186 5 == newsletter/xarversion.php == caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|newsletter/xarversion.php|20040519165040|29188|d561106e9940a3c0 marc@marclaptop.|newsletter/xarversion.php|20040828204442|24843 D 1.5 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +1 -1 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c new schema, version updated K 24844 O -rw-rw-r-- P newsletter/xarversion.php ------------------------------------------------ D17 1 I17 1 $modversion['version'] = '1.1.1'; == BitKeeper/etc/ignore == [email protected]|BitKeeper/etc/ignore|20020928140945|53618|6c5923e8709751f2 alberto@ftb.|BitKeeper/etc/ignore|20041024202606|00051 D 1.24 04/12/02 16:11:18-08:00 ajones-tp0iMJ/[email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added .AppleDouble/.Parent to the ignore list K 1919 O -rw-rw-r-- P BitKeeper/etc/ignore ------------------------------------------------ I1287 1 .AppleDouble/.Parent == BitKeeper/etc/logging_ok == [email protected]|BitKeeper/etc/logging_ok|20020928141157|31740|a891b4fe9b65f332 ajones-V/[email protected]|BitKeeper/etc/logging_ok|20041122193856|03526 D 1.143 04/12/02 16:11:22-08:00 ajones-tp0iMJ/[email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Logging to [email protected] accepted K 6325 O -rw-rw-r-- P BitKeeper/etc/logging_ok ------------------------------------------------ I21 1 ajones-tp0iMJ/[email protected] # Patch checksum=28d47cc8