add explanatory output to load-vocab command

NatLibFi · Sep 2, 2022 · bd21582 · bd21582
1 parent ecd067b
commit bd21582
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/annif/cli.py b/annif/cli.py
@@ -279,15 +279,18 @@ def run_load_vocab(vocab_id, language, force, subjectfile):
     if annif.corpus.SubjectFileSKOS.is_rdf_file(subjectfile):
         # SKOS/RDF file supported by rdflib
         subjects = annif.corpus.SubjectFileSKOS(subjectfile)
+        click.echo(f"Loading vocabulary from SKOS file {subjectfile}...")
     elif annif.corpus.SubjectFileCSV.is_csv_file(subjectfile):
         # CSV file
         subjects = annif.corpus.SubjectFileCSV(subjectfile)
+        click.echo(f"Loading vocabulary from CSV file {subjectfile}...")
     else:
         # probably a TSV file - we need to know its language
         if not language:
             click.echo("Please use --language option to set the language of " +
                        "a TSV vocabulary.", err=True)
             sys.exit(1)
+        click.echo(f"Loading vocabulary from TSV file {subjectfile}...")
         subjects = annif.corpus.SubjectFileTSV(subjectfile, language)
     vocab.load_vocabulary(subjects, force=force)
 

diff --git a/annif/vocab.py b/annif/vocab.py
@@ -111,13 +111,15 @@ def load_vocabulary(self, subject_corpus, force=False):
 
         if not force and os.path.exists(
                 os.path.join(self.datadir, self.INDEX_FILENAME_CSV)):
-            logger.info('updating existing vocabulary')
+            logger.info('updating existing subject index')
             self._subjects = self._update_subject_index(subject_corpus)
         else:
+            logger.info('creating subject index')
             self._subjects = self._create_subject_index(subject_corpus)
 
-        subject_corpus.save_skos(
-            os.path.join(self.datadir, self.INDEX_FILENAME_TTL))
+        skosfile = os.path.join(self.datadir, self.INDEX_FILENAME_TTL)
+        logger.info(f'saving vocabulary into SKOS file {skosfile}')
+        subject_corpus.save_skos(skosfile)
 
     def as_graph(self):
         """return the vocabulary as an rdflib graph"""