[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/strigi/src
From:       Jos van den Oever <jos () vandenoever ! info>
Date:       2006-09-01 11:04:37
Message-ID: 1157108677.120579.6332.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579589 by vandenoever:

Small warning fixes

 M  +5 -3      daemon/CMakeLists.txt  
 M  +2 -2      daemon/dbus/dbusmessagereader.cpp  
 M  +2 -2      daemon/dbus/dbusmessagereader.h  
 M  +1 -1      estraierindexer/estraierindexwriter.cpp  
 M  +24 -8     searchclient/gui.py  
 M  +1 -1      searchclient/searchview.cpp  
 M  +1 -1      streamindexer/query.cpp  


--- trunk/playground/base/strigi/src/daemon/CMakeLists.txt #579588:579589
@@ -1,4 +1,5 @@
-set(DIRS xsd eventlistener)
+# xsd has been removed until the next release
+set(DIRS eventlistener)
 
 IF(ENABLE_DBUS)
   set(DIRS ${DIRS} dbus)
@@ -43,11 +44,12 @@
 
 include_directories( eventlistener .)
 
+# daemonconfiguration has been removed until the next release
 add_executable(strigidaemon daemon.cpp socketserver.cpp interface.cpp
-	indexscheduler.cpp clientinterface.cpp daemonconfiguration.cpp
+	indexscheduler.cpp clientinterface.cpp
 	filtermanager.cpp strigilogging.h strigithread.cpp)
 
-set(strigidaemon_LIBS streamindexer eventlistener daemonconfiguration
+set(strigidaemon_LIBS streamindexer eventlistener
 	${CMAKE_THREAD_LIBS_INIT} ${strigidaemon_LIBS})
 target_link_libraries(strigidaemon ${strigidaemon_LIBS})
 
--- trunk/playground/base/strigi/src/daemon/dbus/dbusmessagereader.cpp #579588:579589
@@ -10,7 +10,7 @@
     }
 }
 DBusMessageReader&
-DBusMessageReader::operator>>(uint32_t& s) {
+DBusMessageReader::operator>>(dbus_uint32_t& s) {
     if (!isOk()) return *this;
     if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&it)) {
         close();
@@ -32,7 +32,7 @@
     return *this;
 }
 DBusMessageReader&
-DBusMessageReader::operator>>(uint64_t& s) {
+DBusMessageReader::operator>>(dbus_uint64_t& s) {
     if (!isOk()) return *this;
     if (DBUS_TYPE_UINT64 != dbus_message_iter_get_arg_type(&it)) {
         close();
--- trunk/playground/base/strigi/src/daemon/dbus/dbusmessagereader.h #579588:579589
@@ -29,9 +29,9 @@
     DBusMessageReader& operator>>(std::set<std::string>& s);
     DBusMessageReader& operator>>(std::vector<char>& s);
     DBusMessageReader& operator>>(std::string& s);
-    DBusMessageReader& operator>>(uint32_t& s);
+    DBusMessageReader& operator>>(dbus_uint32_t& s);
     DBusMessageReader& operator>>(int32_t& s);
-    DBusMessageReader& operator>>(uint64_t& s);
+    DBusMessageReader& operator>>(dbus_uint64_t& s);
     DBusMessageReader& operator>>(int64_t& s);
     bool isOk() const { return ok; }
 };
--- trunk/playground/base/strigi/src/estraierindexer/estraierindexwriter.cpp #579588:579589
@@ -65,7 +65,7 @@
 
     est_doc_add_attr(doc, "@uri", idx->getName().c_str());
     char numbuf[64];
-    sprintf(numbuf, "%llu", (uint64_t)idx->getMTime());
+    sprintf(numbuf, "%llu", (int64_t)idx->getMTime());
     est_doc_add_attr(doc, "@mdate", numbuf);
     sprintf(numbuf, "%i", idx->getDepth());
     est_doc_add_attr(doc, "depth", numbuf);
--- trunk/playground/base/strigi/src/searchclient/gui.py #579588:579589
@@ -4,14 +4,9 @@
 
 class StrigiResults(QListBox):
 
-    def __init__(self, *args):
+    def __init__(self, strigi, *args):
         apply(QListBox.__init__, (self,) + args)
-        bus = dbus.SessionBus()
-        # make a connection to the strigi daemon
-        obj = bus.get_object('vandenoever.strigi', '/search')
-        self.strigi = dbus.Interface(obj, 'vandenoever.strigi')
-        #self.strigi.setIndexedDirectories("/home/oever/dbuspython")
-        #self.strigi.startIndexing()
+        self.strigi = strigi
 
     def slotStartSearch(self, q):
         results = self.strigi.getHits(str(q), 10, 0)
@@ -19,13 +14,34 @@
         for i in results:
             self.insertItem(i[0])
 
+def getStrigi():
+    # connect to DBus
+    try:
+        bus = dbus.SessionBus()
+    except:
+        print "DBus is not running."
+    # make a connection to the strigi daemon
+    try:
+        obj = bus.get_object('vandenoever.strigi', '/search')
+        strigi = dbus.Interface(obj, 'vandenoever.strigi')
+        strigi.getStatus()
+    except:
+        strigi = None
+        print "Strigi is not running."
+    return strigi
+
 def main(args):
     app = QApplication(sys.argv)
+    
+    strigi = getStrigi()
+    if strigi == None:
+        app.quit()
+        return
     QObject.connect(app, SIGNAL('lastWindowClosed()'),
                     app, SLOT('quit()'))
     vbox = QVBox()
     text = QLineEdit(vbox)
-    box = StrigiResults(vbox)
+    box = StrigiResults(strigi, vbox)
     QObject.connect(text, SIGNAL('textChanged(const QString &)'),
                     box.slotStartSearch)
     app.setMainWidget(vbox)
--- trunk/playground/base/strigi/src/searchclient/searchview.cpp #579588:579589
@@ -60,7 +60,7 @@
     int laste = -1;
     while (pos >= 0 && out.length()+laste-lasts < maxlen) {
         int rep = -1;
-        int len;
+        int len = 0;
         for (uint i=0; i<res.size(); ++i) {
             int p = t.indexOf(res[i], pos);
             if (p > 0 && (rep == -1 || p < rep)) {
--- trunk/playground/base/strigi/src/streamindexer/query.cpp #579588:579589
@@ -124,7 +124,7 @@
         if (*p == '\0') return p;
     }
     const char* prefix = 0;
-    const char* prefend;
+    const char* prefend = 0;
     const char* term = p;
     // skip until end of string or closing quote or colon or whitespace
     while (*p != '\0' && ((quote == 0 && !isspace(*p))
[prev in list] [next in list] [prev in thread] [next in thread]