diff --git a/docs/create.sql b/docs/create.sql
index f6ebca1c7..1d999d6b8 100644
--- a/docs/create.sql
+++ b/docs/create.sql
@@ -1758,6 +1758,8 @@ CREATE TABLE SyndicatedContent (
maxHeadlines int(11) NOT NULL default '0',
assetId varchar(22) NOT NULL default '',
templateId varchar(22) NOT NULL default '',
+ displayMode varchar(20) NOT NULL default 'interleaved',
+ hasTerms varchar(255) NOT NULL default '',
PRIMARY KEY (assetId)
) TYPE=MyISAM;
diff --git a/docs/upgrades/upgrade_6.6.1-6.6.2.sql b/docs/upgrades/upgrade_6.6.1-6.6.2.sql
index 3d6068b35..3bee65d9e 100644
--- a/docs/upgrades/upgrade_6.6.1-6.6.2.sql
+++ b/docs/upgrades/upgrade_6.6.1-6.6.2.sql
@@ -1,4 +1,6 @@
insert into webguiVersion values ('6.6.2','upgrade',unix_timestamp());
alter table Shortcut add disableContentLock int(11) NOT NULL default '0';
+alter table SyndicatedContent add column displayMode varchar(20) not null default 'interleaved';
+alter table SyndicatedContent add column hasTerms varchar(255) not null;
update template set template='
' where assetId='PBtmpl0000000000000056';
update template set template='^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n\r\n\r\n
![](\"<tmpl_var)
\" border=\"0\" title=\"
\" alt=\"\" />\r\n\r\n
![\"*\"](\"^Extras;/adminConsole/medalian.gif\")
\r\n
\r\n
\" border=\"0\" title=\"
\" alt=\"\" />\r\n\r\n \r\n
\r\n\r\n \r\n
\r\n\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n
\r\n
+Some terminology: RSS "feeds" (or "channels") are published by websites as collections of "items."
This Syndicated Content client is a Wobject and an Asset, so it has the properties of both. It also has
these unique properties:
URL to RSS file
-Provide the exact URL (starting with http://) to the syndicated content's RDF or RSS file. The syndicated content will be downloaded from this URL hourly.
+Provide the exact URL (starting with http://) to the syndicated content\'s RDF or RSS file. The syndicated content will be downloaded from this URL hourly.
You can find syndicated content at the following locations:
-
+Currently, we can handle RSS versions .90, .91, 1.0, and 2.0. Atom feeds aren\'t supported for now. Probably other RSS-ish files would work too.
-To create an aggregate RSS feed, include a list of space separated URLs instead of a single URL. For an aggregate feed, the system will display an equal number of headlines from each source, sorted by the date the system first received the story.
+To create an aggregate RSS feed (one that pulls information from multiple RSS feeds), include a list of URLs, one on each line, instead of a single URL. Items will be sorted by the date WebGUI first received the story.
+
+Display Mode
+If you\'re aggregating feeds, you can change the mode in which the items are displayed. "Grouped by Feed" means the items will be grouped together by the feeds they come from. "Interleaved" means the items will be mixed together in a "round-robin" fashion from all the feeds. If you\'re grouping your feeds, please look at new_rss_site "item_loop" template variables, it gives you a hook allowing you to output the feed title
+
+
+With any of these terms
+Enter terms (separated by commas) that you\'d like to filter the feeds on. For instance, if you enter:
+
linux, windows development, blogs
+The Syndicated Content web object will display items containing "linux", "windows development" or "blogs" (in the title or description of the item) from all the feeds you\'re aggregating together.
+
Template
Select a template for this content.
Maximum Headlines
-Enter the maximum number of headlines that should be displayed. For an aggregate feed, the system will display an equal number of headlines from each source, even if doing so requires displaying more than the requested maximum number of headlines. Set to zero to allow any number of headlines.
-
|,
- lastUpdated => 1110070203,
- },
-
- '61' => {
- message => q|Syndicated Content, Add/Edit|,
- lastUpdated => 1047855741
- },
-
- '2' => {
- message => q|Syndicated Content|,
- lastUpdated => 1031514049
- },
-
- '1' => {
- message => q|URL to RSS File|,
- lastUpdated => 1031514049
- },
-
- '4' => {
- message => q|Edit Syndicated Content|,
- lastUpdated => 1031514049
- },
-
- '72' => {
- message => q|Syndicated Content Template|,
- lastUpdated => 1047855526
- },
-
- '73' => {
- message => q|The following are the template variables available to the Syndicated Content template.
+Enter the maximum number of headlines that should be displayed. Set to zero to allow any number of headlines.
+
'
+ },
+ '72' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'Syndicated Content Template'
+ },
+ '73' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'The following are the template variables available to the Syndicated Content template.
channel.title
-The title of this piece of syndicated content.
+The title of this piece of syndicated content. This will be the same as the title of the Syndicated Content object when you\'re creating an aggregate feed.
channel.description
-A description of the content available through this channel.
+A description of the content available through this channel. This will be the same as the description of the Syndicated Content object when you\'re creating an aggregate feed.
channel.link
-A URL back to the originating site of this channel.
+A URL back to the originating site of this channel. This variable *will not* exist when you\'re creating an aggregate feed, because there\'s no single channel to link to.
item_loop
@@ -85,21 +91,55 @@ A loop containing the data from this channel.
+site_title
+The title of the RSS feed this item comes from
+
+
+site_link
+Link to the source RSS feed.
+
+
+new_rss_site
+A "boolean" variable (suitable for using in a <tmpl_if> tag) that indicates we\'ve started outputting items from a source RSS feed different than the previous item. This is most useful when you\'re viewing feeds in "grouped" mode- it gives you a hook to output site_title and site_link at the right time.
+
+
+
title
-The title of a piece of content.
+The title of a piece of content. If you\'re filtering on terms, this field will be inspected.
description
-The description of the content.
+The description of the content. If you\'re filtering on terms, this field will be inspected as well.
link
-A URL directly to the original content.
-
-
|,
- lastUpdated => 1047855526
- },
-
-};
+A URL directly to the content of the item.
+'
+ },
+ 'displayModeLabel' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'Display Mode'
+ },
+ 'displayModeSubtext' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => '
"Interleaved" means items from all feeds are lumped together, "Grouped by Feed" means items are grouped by the feed they came from. Either setting is fine if you\'re only bringing in a single feed.'
+ },
+ 'grouped' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'Grouped by Feed'
+ },
+ 'hasTermsLabel' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'With any of these terms'
+ },
+ 'interleaved' => {
+ 'lastUpdated' => 1047855526,
+ 'message' => 'Interleaved'
+ },
+ 'rssTabName' => {
+ 'lastUpdated' => 1118417024,
+ 'message' => 'RSS'
+ }
+ };
1;
diff --git a/sbin/Hourly/GetSyndicatedContent.pm b/sbin/Hourly/GetSyndicatedContent.pm
new file mode 100644
index 000000000..8a39d0bf1
--- /dev/null
+++ b/sbin/Hourly/GetSyndicatedContent.pm
@@ -0,0 +1,34 @@
+package Hourly::GetSyndicatedContent;
+
+use strict;
+use warnings;
+use WebGUI::SQL;
+use WebGUI::Asset::Wobject::SyndicatedContent;
+
+=head2 Hourly::GetSyndicatedContent
+
+Loops through all the URLs in the SyndicatedWobjects and puts them into WebGUI::Cache if they haven't been spidered or if they have expired from the cache. This should reduce HTTP traffic a little, and allow for more granular scheduling of feed downloads in the future.
+
+=cut
+
+
+#-------------------------------------------------------------------
+sub process{
+
+ #In the new Wobject, "rssURL" actually can refer to more than one URL.
+ my @syndicatedWobjectURLs = WebGUI::SQL->buildArray("select rssUrl from SyndicatedContent");
+ foreach my $url(@syndicatedWobjectURLs) {
+
+ #Loop through the SyndicatedWobjects and split all the URLs they are syndicating off into
+ #a separate array.
+
+ my @urlsToSyndicate = split(/\s+/,$url);
+ foreach ((@urlsToSyndicate)) {
+ WebGUI::Asset::Wobject::SyndicatedContent::_get_rss_data($_);
+ }
+ }
+}
+
+
+
+1;
diff --git a/sbin/updateTranslations.pl b/sbin/updateTranslations.pl
new file mode 100755
index 000000000..c319f0b33
--- /dev/null
+++ b/sbin/updateTranslations.pl
@@ -0,0 +1,126 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Data::Dumper;
+use Getopt::Long;
+
+our $webguiRoot;
+
+BEGIN {
+ $webguiRoot = "..";
+ unshift (@INC, $webguiRoot."/lib");
+}
+
+my $language='English';
+my $namespace;
+my $help;
+my $test;
+
+GetOptions(
+ 'language=s'=>\$language,
+ 'namespace=s'=>\$namespace,
+ 'help'=>\$help,
+ 'test'=>\$test
+ );
+
+if ((!$help && !$namespace) or $help){
+ print </ translation files. It sorts the entries
+by key value and takes care of escaping automatically.
+
+Options:
+
+ --language The language you're adding an entry for.
+ Defaults to English
+
+ --help Display this help message and exit.
+
+ --namespace The name of the file you want to manipulate
+ in "lib/WebGUI/i18n/" WITHOUT the .pm
+ extension. So, if you're editing the "Macro_GroupAdd.pm"
+ file, it's "Macro_GroupAdd".
+
+ --test Don't edit the actual file, but create a copy with ".test"
+ appended to the name.
+
+STOP
+ exit;
+}
+
+die('You need to give us a namespace to edit') if (!$namespace);
+
+my $tranmodule=join('::',('WebGUI','i18n',$language,$namespace));
+eval "use $tranmodule;";
+
+if (($@)) {
+ die('Either that namespace does not exist or you spelled it incorrectly. Please try again');
+}
+
+my $variable='$'.$tranmodule.'::I18N';
+my $i18n=eval "$variable";
+
+print "\nEnter a new key value to create a new entry.\nCurrent Keys:\n\n";
+foreach ((keys %$i18n)) {
+ print "$_\n";
+}
+
+my $key='';
+while (lc($key) ne 'quit') {
+ print "\n\nNew Key, or quit to stop:\n";
+ $key=;
+ chomp($key);
+ next if(!$key);
+ last if(lc($key) eq 'quit');
+ if (! defined $i18n->{$key}) {
+ print "\nNew key. Ok?\n";
+ my $input=;
+ chomp($input);
+ if (lc(substr($input,0,1)) eq 'y') {
+ get_info($key,$i18n);
+ }
+ } else {
+ print "\nErm. . . That key's already in use. Please try again.\n";
+ }
+}
+
+
+################################################################################
+sub save_file{
+ open(OUTPUT,">","../lib/WebGUI/i18n/$language/$namespace.pm".(($test) ? '.test' : '')) or die($!);
+ $Data::Dumper::Varname='I18N';
+ $Data::Dumper::Sortkeys=1;
+
+ print OUTPUT "package $tranmodule;\n\n";
+ my $output=Dumper($i18n);
+ $output =~ s/^\$I18N1/\$I18N/i;
+ print OUTPUT "our ".$output;
+ print OUTPUT "1;";
+ close OUTPUT;
+ print "Saved!!\n";
+}
+########################################
+
+
+################################################################################
+sub get_info{
+ my $key=shift;
+ my $i18n=shift;
+ print "\nEnter the new information for this key. Press Ctrl-D to save\n";
+ my @info=;
+ print "\n\nOk? \n";
+ my $input=;
+ chomp($input);
+ if (lc(substr($input,0,1)) eq 'y') {
+ my $string=join("",@info);
+ chomp($string);
+ $i18n->{$key}->{message}=$string;
+ $i18n->{$key}->{lastUpdated}=time;
+ save_file();
+ }
+}
+########################################
![\"?\"](\"^Extras;/adminConsole/small/help.gif\")
\r\n