[pull] master from wzpan:master

README.md

@@ -24,6 +24,7 @@ search:
   path: search.xml
   field: post
   content: true
+  template: ./search.xml
 ```
 
 - **path** - file path. By default is `search.xml` . If the file extension is `.json`, the output format will be JSON. Otherwise XML format file will be exported.
@@ -32,6 +33,7 @@ search:
   * **page** - will only covers all the pages of your blog.
   * **all** - will covers all the posts and pages of your blog.
 - **content** - whether contains the whole content of each article. If `false`, the generated results only cover title and other meta info without mainbody. By default is `true`.
+- **template** (Optional) - path to a custom XML template
 
 ## Exclude indexing
 

lib/json_generator.js

@@ -30,9 +30,7 @@ module.exports = function(locals){
         posts.each(function(post) {
             if (post.indexing != undefined && !post.indexing) return;
             var temp_post = new Object() 
-            if (post.title) { 
-                temp_post.title = post.title 
-            }
+            temp_post.title = post.title || 'No Title'
             if (post.path) { 
                 temp_post.url = config.root + post.path 
             } 
@@ -61,9 +59,7 @@ module.exports = function(locals){
         pages.each(function(page){
             if (page.indexing != undefined && !page.indexing) return;
             var temp_page = new Object() 
-            if (page.title) { 
-                temp_page.title = page.title 
-            } 
+            temp_post.title = post.title || 'No Title'
             if (page.path) { 
                 temp_page.url = config.root + page.path 
             } 

lib/xml_generator.js

@@ -12,12 +12,13 @@ env.addFilter('noControlChars', function(str) {
 	return str && str.replace(/[\x00-\x1F\x7F]/g, '');
 });
 
-var searchTmplSrc = pathFn.join(__dirname, '../templates/search.xml');
-var searchTmpl = nunjucks.compile(fs.readFileSync(searchTmplSrc, 'utf8'), env);
-
 module.exports = function(locals){
   var config = this.config;
   var searchConfig = config.search;
+
+  var searchTmplSrc = searchConfig.template || pathFn.join(__dirname, '../templates/search.xml');
+  var searchTmpl = nunjucks.compile(fs.readFileSync(searchTmplSrc, 'utf8'), env);
+
   var template = searchTmpl;
   var searchfield = searchConfig.field;
   var content = searchConfig.content;
@@ -40,8 +41,8 @@ module.exports = function(locals){
   }
 
   var rootURL;
-  if (config.root == "/" || config.root == null){
-    rootURL = "";
+  if (config.root == null){
+    rootURL = "/";
   }else{
     rootURL = config.root;
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-generator-search",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Seach generator plugin for Hexo",
   "main": "index",
   "directories": {

templates/search.xml

@@ -4,7 +4,11 @@
   {% for post in posts.toArray() %}
     {% if post.indexing == undefined or post.indexing %}
     <entry>
-      <title>{{ post.title }}</title>
+      {% if post.title %}
+        <title>{{ post.title }}</title>
+      {% else %}
+        <title>No Title</title>
+      {% endif %}
       <link href="{{ (url + post.path) | uriencode }}"/>
       <url>{{ (url + post.path) | uriencode }}</url>
       {% if content %}