GNOME.org
 

[tracker/wip/carlosg/domain-ontologies: 25/93] ontologies: Move nepomuk files into separate directory

commit 3a93c29a31a16859c3e33ef05a8e54f764a97faf
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jun 4 02:46:04 2017 +0200

    ontologies: Move nepomuk files into separate directory

 docs/reference/ontology/Makefile.am                |    2 +-
 docs/reference/ontology/ontology-docs.sgml         |    4 --
 src/libtracker-direct/tracker-direct.vala          |    2 +-
 src/ontologies/Makefile.am                         |   32 ++++++++++----------
 src/ontologies/{ => nepomuk}/30-nie.description    |    0
 src/ontologies/{ => nepomuk}/30-nie.ontology       |    0
 .../{ => nepomuk}/31-nao-custom.ontology           |    0
 src/ontologies/{ => nepomuk}/32-nco.description    |    0
 src/ontologies/{ => nepomuk}/32-nco.ontology       |    0
 src/ontologies/{ => nepomuk}/33-nfo.description    |    0
 src/ontologies/{ => nepomuk}/33-nfo.ontology       |    0
 src/ontologies/{ => nepomuk}/34-nmo.description    |    0
 src/ontologies/{ => nepomuk}/34-nmo.ontology       |    0
 src/ontologies/{ => nepomuk}/35-ncal.description   |    0
 src/ontologies/{ => nepomuk}/35-ncal.ontology      |    0
 src/ontologies/{ => nepomuk}/36-scal.description   |    0
 src/ontologies/{ => nepomuk}/36-scal.ontology      |    0
 src/ontologies/{ => nepomuk}/37-nid3.description   |    0
 src/ontologies/{ => nepomuk}/37-nid3.ontology      |    0
 src/ontologies/{ => nepomuk}/38-nmm.description    |    0
 src/ontologies/{ => nepomuk}/38-nmm.ontology       |    0
 src/ontologies/{ => nepomuk}/39-mto.description    |    0
 src/ontologies/{ => nepomuk}/39-mto.ontology       |    0
 src/ontologies/{ => nepomuk}/40-mlo.description    |    0
 src/ontologies/{ => nepomuk}/40-mlo.ontology       |    0
 src/ontologies/{ => nepomuk}/41-mfo.description    |    0
 src/ontologies/{ => nepomuk}/41-mfo.ontology       |    0
 src/ontologies/{ => nepomuk}/89-mtp.description    |    0
 src/ontologies/{ => nepomuk}/89-mtp.ontology       |    0
 .../{ => nepomuk}/90-tracker.description           |    0
 src/ontologies/{ => nepomuk}/90-tracker.ontology   |    0
 src/ontologies/{ => nepomuk}/91-maemo.description  |    0
 src/ontologies/{ => nepomuk}/91-maemo.ontology     |    0
 src/ontologies/{ => nepomuk}/92-slo.description    |    0
 src/ontologies/{ => nepomuk}/92-slo.ontology       |    0
 .../{ => nepomuk}/93-libosinfo.description         |    0
 src/ontologies/{ => nepomuk}/93-libosinfo.ontology |    0
 src/tracker-store/tracker-main.vala                |    2 +-
 src/tracker/tracker-sql.c                          |    2 +-
 tests/libtracker-data/tracker-ontology-test.c      |    2 +-
 40 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 7aac494..0053fb1 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -13,7 +13,7 @@ ONTOLOGY_EXPLANATIONS =                                \
 # Generation of the ontology XML files.
 gen-doc.stamp: $(ONTOLOGY_EXPLANATIONS)
        $(MKDIR_P) xml
