rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Newspaper progressing.

This commit is contained in:
gyboth 2008-12-06 17:37:53 +00:00
parent a9b302bb59
commit 2d078efc0e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/news.c
View File

@ -152,7 +152,7 @@ news_get_title(const GArray *titles, gchar *title, gint *order,
for(i = 0; i < titles->len; i++)
{
gboolean res = misc_string_replace_all_tokens(token_rep_news, g_array_index(titles, NewsText, order[i]).text, title);
/* gboolean res = misc_string_replace_all_tokens(token_rep_news, g_array_index(titles, NewsText, order[i]).text, title); */
/* printf("title: %s %d\n", title, res); */
if(misc_parse_condition(g_array_index(titles, NewsText, order[i]).condition, token_rep_news) &&
misc_string_replace_all_tokens(token_rep_news, g_array_index(titles, NewsText, order[i]).text, title))

6
src/xml_loadsave_newspaper.c
View File

@ -39,6 +39,7 @@ enum
TAG_NEWS_PAPER_ARTICLE_WEEK_ROUND,
TAG_NEWS_PAPER_ARTICLE_TITLE_ID,
TAG_NEWS_PAPER_ARTICLE_SUBTITLE_ID,
TAG_NEWS_PAPER_ARTICLE_TITLE_SMALL,
TAG_NEWS_PAPER_ARTICLE_TITLE,
TAG_NEWS_PAPER_ARTICLE_SUBTITLE,
TAG_END
@ -96,6 +97,7 @@ xml_loadsave_newspaper_end_element (GMarkupParseContext *context,
}
else if(tag == TAG_NEWS_PAPER_ARTICLE_WEEK ||
tag == TAG_NEWS_PAPER_ARTICLE_WEEK_ROUND ||
tag == TAG_NEWS_PAPER_ARTICLE_TITLE_SMALL ||
tag == TAG_NEWS_PAPER_ARTICLE_TITLE ||
tag == TAG_NEWS_PAPER_ARTICLE_TITLE_ID ||
tag == TAG_NEWS_PAPER_ARTICLE_SUBTITLE ||
@ -133,6 +135,8 @@ xml_loadsave_newspaper_text (GMarkupParseContext *context,
new_article.week_number = int_value;
else if(state == TAG_NEWS_PAPER_ARTICLE_WEEK_ROUND)
new_article.week_round_number = int_value;
else if(state == TAG_NEWS_PAPER_ARTICLE_TITLE_SMALL)
new_article.title_small = g_strdup(buf);
else if(state == TAG_NEWS_PAPER_ARTICLE_TITLE)
new_article.title = g_strdup(buf);
else if(state == TAG_NEWS_PAPER_ARTICLE_SUBTITLE)
@ -213,6 +217,8 @@ xml_loadsave_newspaper_write(const gchar *prefix)
TAG_NEWS_PAPER_ARTICLE_WEEK, I1);
xml_write_int(fil, g_array_index(newspaper.articles, NewsPaperArticle, i).week_round_number,
TAG_NEWS_PAPER_ARTICLE_WEEK_ROUND, I1);
xml_write_string(fil, g_array_index(newspaper.articles, NewsPaperArticle, i).title_small,
TAG_NEWS_PAPER_ARTICLE_TITLE_SMALL, I1);
xml_write_string(fil, g_array_index(newspaper.articles, NewsPaperArticle, i).title,
TAG_NEWS_PAPER_ARTICLE_TITLE, I1);
xml_write_string(fil, g_array_index(newspaper.articles, NewsPaperArticle, i).subtitle,