From b55f20dcb19ff58b4966aed26f340331404da907 Mon Sep 17 00:00:00 2001 From: Matt Mascarenhas Date: Fri, 5 Jan 2018 23:47:00 +0000 Subject: [PATCH] cinera.c: Keep non-topics out of cinera_topics.css You would find @members and ~projects ending up in cinera_topics.css if they were preceded by a topic :category in their annotation --- cinera/cinera.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cinera/cinera.c b/cinera/cinera.c index 165eb17..8d29b19 100644 --- a/cinera/cinera.c +++ b/cinera/cinera.c @@ -14,7 +14,7 @@ typedef struct version CINERA_APP_VERSION = { .Major = 0, .Minor = 5, - .Patch = 19 + .Patch = 20 }; // TODO(matt): Copy in the DB 3 stuff from cinera_working.c @@ -1476,8 +1476,6 @@ InsertCategory(categories *GlobalTopics, categories *LocalTopics, categories *Gl ++GlobalTopics->Count; } - - return; } void @@ -2845,21 +2843,24 @@ AppendedIdentifier: while(MarkerIndex < Anno->marker_count) { - switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker)) + if(Anno->markers[MarkerIndex].type == HMML_CATEGORY) { - case RC_SUCCESS: - case RC_NOOP: - break; - case RC_ERROR_FILE: - case RC_ERROR_MEMORY: - hmml_free(&HMML); - return RC_ERROR_FATAL; - }; - if(!HasFilterMenu) - { - HasFilterMenu = TRUE; + switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker)) + { + case RC_SUCCESS: + case RC_NOOP: + break; + case RC_ERROR_FILE: + case RC_ERROR_MEMORY: + hmml_free(&HMML); + return RC_ERROR_FATAL; + }; + if(!HasFilterMenu) + { + HasFilterMenu = TRUE; + } + InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker); } - InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker); ++MarkerIndex; }