-       $(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml 
$(top_builddir)/docs/tools/ttlresource2sgml $(top_srcdir)/src/ontologies $(top_srcdir)/docs/ontologies xml/
+       $(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml 
$(top_builddir)/docs/tools/ttlresource2sgml $(top_srcdir)/src/ontologies/nepomuk 
$(top_srcdir)/docs/ontologies xml/
        $(AM_V_GEN) touch $@
 
 version.xml: gen-doc.stamp
diff --git a/docs/reference/ontology/ontology-docs.sgml b/docs/reference/ontology/ontology-docs.sgml
index 47de795..440e65c 100644
--- a/docs/reference/ontology/ontology-docs.sgml
+++ b/docs/reference/ontology/ontology-docs.sgml
@@ -39,11 +39,7 @@
 
   <part id="ontology">
     <title>Ontology</title>
-    <xi:include href="xml/xsd-ontology.xml" />
-    <xi:include href="xml/rdf-ontology.xml" />
-    <xi:include href="xml/dc-ontology.xml" />
     <xi:include href="xml/nie-ontology.xml" />
-    <xi:include href="xml/nao-ontology.xml" />
     <xi:include href="xml/nfo-ontology.xml" />
     <xi:include href="xml/nco-ontology.xml" />
     <xi:include href="xml/nmo-ontology.xml" />
diff --git a/src/libtracker-direct/tracker-direct.vala b/src/libtracker-direct/tracker-direct.vala
index 5c20e90..0382de9 100644
--- a/src/libtracker-direct/tracker-direct.vala
+++ b/src/libtracker-direct/tracker-direct.vala
@@ -202,7 +202,7 @@ public class Tracker.Direct.Connection : Tracker.Sparql.Connection, AsyncInitabl
                if (journal_loc == null)
                        journal_loc = database_loc;
                if (ontology_loc == null)
-                       ontology_loc = File.new_for_path (Path.build_filename (SHAREDIR, "tracker", 
"ontologies"));
+                       ontology_loc = File.new_for_path (Path.build_filename (SHAREDIR, "tracker", 
"ontologies", "nepomuk"));
 
                update_queue = new AsyncQueue<Task> ();
        }
diff --git a/src/ontologies/Makefile.am b/src/ontologies/Makefile.am
index a3e384b..a67bd44 100644
--- a/src/ontologies/Makefile.am
+++ b/src/ontologies/Makefile.am
@@ -8,22 +8,22 @@ internal_config = \
        31-nao.ontology     31-nao.description
 
 config_DATA =                                          \
-       30-nie.ontology     30-nie.description         \
-       32-nco.ontology     32-nco.description         \
-       33-nfo.ontology     33-nfo.description         \
-       34-nmo.ontology     34-nmo.description         \
-       35-ncal.ontology    35-ncal.description        \
-       36-scal.ontology    36-scal.description        \
-       37-nid3.ontology    37-nid3.description        \
-       38-nmm.ontology     38-nmm.description         \
-       39-mto.ontology     39-mto.description         \
-       40-mlo.ontology     40-mlo.description         \
-       41-mfo.ontology     41-mfo.description         \
-       89-mtp.ontology     89-mtp.description         \
-       92-slo.ontology     92-slo.description         \
-       90-tracker.ontology 90-tracker.description     \
-       91-maemo.ontology   91-maemo.description       \
-       93-libosinfo.ontology 93-libosinfo.description
+       nepomuk/30-nie.ontology     nepomuk/30-nie.description         \
+       nepomuk/32-nco.ontology     nepomuk/32-nco.description         \
+       nepomuk/33-nfo.ontology     nepomuk/33-nfo.description         \
+       nepomuk/34-nmo.ontology     nepomuk/34-nmo.description         \
+       nepomuk/35-ncal.ontology    nepomuk/35-ncal.description        \
+       nepomuk/36-scal.ontology    nepomuk/36-scal.description        \
+       nepomuk/37-nid3.ontology    nepomuk/37-nid3.description        \
+       nepomuk/38-nmm.ontology     nepomuk/38-nmm.description         \
+       nepomuk/39-mto.ontology     nepomuk/39-mto.description         \
+       nepomuk/40-mlo.ontology     nepomuk/40-mlo.description         \
+       nepomuk/41-mfo.ontology     nepomuk/41-mfo.description         \
+       nepomuk/89-mtp.ontology     nepomuk/89-mtp.description         \
+       nepomuk/92-slo.ontology     nepomuk/92-slo.description         \
+       nepomuk/90-tracker.ontology nepomuk/90-tracker.description     \
+       nepomuk/91-maemo.ontology   nepomuk/91-maemo.description       \
+       nepomuk/93-libosinfo.ontology nepomuk/93-libosinfo.description
 
 # GResource
 tracker_gresource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/builtin-ontology.gresource.xml)
