Drop Solr collections before re-creating them in manage.py reindex

arkindex/documents/indexer.py

@@ -186,8 +186,11 @@ class Indexer(object):
         """
         Drop an existing collection
         """
-        solr.delete_doc_by_query(self.collection_name, '*:*', **self.solr_options)
-        logger.info(f'Dropped index for {self.collection_name}')
+        if solr.collections.exists(self.collection_name):
+            solr.delete_doc_by_query(self.collection_name, '*:*', **self.solr_options)
+            logger.info(f'Dropped index for {self.collection_name}')
+        else:
+            logger.info(f'Skipping drop for {self.collection_name}: collection does not exist')
 
     def get_elements(self):
         # First make the query that returns all indexable elements.

arkindex/documents/management/commands/reindex.py

@@ -48,9 +48,9 @@ class Command(BaseCommand):
         for corpus in corpora:
             self.stdout.write(f"Indexing {corpus.name}")
             indexer = Indexer(corpus.id)
-            indexer.setup()
-            if options.get('setup'):
-                return
             if options.get('drop'):
                 indexer.drop_index()
+            indexer.setup()
+            if options.get('setup'):
+                continue
             indexer.index()