Changeset 1190

Timestamp:

07/04/10 10:50:08 (3 years ago)

Author:

d0nut

Message:

finished solr RC 1

Location:

solr

Files:

• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• files/icon (added)
• files/icon/solrL.png (added)
• files/icon/solrM.png (added)
• files/icon/solrS.png (added)
• files/images (added)
• files/images/lucene.png (added)
• files/images/nutch.png (added)
• files/images/solr.png (added)
• files/lib/data/solr/SolrSearch.class.php (modified) (2 diffs)
• files/lib/data/solr/SolrSearchResult.class.php (modified) (2 diffs)
• files/lib/page/SolrSearchPage.class.php (modified) (4 diffs)
• package.xml (modified) (1 diff)
• schema.xml (added)
• smt.xml (modified) (1 diff)
• templates/searchResultSolr.tpl (modified) (2 diffs)
• templates/solr.tpl (added)

solr/de.xml

@@ -4 +4 @@
         <category name="wcf.acp.option">
                 <item name="wcf.acp.option.solr_url"><![CDATA[Solr]]></item>
-                <item name="wcf.acp.option.solr_url.description"><![CDATA[Zum Beispiel http://solr.dein-server.de:80/solr/nutch/]]></item>
+                <item name="wcf.acp.option.solr_url.description"><![CDATA[Zum Beispiel http://www.dein-server.de:80/solr/]]></item>
+        </category>
+        <category name="wcf.header.menu">
+                <item name="wcf.header.menu.user.solr"><![CDATA[Suche]]></item>
+        </category>
+        
+        <!-- admin: menu -->
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.solr"><![CDATA[Suchserver]]></item>
+                <item name="wcf.acp.menu.link.solr.index"><![CDATA[Index]]></item>
+        </category>
+
+        <category name="wcf.acp.solr">
+                <item name="wcf.acp.solr"><![CDATA[Solr]]></item>
         </category>
 </language>

solr/en.xml

@@ -4 +4 @@
         <category name="wcf.acp.option">
                 <item name="wcf.acp.option.solr_url"><![CDATA[Solr]]></item>
-                <item name="wcf.acp.option.solr_url.description"><![CDATA[e.g. http://solr.your-server.com:80/solr/nutch/]]></item>
+                <item name="wcf.acp.option.solr_url.description"><![CDATA[e.g. http://www.your-server.com:80/solr/]]></item>
+        </category>
+        <category name="wcf.header.menu">
+                <item name="wcf.header.menu.user.solr"><![CDATA[Search]]></item>
+        </category>
+        
+        <!-- admin: menu -->
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.solr"><![CDATA[Searchserver]]></item>
+                <item name="wcf.acp.menu.link.solr.index"><![CDATA[Index]]></item>
+        </category>
+
+        <category name="wcf.acp.solr">
+                <item name="wcf.acp.solr"><![CDATA[Solr]]></item>
         </category>
 </language>

solr/files/lib/data/solr/SolrSearch.class.php

@@ -2 +2 @@
 // wcf imports
 require_once(WCF_DIR.'lib/data/message/search/AbstractSearchableMessageType.class.php');
-require_once(WCF_DIR.'lib/data/contest/ContestSearchResult.class.php');
+require_once(WCF_DIR.'lib/data/solr/SolrSearchResult.class.php');
 
 /**
@@ -24 +24 @@
          */
         public function cacheMessageData($messageIDs, $additionalData = null) {
-                $this->messageCache = $additionalData;
+                if(is_array($additionalData)) {
+                        foreach($additionalData as $row) {
+                                $entry = new SolrSearchResult($row);
+                                if($entry->isViewable()) {
+                                        $this->messageCache[$row['messageID']] = $row;
+                                        $this->messageCache[$row['messageID']]['message'] = $entry;
+                                }
+                        }
+                }
         }
         

solr/files/lib/data/solr/SolrSearchResult.class.php

@@ -10 +10 @@
  * @package     de.easy-coding.wcf.solr
  */
-class ContestSearchResult extends DatabaseObject {
-        
-        /**
-         * Returns the formatted message.
-         * 
-         * @return      string
-         */
-        public function getFormattedMessage() {
-                require_once(WCF_DIR.'lib/data/message/bbcode/MessageParser.class.php');
-                MessageParser::getInstance()->setOutputType('text/html');
-                return MessageParser::getInstance()->parse($this->message, $enableSmilies = true, $enableHtml = false, $enableBBCodes = true);
+class SolrSearchResult extends DatabaseObject {
+
+        public function isViewable() {
+                return true;
         }
 
@@ -27 +20 @@
          */
         public function getFormattedMessage() {
-                return SearchResultTextParser::parse(parent::getFormattedMessage());
+                require_once(WCF_DIR.'lib/data/message/bbcode/MessageParser.class.php');
+                MessageParser::getInstance()->setOutputType('text/html');
+                $message = MessageParser::getInstance()->parse($this->message, $enableSmilies = true, $enableHtml = true, $enableBBCodes = true);
+                
+                return SearchResultTextParser::parse($message);
         }
 }

solr/files/lib/page/SolrSearchPage.class.php

@@ -9 +9 @@
  */
 class SolrSearchPage extends SearchResultPage {
+        public $templateName = 'solr';
         protected $total = 0;
         
@@ -24 +25 @@
          * @return      string
          */
-        protected static function convertSingleWhitespace($string) {
+        protected function convertSingleWhitespace($string) {
                 $string = str_replace(array("\t", " ", "\r", "\n", "-", urldecode("%C2%A0")), " ", $string);
                 while(strpos($string, '  ') !== false) {
@@ -31 +32 @@
                 return $string;
         }
+
+        /**
+         * if the client is (or claims to be) connected via HTTPS
+         * @return boolean
+         */
+        protected function isHTTPS() {
+                return isset($_SERVER["HTTP_X_PROTO"]) ||
+                        (isset($_SERVER['HTTPS']) &&
+                                !empty($_SERVER['HTTPS']) &&
+                                $_SERVER['HTTPS'] !== 'off');
+        }
         
         /**
@@ -36 +48 @@
          */
         protected function readSearch() {
+        
+                // seo friendly redirect of page 1
+                if(isset($_GET['pageNo']) && $_GET['pageNo'] == 1) {
+                        $url = ($this->isHTTPS() ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].str_replace("&pageNo=1", "", $_SERVER['REQUEST_URI']);
+                        HeaderUtil::redirect($url, false, true);
+                        exit;
+                }
+                
+                // get search query
+                if (isset($_REQUEST['q'])) $this->query = $_REQUEST['q'];
+        
+                if(!$this->query) {
+                        return;
+                }
+                
+                // param
+                $offset = (max($this->pageNo,1) - 1) * $this->itemsPerPage;
+                $i = $offset;
+
+                // query search
                 $solr = new SolrService(SOLR_URL);
-
-                $tmp = $solr->search($this->query, ($this->pageNo - 1) * $this->itemsPerPage, $this->itemsPerPage);
+                $tmp = $solr->search($this->query, $offset, $this->itemsPerPage);
                 $this->total = intval($tmp->response->numFound);
-
-                $i = 0;
-                foreach($tmp->highlighting as $row) {
-                                        
+                
+                if(!$tmp || !$tmp->highlighting) {
+                        return;
+                }
+                
+                // transform data in wcf compatible format
+                foreach($tmp->highlighting as $url => $row) {
+                        // press first dimension of stdobject into clean array
+                        $data = array();
+                        $data['messageID'] = $i;
+                        $data['message'] = $this->convertSingleWhitespace($row->content[0]);
+                        $data['subject'] = $row->title[0];
+                        $data['url'] = $url;
+                        $data['displayurl'] = $row->url[0];
+                        $data['image'] = 'http://image.browsershots.de/'.parse_url($data['url'], PHP_URL_HOST);
+                        $data['time'] = time(); // TODO: time
+                        $data['messageType'] = 'solr';
+                        $data['type'] = 'solr';
+                
                         //  set solr defaults
-                        if(empty($row->messageType)) {
-                                $row->messageType = 'solr';
+                        if(!empty($row->messageType)) {
+                                $data['messageType'] = $row->messageType;
                         }
-                        if(empty($row->messageID)) {
-                                $row->messageID = $i;
+                        if(!empty($row->type)) {
+                                $data['type'] = $row->type;
                         }
-                
+                        if(!empty($row->messageID)) {
+                                $data['messageID'] = $row->messageID;
+                        }
+        
                         // increment message key position
-                        $this->result[$i++] = $row;
+                        $this->result[$i++] = $data;
                 }
         }

solr/package.xml

@@ -34 +34 @@
                 <pagemenu>pagemenu.xml</pagemenu>
                 <pagelocation>pagelocation.xml</pagelocation>
+                <searchablemessagetypes>smt.xml</searchablemessagetypes>
                 
                 <!-- languages -->

solr/smt.xml

@@ -3 +3 @@
 <data>  
         <import>
-                <smt name="contestEntry">
+                <smt name="solr">
                         <classpath>lib/data/solr/SolrSearch.class.php</classpath>
                 </smt>

solr/templates/searchResultSolr.tpl

@@ -1 @@
-<div class="message content">
+<div class="message content solr">
         <div class="messageInner container-{cycle name='results' values='1,2'}">
                 <div class="messageHeader">
                         <div class="containerIcon">
-                                <a href="index.php?page=Contest&amp;contestID={@$item.message->contestID}&amp;highlight={$query|urlencode}{@SID_ARG_2ND}"><img src="{icon}contestM.png{/icon}" alt="" /></a>
+                                <img src="{$item.message->image}" alt="" />
                         </div>
                         <div class="containerContent">
-                                <p class="light smallFont">{@$item.message->time|time}</p>
-                                <p class="light smallFont">{lang}wcf.contest.by{/lang} <a href="index.php?page=User&amp;userID={@$item.message->userID}{@SID_ARG_2ND}">{$item.message->username}</a></p>
+                                <h3><a href="{$item.message->url}{@SID_ARG_2ND}">{@$item.message->subject}</a></h3>
                         </div>
                 </div>
-                
-                <h3><a href="index.php?page=Contest&amp;contestID={@$item.message->contestID}&amp;highlight={$query|urlencode}{@SID_ARG_2ND}">{$item.message->subject}</a></h3>
                 
                 <div class="messageBody">
@@ -18 +15 @@
                 
                 <div class="messageFooter">
-                        <div class="smallButtons">
-                                <ul>
-                                        <li class="extraButton"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}"><img src="{icon}upS.png{/icon}" alt="" /> <span class="hidden">{lang}wcf.global.scrollUp{/lang}</span></a></li>
-                                </ul>
-                        </div>
+                        <a href="{$item.message->url}" class="externalURL">{@$item.message->displayurl}</a>
                 </div>
                 <hr />