Commit b55f20dc authored by Matt Mascarenhas's avatar Matt Mascarenhas

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
parent 7d88e3c1
......@@ -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))
{
case RC_SUCCESS:
case RC_NOOP:
break;
case RC_ERROR_FILE:
case RC_ERROR_MEMORY:
hmml_free(&HMML);
return RC_ERROR_FATAL;
};
if(!HasFilterMenu)
if(Anno->markers[MarkerIndex].type == HMML_CATEGORY)
{
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment