From 6f6d8eaf8aeb08515d5f11b224d3d5a25b092e78 Mon Sep 17 00:00:00 2001
From: Eugene Crosser <crosser@average.org>
Date: Thu, 4 Sep 2008 21:33:39 +0000
Subject: [PATCH] work in progress on rss generation

---
 mkgallery.pl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mkgallery.pl b/mkgallery.pl
index 40840b7..bf37dde 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -109,7 +109,7 @@ sub new {
 				-depth=>$parent->{-depth}+1,
 				-base=>$name,
 				-fullpath=>$parent->{-fullpath}.'/'.$name,
-				-relpath=>$parent->{-relpath}.'/'.$name,
+				-relpath=>$parent->{-relpath}.$name.'/',
 				-inc=>'../'.$parent->{-inc},
 			};
 	} else {
@@ -164,6 +164,7 @@ sub initpaths {
 		}
 		my $relpath = substr($fullpath,$pos);
 		$relpath =~ s%^/%%;
+		$relpath .= '/' if ($relpath);
 		$self->{-relpath} = $relpath;
 		$self->{-toppath} = substr($fullpath,0,$pos);
 		#print "rel=$relpath, top=$self->{-toppath}, inc=$inc\n";
@@ -179,7 +180,7 @@ sub initrss {
 	my $self=shift;		# this is not a method but we cheat
 	my $fullpath=$self->{-fullpath};
 	my $inc=$self->{-inc}.$incdir.'/';
-	my $conffile=$inc.'rss.conf';
+	my $conffile=$self->{-toppath}.'/'.$incdir.'/rss.conf';
 	my $CONF;
 
 	if ($rssfile) {
@@ -629,11 +630,11 @@ sub startindex {
 	my $inc = $self->{-inc}.$incdir.'/';
 	my $title = $self->{-title};
 	my $rsslink="";
-	if ($self->{-rss}) {
+	if ($rssobj) {
 		$rsslink=Link({-rel=>'alternate',
 				-type=>'application/rss+xml',
 				-title=>'RSS',
-				-href=>$self->{-rss}});
+				-href=>$self->{-inc}.$rssfile});
 	}
 	print $IND start_html(-title => $title,
 			-encoding=>"utf-8",
@@ -657,7 +658,7 @@ sub startindex {
 				-id => 'indexContainer'}),
 		"\n";
 	my $EVL;
-	if (open($EVL,$inc.'header.pl')) {
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/header.pl')) {
 		my $prm;
 		while (<$EVL>) {
 			$prm .= $_;
@@ -682,7 +683,7 @@ sub endindex {
 
 	print $IND end_div;
 	my $EVL;
-	if (open($EVL,$self->{-inc}.$incdir.'/footer.pl')) {
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/footer.pl')) {
 		my $prm;
 		while (<$EVL>) {
 			$prm .= $_;
@@ -706,7 +707,7 @@ sub endindex {
 				$self->{-numofimgs},
 				$self->{-numofsubs};
 		my $rsslink=$rssobj->{'rss'}->channel('link').
-			$self->{-relpath}."/index.html";
+			$self->{-relpath}."index.html";
 		$rssobj->{'rss'}->add_item(
 			title		=> $self->{-title},
 			link		=> $rsslink,
-- 
2.39.2