diff --git a/src/ontologies/30-nie.description b/src/ontologies/nepomuk/30-nie.description
similarity index 100%
rename from src/ontologies/30-nie.description
rename to src/ontologies/nepomuk/30-nie.description
diff --git a/src/ontologies/30-nie.ontology b/src/ontologies/nepomuk/30-nie.ontology
similarity index 100%
rename from src/ontologies/30-nie.ontology
rename to src/ontologies/nepomuk/30-nie.ontology
diff --git a/src/ontologies/31-nao-custom.ontology b/src/ontologies/nepomuk/31-nao-custom.ontology
similarity index 100%
rename from src/ontologies/31-nao-custom.ontology
rename to src/ontologies/nepomuk/31-nao-custom.ontology
diff --git a/src/ontologies/32-nco.description b/src/ontologies/nepomuk/32-nco.description
similarity index 100%
rename from src/ontologies/32-nco.description
rename to src/ontologies/nepomuk/32-nco.description
diff --git a/src/ontologies/32-nco.ontology b/src/ontologies/nepomuk/32-nco.ontology
similarity index 100%
rename from src/ontologies/32-nco.ontology
rename to src/ontologies/nepomuk/32-nco.ontology
diff --git a/src/ontologies/33-nfo.description b/src/ontologies/nepomuk/33-nfo.description
similarity index 100%
rename from src/ontologies/33-nfo.description
rename to src/ontologies/nepomuk/33-nfo.description
diff --git a/src/ontologies/33-nfo.ontology b/src/ontologies/nepomuk/33-nfo.ontology
similarity index 100%
rename from src/ontologies/33-nfo.ontology
rename to src/ontologies/nepomuk/33-nfo.ontology
diff --git a/src/ontologies/34-nmo.description b/src/ontologies/nepomuk/34-nmo.description
similarity index 100%
rename from src/ontologies/34-nmo.description
rename to src/ontologies/nepomuk/34-nmo.description
diff --git a/src/ontologies/34-nmo.ontology b/src/ontologies/nepomuk/34-nmo.ontology
similarity index 100%
rename from src/ontologies/34-nmo.ontology
rename to src/ontologies/nepomuk/34-nmo.ontology
diff --git a/src/ontologies/35-ncal.description b/src/ontologies/nepomuk/35-ncal.description
similarity index 100%
rename from src/ontologies/35-ncal.description
rename to src/ontologies/nepomuk/35-ncal.description
diff --git a/src/ontologies/35-ncal.ontology b/src/ontologies/nepomuk/35-ncal.ontology
similarity index 100%
rename from src/ontologies/35-ncal.ontology
rename to src/ontologies/nepomuk/35-ncal.ontology
diff --git a/src/ontologies/36-scal.description b/src/ontologies/nepomuk/36-scal.description
similarity index 100%
rename from src/ontologies/36-scal.description
rename to src/ontologies/nepomuk/36-scal.description
diff --git a/src/ontologies/36-scal.ontology b/src/ontologies/nepomuk/36-scal.ontology
similarity index 100%
rename from src/ontologies/36-scal.ontology
rename to src/ontologies/nepomuk/36-scal.ontology
diff --git a/src/ontologies/37-nid3.description b/src/ontologies/nepomuk/37-nid3.description
similarity index 100%
rename from src/ontologies/37-nid3.description
rename to src/ontologies/nepomuk/37-nid3.description
diff --git a/src/ontologies/37-nid3.ontology b/src/ontologies/nepomuk/37-nid3.ontology
similarity index 100%
rename from src/ontologies/37-nid3.ontology
rename to src/ontologies/nepomuk/37-nid3.ontology
diff --git a/src/ontologies/38-nmm.description b/src/ontologies/nepomuk/38-nmm.description
similarity index 100%
rename from src/ontologies/38-nmm.description
rename to src/ontologies/nepomuk/38-nmm.description
diff --git a/src/ontologies/38-nmm.ontology b/src/ontologies/nepomuk/38-nmm.ontology
similarity index 100%
rename from src/ontologies/38-nmm.ontology
rename to src/ontologies/nepomuk/38-nmm.ontology
diff --git a/src/ontologies/39-mto.description b/src/ontologies/nepomuk/39-mto.description
similarity index 100%
rename from src/ontologies/39-mto.description
rename to src/ontologies/nepomuk/39-mto.description
diff --git a/src/ontologies/39-mto.ontology b/src/ontologies/nepomuk/39-mto.ontology
similarity index 100%
rename from src/ontologies/39-mto.ontology
rename to src/ontologies/nepomuk/39-mto.ontology
diff --git a/src/ontologies/40-mlo.description b/src/ontologies/nepomuk/40-mlo.description
similarity index 100%
rename from src/ontologies/40-mlo.description
rename to src/ontologies/nepomuk/40-mlo.description
diff --git a/src/ontologies/40-mlo.ontology b/src/ontologies/nepomuk/40-mlo.ontology
similarity index 100%
rename from src/ontologies/40-mlo.ontology
rename to src/ontologies/nepomuk/40-mlo.ontology
diff --git a/src/ontologies/41-mfo.description b/src/ontologies/nepomuk/41-mfo.description
similarity index 100%
rename from src/ontologies/41-mfo.description
rename to src/ontologies/nepomuk/41-mfo.description
diff --git a/src/ontologies/41-mfo.ontology b/src/ontologies/nepomuk/41-mfo.ontology
similarity index 100%
rename from src/ontologies/41-mfo.ontology
rename to src/ontologies/nepomuk/41-mfo.ontology
diff --git a/src/ontologies/89-mtp.description b/src/ontologies/nepomuk/89-mtp.description
similarity index 100%
rename from src/ontologies/89-mtp.description
rename to src/ontologies/nepomuk/89-mtp.description
diff --git a/src/ontologies/89-mtp.ontology b/src/ontologies/nepomuk/89-mtp.ontology
similarity index 100%
rename from src/ontologies/89-mtp.ontology
rename to src/ontologies/nepomuk/89-mtp.ontology
diff --git a/src/ontologies/90-tracker.description b/src/ontologies/nepomuk/90-tracker.description
similarity index 100%
rename from src/ontologies/90-tracker.description
rename to src/ontologies/nepomuk/90-tracker.description
diff --git a/src/ontologies/90-tracker.ontology b/src/ontologies/nepomuk/90-tracker.ontology
similarity index 100%
rename from src/ontologies/90-tracker.ontology
rename to src/ontologies/nepomuk/90-tracker.ontology
diff --git a/src/ontologies/91-maemo.description b/src/ontologies/nepomuk/91-maemo.description
similarity index 100%
rename from src/ontologies/91-maemo.description
rename to src/ontologies/nepomuk/91-maemo.description
diff --git a/src/ontologies/91-maemo.ontology b/src/ontologies/nepomuk/91-maemo.ontology
similarity index 100%
rename from src/ontologies/91-maemo.ontology
rename to src/ontologies/nepomuk/91-maemo.ontology
diff --git a/src/ontologies/92-slo.description b/src/ontologies/nepomuk/92-slo.description
similarity index 100%
rename from src/ontologies/92-slo.description
rename to src/ontologies/nepomuk/92-slo.description
diff --git a/src/ontologies/92-slo.ontology b/src/ontologies/nepomuk/92-slo.ontology
similarity index 100%
rename from src/ontologies/92-slo.ontology
rename to src/ontologies/nepomuk/92-slo.ontology
diff --git a/src/ontologies/93-libosinfo.description b/src/ontologies/nepomuk/93-libosinfo.description
similarity index 100%
rename from src/ontologies/93-libosinfo.description
rename to src/ontologies/nepomuk/93-libosinfo.description
diff --git a/src/ontologies/93-libosinfo.ontology b/src/ontologies/nepomuk/93-libosinfo.ontology
similarity index 100%
rename from src/ontologies/93-libosinfo.ontology
rename to src/ontologies/nepomuk/93-libosinfo.ontology
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala
index 2bfcefa..f39b2f2 100644
--- a/src/tracker-store/tracker-main.vala
+++ b/src/tracker-store/tracker-main.vala
@@ -353,7 +353,7 @@ License which can be viewed at:
                                File.new_for_path (Path.build_filename (Environment.get_user_data_dir (), 
"tracker", "data"));
                        File final_ontology_location = ontology_location != null ?
                                File.new_for_path (ontology_location.replace ("%HOME%", 
Environment.get_home_dir()).replace("%SHAREDIR%", SHAREDIR)) :
-                               File.new_for_path (Path.build_filename (SHAREDIR, "tracker", "ontologies"));
+                               File.new_for_path (Path.build_filename (SHAREDIR, "tracker", "ontologies", 
"nepomuk"));
 
                        Tracker.Data.Manager.init (flags,
                                                   final_cache_location,
diff --git a/src/tracker/tracker-sql.c b/src/tracker/tracker-sql.c
index 05f6c83..a4c2852 100644
--- a/src/tracker/tracker-sql.c
+++ b/src/tracker/tracker-sql.c
@@ -107,7 +107,7 @@ sql_by_query (void)
        data_location = g_file_new_for_path (dir);
        g_free (dir);
 
-       dir = g_build_filename (SHAREDIR, "tracker", "ontologies", NULL);
+       dir = g_build_filename (SHAREDIR, "tracker", "ontologies", "nepomuk", NULL);
        ontology_location = g_file_new_for_path (dir);
        g_free (dir);
 
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index e050285..bd0b810 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -245,7 +245,7 @@ test_query (TestInfo      *test_info,
        test_prefix = g_build_filename (prefix, test_info->test_name, NULL);
        g_free (prefix);
 
-       ontology_path = g_build_filename (TOP_SRCDIR, "src", "ontologies", NULL);
+       ontology_path = g_build_filename (TOP_SRCDIR, "src", "ontologies", "nepomuk", NULL);
        ontology_location = g_file_new_for_path (ontology_path);
        g_free (ontology_path);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]