Separate generators links for news and the blog.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@43 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/atom_10.tmpl b/atom_10.tmpl
index b4b040a0ffc8fdc47269287cc30f582ea81c21a1..ae5ea1e62428064c21b99ac0a36c872805884cee 100644 (file)
--- a/atom_10.tmpl
+++ b/atom_10.tmpl
@@ -10,7 +10,7 @@
     <name>$author</name>
     <email>$email</email>
   </author>
-  <generator uri="http://phd.pp.ru/about/make/make-news.py.txt">http://phd.pp.ru/about/</generator>
+  <generator uri="http://phd.pp.ru/about/make/${generator}.txt">http://phd.pp.ru/about/make/${generator}.txt</generator>
 #for $post in $posts
   <entry>
     <title>$post.title</title>

diff --git a/make-news.py b/make-news.py
index 50890ec1fd9ff5526c4ed45f45903ea251c69007..5d196bf9760b9e83adbf3c0af772db9c51485a99 100755 (executable)
--- a/make-news.py
+++ b/make-news.py
@@ -68,6 +68,7 @@ namespace = {
    "lang": lang,
    "author": "Oleg Broytmann",
    "email": "phd@phd.pp.ru",
+   "generator": os.path.basename(sys.argv[0]),
    "posts": news_items,
 }
 

diff --git a/reindex_blog.py b/reindex_blog.py
index b5ba18ef8f38229c39f320d91fc0398db92e044a..b75104df2c2a18f4be44d37672580e63d7590589 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -401,6 +401,7 @@ namespace = {
    "lang": "ru",
    "author": "Oleg Broytmann",
    "email": "phd@phd.pp.ru",
+   "generator": os.path.basename(sys.argv[0]),
    "posts": items,
 }
 

diff --git a/rss_20.tmpl b/rss_20.tmpl
index 5fa26fff59fac2b5668f4cea64f44a5b75b41963..e1779be6b4d0496509218fc9e5f40ec75aa82299 100644 (file)
--- a/rss_20.tmpl
+++ b/rss_20.tmpl
@@ -7,7 +7,7 @@
     <language>$lang</language>
     <webMaster>$author &lt;$email&gt;</webMaster>
     <lastBuildDate>${posts[0].rfc822_date}</lastBuildDate>
-    <generator>http://phd.pp.ru/about/make/make-news.py.txt</generator>
+    <generator>http://phd.pp.ru/about/make/${generator}.txt</generator>
 #for $post in $posts
     <item>
       <title>$post.title</title>