Changeset 1185 for solr/files/lib/data/solr/SolrBridge.php

Timestamp:

06/26/10 13:29:33 (3 years ago)

Author:

d0nut

Message:

it is possible to display solr status :)

Files:

• solr/files/lib/data/solr/SolrBridge.php (modified) (8 diffs)

solr/files/lib/data/solr/SolrBridge.php

@@ -1 +1 @@
 <?php
+// wcf imports
+require_once(WCF_DIR.'lib/data/message/search/SearchEngine.class.php');
+require_once(WCF_DIR.'lib/data/solr/SolrService.php');
+
 
 /**
@@ -24 +28 @@
         
                 // load search type objects
-                SearchEngne::getSearchTypes();
-                
-                $path = parse_url(SOLR_URL);
-                $this->solr = new SolrService($path['host'], isset($path['port']) ? $path['port'] : 80, $path['path']);
+                SearchEngine::getSearchTypes();
+                
+                $this->solr = new SolrService();
         }
         
@@ -40 +43 @@
                 $sql = "INSERT IGNORE INTO
                                         wcf".WCF_N."_solr_index
-                                        (typeName, messageID)";
+                                        (typeID, messageID)";
                 foreach($this->documents as $doc) {
                         $sql .= ""; //TODO: mark as done
@@ -55 +58 @@
          *
          */
-        protected function getTotals(array $types) {
+        protected function getTotals(array $types, $func) {
 
                 $sql = '';
@@ -70 +73 @@
                         
                         $sql .= "(      
-                                SELECT          MAX(".$messageIDFieldName.") AS messageID,
+                                SELECT          ".$func."(".$messageIDFieldName.") AS messageID,
                                                 '".$type."' AS messageType
                                 FROM            ".$doc->getTableName()." messageTable
                                                 ".$doc->getJoins()."
-                                WHERE           1
-                                                ".(!empty($conditions[$type]) ? " ".(!empty($q) ? "AND" : "")." (".$conditions[$type].")" : "")."
-                                GROUP BY        messageID
                         )";
                 }
@@ -82 +82 @@
                 // send search query
                 $types = array();
-                $result = WCF::getDB()->sendQuery($sql, $limit);
+                $result = WCF::getDB()->sendQuery($sql);
                 while ($row = WCF::getDB()->fetchArray($result)) {
                         $types[$row['messageType']] = $row['messageID'];
@@ -162 +162 @@
                         
                         $this->loadDocuments($row['current'] + 1, min($row['total'], $row['current'] + 1 + $limit));
-                
+
                         // write to solr
                         $this->commit();
@@ -184 +184 @@
                                 'current' => 0,
                                 'total' => 0,
+                                'percent' => 0,
                         );
                 }
                 
                 // read current status
-                
-                while ($row = WCF::getDB()->fetchArray($result)) {
+                $sql = 'SELECT          typeName,
+                                        c
+                        FROM (
+                                SELECT          typeID, 
+                                                COUNT(typeID) AS c
+                                FROM            wcf'.WCF_N.'_solr_index 
+                                GROUP BY        typeID
+                        ) x
+                        INNER JOIN      wcf'.WCF_N.'_searchable_message_type USING(typeID)';
+                while ($row = WCF::getDB()->fetchArray($sql)) {
                         $typeName = $row['typeName'];
-                        $status[$typeName]['current'] = $row['messageID'];
+                        $status[$typeName]['current'] = $row['c'];
                 }
 
                 // read totals
-                foreach ($this->getTotals($type) as $typeName => $total) {
-                        $status[$typeName]['total'] = $row['messageID'];
-                }
-                
-                return $messages;
+                foreach ($this->getTotals($types, 'COUNT') as $typeName => $count) {
+                        $percent = $count ? 100 / $count * $status[$typeName]['current'] : 0;
+                        $status[$typeName]['total'] = $count;
+                }
+                
+                return $status;
         }
 }