[glom] Fix restoring from backups.

[Murray Cumming <murrayc src gnome org>]

commit 5ae6f6657dfa890a6830196273e7c1b73ac6d634
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 15 20:04:38 2014 +0100

    Fix restoring from backups.
    
    * glom/appwindow.cc: recreate_database_from_backup():
      Do not try to add the standard groups until after restoring
      from the postgres backup data, because we try (and fail) to
      set groups for standard tables that do not exist yet.

 glom/appwindow.cc |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 75a6205..7c2129d 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -1667,6 +1667,7 @@ bool AppWindow::recreate_database_from_example(bool& user_cancelled)
   return true; //All tables created successfully.
 }
 
+//TODO: Remove duplication with recreate_database_from_example().
 bool AppWindow::recreate_database_from_backup(const Glib::ustring& backup_uri, bool& user_cancelled)
 {
   ShowProgressMessage progress_message(_("Creating Glom database from backup file."));
@@ -1772,12 +1773,7 @@ bool AppWindow::recreate_database_from_backup(const Glib::ustring& backup_uri, b
   {
     std::cerr << G_STRFUNC << ": DbUtils::add_standard_groups(): failed." << std::endl;
     return false;
-
-  //Add any extra groups from the example file:
-  pulse_progress_message();
-  test = DbUtils::add_groups_from_document(pDocument);
-  if(!test)
-    return false;
+  }
 
   //m_pFrame->add_standard_tables(); //Add internal, hidden, tables.
 
@@ -1801,23 +1797,36 @@ bool AppWindow::recreate_database_from_backup(const Glib::ustring& backup_uri, b
     }
   }
 
+  std::cout << G_STRFUNC << ": debug 6" << std::endl;
+
   if(original_dir_path.empty())
   {
     std::cerr << G_STRFUNC << ": original_dir_path is empty." << std::endl;
     return false;
   }
 
+  std::cout << G_STRFUNC << ": debug b1" << std::endl;
+
   //Restore the database from the backup:
   //std::cout << "DEBUG: original_dir_path=" << original_dir_path << std::endl;
   const bool restored = connection_pool->convert_backup(
     sigc::mem_fun(*this, &AppWindow::on_connection_convert_backup_progress), original_dir_path);
 
+  std::cout << G_STRFUNC << ": debug b2: result=" << restored << std::endl;
+
   if(!restored)
   {
     std::cerr << G_STRFUNC << ": Restore failed." << std::endl;
     return false;
   }
 
+  //TODO: Is this necessary?
+  //Add any extra groups from the example file:
+  pulse_progress_message();
+  test = DbUtils::add_groups_from_document(pDocument);
+  if(!test)
+    return false;
+
   return true; //Restore successfully.
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY