Changeset 1281

Timestamp:

02/06/11 15:10:33 (2 years ago)

Author:

Torben Brodt

Message:

woltlab does not support an interface to get the target url from a search result, so i built a wrapper around it, searching for the first link within the h3 tag

Location:

solr

Files:

• files/lib/page/SolrSearchPage.class.php (modified) (5 diffs)
• files/lib/util (added)
• files/lib/util/SolrTemplateWrapperUtil.class.php (added)
• optionals/de.easy-coding.wcf.opensearch/files/lib/page/SolrSearchSuggestionPage.class.php (added)
• optionals/de.easy-coding.wcf.opensearch/templates/openSearch.tpl (modified) (1 diff)
• package.xml (modified) (2 diffs)
• templates/searchResultSolr.tpl (modified) (1 diff)
• templates/solr.tpl (modified) (1 diff)
• templates/solrAtom.tpl (added)

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

@@ -51 +51 @@
                 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');
-        }
         
         /**
@@ -117 +106 @@
                                 $val = array_slice($val, 0, 20, true);
                         }
+                        /*
+                        if($key == 'type') {
+                                $tmp = $val;
+                                $val = array();
+                                foreach($tmp as $key => $value) {
+                                        $key = WCF::getLanguage()->get("wcf.search.type.".$key);
+                                        $val[$key] = $value;
+                                }
+                        }*/
                 }
                 $this->facets = array_filter($facets);
@@ -182 +180 @@
          */
         public function assignVariables() {
+
                 parent::assignVariables();
+                
+                if($this->templateName == 'solrAtom') {
+                        require_once(WCF_DIR.'lib/util/SolrTemplateWrapperUtil.class.php');
+                        $this->messages = SolrTemplateWrapperUtil::parse($this->messages);
+                }
                 
                 $additionalPagesParameters = array();
@@ -190 +194 @@
 
                 WCF::getTPL()->assign(array(
+                        'messages' => $this->messages,
                         'facets' => $this->facets,
                         'additionalPagesParameterString' => $additionalPagesParameters ? '&'.http_build_query($additionalPagesParameters) : '',
@@ -196 +201 @@
                 ));
          }
+        
+        /**
+         * @see Page::show()
+         */
+        public function show() {
+                
+                // overwrite template with atom format
+                if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'atom') {
+                        $this->templateName = 'solrAtom';
+                }
+                if (isset($_REQUEST['num'])) $this->itemsPerPage = intval($_REQUEST['num']);
+                
+                parent::show();
+                
+                // overwrite template with atom format
+                if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'atom') {
+                        header('Content-type: text/xml');
+                }
+        }
 }
 ?>

solr/optionals/de.easy-coding.wcf.opensearch/templates/openSearch.tpl

@@ -1 +1 @@
 <?xml version="1.0" encoding="{@CHARSET}"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-        <ShortName>{@PAGE_TITLE}</ShortName>
-        <Description>{@PAGE_TITLE} {lang}wcf.search.title{/lang}</Description>
+        <ShortName><![CDATA[{lang}{@PAGE_TITLE}{/lang}]]></ShortName>
+        <Description><![CDATA[{lang}{@PAGE_TITLE}{/lang} {lang}wcf.search.title{/lang}]]></Description>
         <Url type="text/html" template="{@PAGE_URL}/index.php?form=SolrSearch&amp;q={literal}{searchTerms}{/literal}"/>
+        <Url type="application/atom+xml" template="{@PAGE_URL}/index.php?form=SolrSearch&amp;format=atom&amp;q={literal}{searchTerms}{/literal}"/>
+<!--    <Url type="application/x-suggestions+json" template="{@PAGE_URL}/index.php?form=SolrSearchSuggestion&amp;q={literal}{searchTerms}{/literal}"/> -->
 </OpenSearchDescription>

solr/package.xml

@@ -6 +6 @@
                 <packagedescription>Solr powered search client. Solr backend needed!</packagedescription>
                 <packagedescription language="de">Das Paket integriert ein Solr Search Interface. Es wird ein zusÀtzlicher Solr Server benötigt.</packagedescription>
-                <version>1.0.0 RC 3</version>
+                <version>1.0.0 RC 4</version>
                 <plugin>com.woltlab.wcf</plugin>
                 <isunique>1</isunique>
@@ -44 +44 @@
                 <languages languagecode="en">en.xml</languages>
         </instructions>
-        
-        <instructions type="update" fromversion="1.0.0 RC 2">
+
+        <instructions type="update" fromversion="1.0.0 RC 3">
                 <files>files.tar</files>
                 <templates>templates.tar</templates>
-                <acptemplates>acptemplates.tar</acptemplates>
-                <sql>update.sql</sql>
                 
                 <!-- languages -->

solr/templates/searchResultSolr.tpl

@@ -15 +15 @@
                 
                 <div class="messageFooter">
-                        <a href="{$item.message->url}" class="externalURL">{@$item.message->displayurl}</a>
+                        <a href="{$item.message->url}{@SID_ARG_2ND}" class="externalURL">{@$item.message->displayurl}</a>
                 </div>
                 <hr />

solr/templates/solr.tpl

@@ -110 +110 @@
                                                                         <div class="containerHead"> 
                                                                                 <h3>{lang}{$headline}{/lang}</h3> 
-                                                                        </div> 
+                                                                        </div>
                                                                          
                                                                         <ul class="dataList">