wiki-server 0.20.0 → 0.21.0-rc1

package/AUTHORS.txt

@@ -18,3 +18,4 @@ winckell benjamin <winckell.benjamin.isart@gmail.com>
 Eric Dobbs <eric@dobbse.net>
 Joshua Benuck <joshua_benuck@yahoo.com>
 Tom Lieber <tom@alltom.com>
+Andrew Shell <andrew@andrewshell.org>

package/lib/search.coffee

@@ -165,18 +165,18 @@ module.exports = exports = (argv) ->
     try
       switch currentItem.type
         when 'paragraph'
-          pageText += ' ' + currentItem.text.replace /\[{1,2}|\]{1,2}/g, ''
+          pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, ''
         when 'markdown'
-          # really need to extract text from the markdown, but for now just remove link brackets...
-          pageText += ' ' + currentItem.text.replace /\[{1,2}|\]{1,2}/g, ''
+          # really need to extract text from the markdown, but for now just remove link brackets, urls...
+          pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, ''
         when 'html'
           pageText += ' ' + currentItem.text.replace /<[^>]*>/g, ''
         else
           if currentItem.text?
             for line in currentItem.text.split /\r\n?|\n/
-              pageText += ' ' + line.replace /\[{1,2}|\]{1,2}/g, '' unless line.match /^[A-Z]+[ ].*/
+              pageText += ' ' + line.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, '' unless line.match /^[A-Z]+[ ].*/
     catch err
-      console.log "SITE INDEX *** #{wikiName} Error extracting text from '#{currentIndex}' of #{JSON.stringify(array)}", err.message
+      throw new Error("Error extracting text from #{currentIndex}")
     pageText
 
 

package/lib/sitemap.coffee

@@ -58,6 +58,9 @@ module.exports = exports = (argv) ->
         while (match = linkRe.exec(currentItem.text)) != null
           if not collaborativeLinks.has(asSlug(match[1]))
             collaborativeLinks.set(asSlug(match[1]), currentItem.id)
+        if 'reference' == currentItem.type
+          if not collaborativeLinks.has(currentItem.slug)
+            collaborativeLinks.set(currentItem.slug, currentItem.id)
       catch err
         console.log "METADATA *** #{wikiName} Error extracting links from #{currentIndex} of #{JSON.stringify(array)}", err.message
       collaborativeLinks

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.20.0",
+  "version": "0.21.0-rc1",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",