Annotation-Pushers
/
Annotation-System
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Matt Mascarenhas 2018-01-05 23:47:00 +00:00
parent 7d88e3c17d
commit b55f20dcb1
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cinera/cinera.c
View File

@ -14,7 +14,7 @@ typedef struct
version CINERA_APP_VERSION = { version CINERA_APP_VERSION = {
.Major = 0, .Major = 0,
.Minor = 5, .Minor = 5,
.Patch = 19 .Patch = 20
}; };
// TODO(matt): Copy in the DB 3 stuff from cinera_working.c // 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; ++GlobalTopics->Count;
} }
return;
} }
void void
@ -2845,21 +2843,24 @@ AppendedIdentifier:
while(MarkerIndex < Anno->marker_count) while(MarkerIndex < Anno->marker_count)
{ {
switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker)) if(Anno->markers[MarkerIndex].type == HMML_CATEGORY)
{ {
case RC_SUCCESS: switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker))
case RC_NOOP: {
break; case RC_SUCCESS:
case RC_ERROR_FILE: case RC_NOOP:
case RC_ERROR_MEMORY: break;
hmml_free(&HMML); case RC_ERROR_FILE:
return RC_ERROR_FATAL; case RC_ERROR_MEMORY:
}; hmml_free(&HMML);
if(!HasFilterMenu) return RC_ERROR_FATAL;
{ };
HasFilterMenu = TRUE; if(!HasFilterMenu)
{
HasFilterMenu = TRUE;
}
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker);
} }
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker);
++MarkerIndex; ++MarkerIndex;
} }