svnno****@sourc*****
svnno****@sourc*****
2008年 7月 10日 (木) 01:43:48 JST
SRADRevision: 692
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=692
Author: tach
Date: 2008-07-10 01:43:48 +0900 (Thu, 10 Jul 2008)
Log Message:
-----------
* Change journal top rss including html description and change URL adding
journal id
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm
slashjp/branches/2.5.0.192/plugins/Journal/journal.pl
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-09 09:34:48 UTC (rev 691)
+++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-09 16:43:48 UTC (rev 692)
@@ -324,11 +324,11 @@
if $item->{'time'};
$encoded_item->{dc}{creator} = $self->encode($item->{creator})
if $item->{creator};
- $encoded_item->{dc}{source} = $item->{source}
- if $item->{source};
- $encoded_item->{dc}{relation} = $item->{relation}
- if $item->{relation};
}
+ $encoded_item->{dc}{source} = $item->{source}
+ if $item->{source};
+ $encoded_item->{dc}{relation} = $item->{relation}
+ if $item->{relation};
for my $key (keys %$item) {
if ($key eq 'description') {
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 09:34:48 UTC (rev 691)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 16:43:48 UTC (rev 692)
@@ -6,8 +6,10 @@
* Add "dc:source" and "dc:relation" to RSS output
* Change "sitename.(rss|ref|xml|atom)" to including all stories even if
section local
+ * Change journal top rss including html description and change URL adding
+ journal id
- -- Taku YASUI <tach****@osdn*****> Wed, 9 Jul 2008 09:33:04 +0000
+ -- Taku YASUI <tach****@osdn*****> Wed, 9 Jul 2008 16:42:42 +0000
slash (2.5.0.192-15) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 09:34:48 UTC (rev 691)
+++ slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 16:43:48 UTC (rev 692)
@@ -330,7 +330,7 @@
$self->sqlConnect;
my $sql = <<EOT;
-SELECT count AS c,nickname,users_journal.uid,users_journal.date,jid AS id,description,journals_text.article
+SELECT count AS c,nickname,users_journal.uid,users_journal.date,jid AS id,description,journals_text.article,posttype
FROM users_journal JOIN users USING (uid)
JOIN journals ON jid=journals.id
JOIN journals_text ON jid=journals_text.id
Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-09 09:34:48 UTC (rev 691)
+++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-09 16:43:48 UTC (rev 692)
@@ -326,9 +326,15 @@
$title =~ s/s$// if $entry->[0] == 1 && ($type eq 'count' || $type eq 'friends');
push @items, {
+ story => {
+ 'time' => $entry->[3],
+ uid => $entry->[2],
+ },
title => $title,
- link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/",
+ link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/$entry->[4]",
+ 'content:encoded' => balanceTags(strip_mode($entry->[6], $entry->[7]), { deep_nesting => 1 }),
description => strip_notags($entry->[6]),
+ relation => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/",
};
}
@@ -339,7 +345,8 @@
'link' => "$gSkin->{absolutedir}/journal.pl?op=top",
},
image => 1,
- items => \@items
+ items => \@items,
+ rdfitemdesc => $constants->{journal_rdfitemdesc},
});
}