wiki-server 0.21.0-rc.1 → 0.21.0-rc.2

package/lib/search.coffee

@@ -162,21 +162,23 @@ module.exports = exports = (argv) ->
         itself.stop()
 
   extractPageText = (pageText, currentItem, currentIndex, array) ->
+    # console.log('extractPageText', pageText, currentItem, currentIndex, array)
     try
-      switch currentItem.type
-        when 'paragraph'
-          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, 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 /\[{2}|\[(?:[\S]+)|\]{1,2}/g, '' unless line.match /^[A-Z]+[ ].*/
+      if currentItem.text?
+        switch currentItem.type
+          when 'paragraph'
+            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, urls...
+            pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}|\\n/g, ' '
+          when 'html'
+            pageText += ' ' + currentItem.text.replace /<[^>]*>/g, ''
+          else
+            if currentItem.text?
+              for line in currentItem.text.split /\r\n?|\n/
+                pageText += ' ' + line.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, '' unless line.match /^[A-Z]+[ ].*/
     catch err
-      throw new Error("Error extracting text from #{currentIndex}")
+      throw new Error("Error extracting text from #{currentIndex}, #{err}")
     pageText
 
 
@@ -230,6 +232,7 @@ module.exports = exports = (argv) ->
               pageText = page.story.reduce( extractPageText, '')
             catch err
               console.log "SITE INDEX *** #{wikiName} reduce to extract text on #{slug} failed", err.message
+              # console.log "page", page
               pageText = ""
             siteIndex.add {
               'id': slug
@@ -281,6 +284,17 @@ module.exports = exports = (argv) ->
             itself.once 'indexed', ->
               fs.unlink indexUpdateFlag, (err) ->
                 console.log "+++ SITE INDEX #{wikiName} : unable to delete update flag" if err
+          else
+            # not been updated, but is it the correct version?
+            fs.readFile siteIndexLoc, (err, data) ->
+              if !err
+                try
+                  testIndex = JSON.parse(data)
+                  if testIndex.serializationVersion != 2
+                    console.log('+++ SITE INDEX #{wikiName} : updating to latest version.')
+                    itself.createIndex pagehandler
+              else
+                console.log "+++ SITE INDEX #{wikiName} : error reading index"
       else
         # index does not exist, so create it
         itself.createIndex pagehandler

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.21.0-rc.1",
+  "version": "0.21.0-rc.2",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -33,7 +33,7 @@
     "glob": "^7.1.4",
     "lodash": "^4.17.19",
     "method-override": "^2.3.10",
-    "minisearch": "^3.3.0",
+    "minisearch": "^5.0.0",
     "mkdirp": "^0.5.5",
     "morgan": "^1.9.1",
     "node-fetch": "^2.6.1",