- search by modification date of the file, not when the file has been tagged or somet...

- make "search files modified today" work

Thanks to Daniel Winter for the patch!

CCMAIL: dw@danielwinter.de

svn path=/trunk/KDE/kdebase/apps/; revision=1070440

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb693ad07bdf25c2c57e1fa5ed0527188962d175..7585ad8e0ec2fbed65ecf8491f52dbb3bf6ce576 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -184,7 +184,8 @@ endif(Nepomuk_FOUND)
 
 if(Nepomuk_FOUND)
     include(SopranoAddOntology)
-    soprano_add_ontology(dolphin_SRCS "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig" "NFO" "Nepomuk::Vocabulary" "trig")
+    soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Nepomuk::Vocabulary" "trig")
+    soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Nepomuk::Vocabulary" "trig")
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)

diff --git a/src/search/searchcriterionselector.cpp b/src/search/searchcriterionselector.cpp
index 4b74a5dc145845655d2890ef0205d286c1c26975..b620080292969a5ddfc80d5e9870a0054f53914e 100644 (file)
--- a/src/search/searchcriterionselector.cpp
+++ b/src/search/searchcriterionselector.cpp
@@ -25,6 +25,7 @@
 #include <nepomuk/literalterm.h>
 #include <nepomuk/query.h>
 
+#include "nie.h"
 #include "searchcriterionvalue.h"
 
 #include <Soprano/LiteralValue>
@@ -169,7 +170,7 @@ void SearchCriterionSelector::createDescriptions()
     // add "Date" description
     QList<SearchCriterionDescription::Comparator> dateComps;
     dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Anytime")));
-    dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Today"), Nepomuk::Query::ComparisonTerm::Equal, "today"));
+    dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Today"), Nepomuk::Query::ComparisonTerm::GreaterOrEqual, "today"));
     dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "This Week"), Nepomuk::Query::ComparisonTerm::GreaterOrEqual, "thisWeek"));
     dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "This Month"), Nepomuk::Query::ComparisonTerm::GreaterOrEqual, "thisMonth"));
     dateComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "This Year"), Nepomuk::Query::ComparisonTerm::GreaterOrEqual, "thisYear"));
@@ -180,7 +181,7 @@ void SearchCriterionSelector::createDescriptions()
     DateValue* dateValue = new DateValue(this);
     dateValue->hide();
     SearchCriterionDescription date(i18nc("@label", "Date:"),
-                                    Soprano::Vocabulary::NAO::lastModified(),
+                                    Nepomuk::Vocabulary::NIE::lastModified(),
                                     dateComps,
                                     dateValue);
     Q_ASSERT(static_cast<int>(SearchCriterionSelector::Date) == 0);