JIRA: RW-2383 Cleanup user object must be removed when extended cleanup is disabled. Empty descriptor fields should be reset

git-svn-id: https://anonsvn.ncbi.nlm.nih.gov/repos/v1/trunk/c++@103508 78c7ea69-d796-4a43-9a09-de51944f1b03

Author: foleyjp

src/app/asn_cleanup/huge_file_cleanup.cpp

@@ -185,6 +185,14 @@ void CCleanupHugeAsnReader::x_CleanupTopLevelDescriptors()
     CCleanup cleanup;
     m_Changes += *cleanup.BasicCleanup(m_top_entry->SetDescr());
 
+    if (m_CleanupOptions & eRemoveNcbiUserObjects) {
+        CCleanup::RemoveNcbiCleanupObject(m_top_entry->SetDescr());
+        if (! m_top_entry->GetDescr().IsSet() ||
+            m_top_entry->GetDescr().Get().empty()) {
+            m_top_entry->SetSet().ResetDescr();
+        }
+    }
+
     if (!x_IsExtendedCleanup()) {
         return;
     }
@@ -217,10 +225,6 @@ void CCleanupHugeAsnReader::x_CleanupTopLevelDescriptors()
         m_Changes.SetChanged(CCleanupChange::eAddNcbiCleanupObject);
     }
 
-    if (m_CleanupOptions & eRemoveNcbiUserObjects) {
-        CCleanup::RemoveNcbiCleanupObject(m_top_entry->SetDescr());
-    }
-
     if (descriptors.empty()) {
         m_top_entry->SetSet().ResetDescr();
     }