[tracker/tracker-0.10] libtracker-data: Use ontology from database if cache is unavailable

[Martyn James Russell <mr src gnome org>]

commit befea2e877f590fd36904ef94969fe31fb210a60
Author: JÃrg Billeter <j bitron ch>
Date:   Thu Sep 1 10:01:06 2011 +0200

    libtracker-data: Use ontology from database if cache is unavailable
    
    Fixes NB#279789.

 src/libtracker-data/tracker-data-manager.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index dedd576..750f269 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -3857,8 +3857,16 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 			check_ontology = FALSE;
 
 			if (gvdb_error) {
-				g_error ("Error loading ontology cache: %s",
-				         gvdb_error->message);
+				g_critical ("Error loading ontology cache: %s",
+				            gvdb_error->message);
+				g_clear_error (&gvdb_error);
+
+				/* fall back to loading ontology from database into memory */
+				db_get_static_data (iface, &internal_error);
+				if (internal_error) {
+					g_propagate_error (error, internal_error);
+					return FALSE;
+				}
 			}
 		}