wiki-server 0.21.0-rc1 → 0.21.0

package/default-data/pages/how-to-wiki

@@ -149,623 +149,98 @@
   ],
   "journal": [
     {
-      "id": "7b56f22a4b9ee974",
-      "type": "edit",
-      "item": {
-        "text": "Welcome to the [[Smallest Federated Wiki]]. This page was first drafted Sunday, June 26th, 2011, at [[Indie Web Camp]]. You are welcome to copy this page to any server you own and revise its welcoming message as you see fit. You can assume this has happened many times already. See also [[",
-        "id": "7b56f22a4b9ee974",
-        "type": "paragraph"
-      }
-    },
-    {
-      "id": "7b56f22a4b9ee974",
-      "type": "edit",
-      "item": {
-        "text": "Welcome to the [[Smallest Federated Wiki]]. This page was first drafted Sunday, June 26th, 2011, at [[Indie Web Camp]]. You are welcome to copy this page to any server you own and revise its welcoming message as you see fit. You can assume this has happened many times already, most likely among the [[List of Pioneers]].",
-        "id": "7b56f22a4b9ee974",
-        "type": "paragraph"
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "d88b9a104822256b"
-      },
-      "id": "d88b9a104822256b",
-      "type": "add",
-      "after": "7b56f22a4b9ee974"
-    },
-    {
-      "type": "edit",
-      "id": "d88b9a104822256b",
-      "item": {
-        "type": "paragraph",
-        "id": "d88b9a104822256b",
-        "text": "<h2>How To Edit"
-      }
-    },
-    {
-      "type": "edit",
-      "id": "d88b9a104822256b",
-      "item": {
-        "type": "paragraph",
-        "id": "d88b9a104822256b",
-        "text": "<h3>How To Add Content"
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "1012dd3528d4c788"
-      },
-      "id": "1012dd3528d4c788",
-      "type": "add",
-      "after": "d88b9a104822256b"
-    },
-    {
-      "type": "edit",
-      "id": "1012dd3528d4c788",
-      "item": {
-        "type": "paragraph",
-        "id": "1012dd3528d4c788",
-        "text": "How to [[Add Text]] to an existing paragraph."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "d03bcc1fd0278522"
-      },
-      "id": "d03bcc1fd0278522",
-      "type": "add",
-      "after": "1012dd3528d4c788"
-    },
-    {
-      "type": "edit",
-      "id": "d03bcc1fd0278522",
-      "item": {
-        "type": "paragraph",
-        "id": "d03bcc1fd0278522",
-        "text": "How to [[Move Paragraphs]] within and between wiki pages."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "f2a7762b712791e5"
-      },
-      "id": "f2a7762b712791e5",
-      "type": "add",
-      "after": "d03bcc1fd0278522"
-    },
-    {
-      "type": "edit",
-      "id": "f2a7762b712791e5",
-      "item": {
-        "type": "paragraph",
-        "id": "f2a7762b712791e5",
-        "text": "How to [[Add Plugins]] to interpret new kinds of data."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "fa3e22f363cd93d5"
-      },
-      "id": "fa3e22f363cd93d5",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "fa3e22f363cd93d5",
-      "item": {
-        "type": "paragraph",
-        "id": "fa3e22f363cd93d5",
-        "text": "How to [[Add Paragraphs]] or paragraph-like items to a story."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "7b56f22a4b9ee974",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "f2a7762b712791e5"
-      ],
-      "id": "fa3e22f363cd93d5"
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "d3a1bd6b0c947378"
-      },
-      "id": "d3a1bd6b0c947378",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "d3a1bd6b0c947378",
-      "item": {
-        "type": "paragraph",
-        "id": "d3a1bd6b0c947378",
-        "text": "<h3>How To Improve Wiki"
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "7b56f22a4b9ee974",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "d3a1bd6b0c947378",
-        "f2a7762b712791e5"
-      ],
-      "id": "d3a1bd6b0c947378"
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "4cb87e0352907dfe"
-      },
-      "id": "4cb87e0352907dfe",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "4cb87e0352907dfe",
-      "item": {
-        "type": "paragraph",
-        "id": "4cb87e0352907dfe",
-        "text": "How to [[Add Pages]] by adding links to existing pages."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "7b56f22a4b9ee974",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "d3a1bd6b0c947378",
-        "f2a7762b712791e5"
-      ],
-      "id": "4cb87e0352907dfe"
-    },
-    {
-      "type": "edit",
-      "id": "7b56f22a4b9ee974",
-      "item": {
-        "text": "Welcome to the [[Smallest Federated Wiki]]. This page was first drafted Sunday, June 26th, 2011, at [[Indie Web Camp]]. These pages describe editing conventions common among the federated sites.",
-        "id": "7b56f22a4b9ee974",
-        "type": "paragraph"
-      }
-    },
-    {
-      "type": "edit",
-      "id": "7b56f22a4b9ee974",
-      "item": {
-        "text": "Welcome to the [[Smallest Federated Wiki]]. This page was first drafted Sunday, June 26th, 2011. These pages describe editing conventions common among the federated sites.",
-        "id": "7b56f22a4b9ee974",
-        "type": "paragraph"
-      }
-    },
-    {
-      "type": "edit",
-      "id": "7b56f22a4b9ee974",
-      "item": {
-        "text": "Welcome to the [[Smallest Federated Wiki]]. This page was first drafted Sunday, June 26th, 2011. The pages on this particular site have been edited to describe how to get things done on many of the federated sites.",
-        "id": "7b56f22a4b9ee974",
-        "type": "paragraph"
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "07ef6b0e53a77dd2"
-      },
-      "id": "07ef6b0e53a77dd2",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "move",
-      "order": [
-        "7b56f22a4b9ee974",
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "d3a1bd6b0c947378",
-        "f2a7762b712791e5"
-      ],
-      "id": "07ef6b0e53a77dd2"
-    },
-    {
-      "type": "edit",
-      "id": "07ef6b0e53a77dd2",
-      "item": {
-        "type": "paragraph",
-        "id": "07ef6b0e53a77dd2",
-        "text": "Read a little bit. Then move on to our [http://sandbox.fed.wiki.org Sandbox] and give your new knowledge a workout."
-      }
-    },
-    {
-      "type": "edit",
-      "id": "07ef6b0e53a77dd2",
-      "item": {
-        "type": "paragraph",
-        "id": "07ef6b0e53a77dd2",
-        "text": "Read a little bit. Then move on to our [http://sandbox.fed.wiki.org Sandbox] and give your new knowledge a workout. Still confused? Add something to our [[Frequently Asked Questions]]."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "c8fda36855c0da59"
-      },
-      "id": "c8fda36855c0da59",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "c8fda36855c0da59",
-      "item": {
-        "type": "paragraph",
-        "id": "c8fda36855c0da59",
-        "text": "How to [[Host a Site]] of your own."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "c8fda36855c0da59"
-    },
-    {
-      "type": "edit",
-      "id": "c8fda36855c0da59",
-      "item": {
-        "type": "paragraph",
-        "id": "c8fda36855c0da59",
-        "text": "How to [[Host a Site]] to share your work."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "243033dc6528eab1"
-      },
-      "id": "243033dc6528eab1",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "243033dc6528eab1",
-      "item": {
-        "type": "paragraph",
-        "id": "243033dc6528eab1",
-        "text": "<h3>How to Remove Content"
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "243033dc6528eab1",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "243033dc6528eab1"
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "73e9a16ca95be40e"
-      },
-      "id": "73e9a16ca95be40e",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "73e9a16ca95be40e"
-    },
-    {
-      "type": "edit",
-      "id": "73e9a16ca95be40e",
-      "item": {
-        "type": "paragraph",
-        "id": "73e9a16ca95be40e",
-        "text": "How to [[Remove Paragraphs]] and some other editable items."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "c63dc8ff04ecdc31"
-      },
-      "id": "c63dc8ff04ecdc31",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "c63dc8ff04ecdc31"
-    },
-    {
-      "type": "edit",
-      "id": "c63dc8ff04ecdc31",
-      "item": {
-        "type": "paragraph",
-        "id": "c63dc8ff04ecdc31",
-        "text": "How to [[Remove Pages]] or direct readers to other sites."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "208e32f178e91c99"
-      },
-      "id": "208e32f178e91c99",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "208e32f178e91c99",
-      "item": {
-        "type": "paragraph",
-        "id": "208e32f178e91c99",
-        "text": "How to [[Add Weird Characters]] to a paragraph."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "208e32f178e91c99",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "208e32f178e91c99"
-    },
-    {
-      "type": "edit",
-      "id": "07ef6b0e53a77dd2",
-      "item": {
-        "type": "paragraph",
-        "id": "07ef6b0e53a77dd2",
-        "text": "Read a little bit. Then move on to our [http://sandbox.fed.wiki.org Sandbox] and give your new knowledge a workout. Still confused? Look through our our [[Frequently Asked Questions]]."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "1db26c2e0c7ed126"
-      },
-      "id": "1db26c2e0c7ed126",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "1db26c2e0c7ed126",
-      "item": {
-        "type": "paragraph",
-        "id": "1db26c2e0c7ed126",
-        "text": "How to [[Add Formatting]] to a paragraph."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "1db26c2e0c7ed126",
-        "208e32f178e91c99",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "1db26c2e0c7ed126"
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "8bb136a087a9710f"
-      },
-      "id": "8bb136a087a9710f",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "1db26c2e0c7ed126",
-        "208e32f178e91c99",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "8bb136a087a9710f",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "8bb136a087a9710f"
-    },
-    {
-      "type": "edit",
-      "id": "8bb136a087a9710f",
-      "item": {
-        "type": "paragraph",
-        "id": "8bb136a087a9710f",
-        "text": "How to [[Import Documents]] from various sources."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "69fd0eba8fefe2aa"
-      },
-      "id": "69fd0eba8fefe2aa",
-      "type": "add",
-      "after": "f2a7762b712791e5"
-    },
-    {
-      "type": "edit",
-      "id": "69fd0eba8fefe2aa",
-      "item": {
-        "type": "paragraph",
-        "id": "69fd0eba8fefe2aa",
-        "text": "How to [[Add Links]] to paragraphs."
-      }
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "69fd0eba8fefe2aa",
-        "1db26c2e0c7ed126",
-        "208e32f178e91c99",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "8bb136a087a9710f",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ],
-      "id": "69fd0eba8fefe2aa"
-    },
-    {
-      "type": "edit",
-      "id": "69fd0eba8fefe2aa",
-      "item": {
-        "type": "paragraph",
-        "id": "69fd0eba8fefe2aa",
-        "text": "How to [[Add Links]] to a paragraph."
-      }
-    },
-    {
-      "item": {
-        "type": "factory",
-        "id": "a2bb10949e81f2c6"
-      },
-      "id": "a2bb10949e81f2c6",
-      "type": "add"
-    },
-    {
-      "type": "move",
-      "order": [
-        "07ef6b0e53a77dd2",
-        "d88b9a104822256b",
-        "1012dd3528d4c788",
-        "69fd0eba8fefe2aa",
-        "1db26c2e0c7ed126",
-        "208e32f178e91c99",
-        "fa3e22f363cd93d5",
-        "d03bcc1fd0278522",
-        "4cb87e0352907dfe",
-        "8bb136a087a9710f",
-        "243033dc6528eab1",
-        "73e9a16ca95be40e",
-        "c63dc8ff04ecdc31",
-        "d3a1bd6b0c947378",
-        "a2bb10949e81f2c6",
-        "c8fda36855c0da59",
-        "f2a7762b712791e5"
-      ]
-    },
-    {
-      "type": "edit",
-      "id": "a2bb10949e81f2c6",
-      "item": {
-        "type": "paragraph",
-        "id": "a2bb10949e81f2c6",
-        "text": "How to [[Review Changes]] to any page or site."
-      }
+      "type": "create",
+      "item": {
+        "title": "How To Wiki",
+        "story": [
+          {
+            "type": "paragraph",
+            "id": "07ef6b0e53a77dd2",
+            "text": "Read a little bit. Then move on to our [http://sandbox.fed.wiki.org Sandbox] and give your new knowledge a workout. Still confused? Look through our our [[Frequently Asked Questions]]."
+          },
+          {
+            "type": "html",
+            "id": "d88b9a104822256b",
+            "text": "<h3>How To Add Content"
+          },
+          {
+            "type": "paragraph",
+            "id": "1012dd3528d4c788",
+            "text": "How to [[Add Text]] to an existing paragraph."
+          },
+          {
+            "type": "paragraph",
+            "id": "69fd0eba8fefe2aa",
+            "text": "How to [[Add Links]] to a paragraph."
+          },
+          {
+            "type": "paragraph",
+            "id": "1db26c2e0c7ed126",
+            "text": "How to [[Add Formatting]] to a paragraph."
+          },
+          {
+            "type": "paragraph",
+            "id": "208e32f178e91c99",
+            "text": "How to [[Add Weird Characters]] to a paragraph."
+          },
+          {
+            "type": "paragraph",
+            "id": "fa3e22f363cd93d5",
+            "text": "How to [[Add Paragraphs]] or paragraph-like items to a story."
+          },
+          {
+            "type": "paragraph",
+            "id": "d03bcc1fd0278522",
+            "text": "How to [[Move Paragraphs]] within and between wiki pages."
+          },
+          {
+            "type": "paragraph",
+            "id": "4cb87e0352907dfe",
+            "text": "How to [[Add Pages]] by adding links to existing pages."
+          },
+          {
+            "type": "paragraph",
+            "id": "8bb136a087a9710f",
+            "text": "How to [[Import Documents]] from various sources."
+          },
+          {
+            "type": "html",
+            "id": "243033dc6528eab1",
+            "text": "<h3>How to Remove Content"
+          },
+          {
+            "type": "paragraph",
+            "id": "73e9a16ca95be40e",
+            "text": "How to [[Remove Paragraphs]] and some other editable items."
+          },
+          {
+            "type": "paragraph",
+            "id": "c63dc8ff04ecdc31",
+            "text": "How to [[Remove Pages]] or direct readers to other sites."
+          },
+          {
+            "type": "html",
+            "id": "d3a1bd6b0c947378",
+            "text": "<h3>How To Improve Wiki"
+          },
+          {
+            "type": "paragraph",
+            "id": "a2bb10949e81f2c6",
+            "text": "How to [[Review Changes]] to any page or site."
+          },
+          {
+            "type": "paragraph",
+            "id": "c8fda36855c0da59",
+            "text": "How to [[Host a Site]] to share your work."
+          },
+          {
+            "type": "paragraph",
+            "id": "f2a7762b712791e5",
+            "text": "How to [[Add Plugins]] to interpret new kinds of data."
+          }
+        ]
+      },
+      "date": 1344124800000
     },
     {
       "type": "edit",
@@ -991,7 +466,8 @@
     },
     {
       "type": "fork",
-      "site": "fed.wiki.org"
+      "site": "fed.wiki.org",
+      "date": 1358732351905
     },
     {
       "type": "edit",
@@ -1004,10 +480,6 @@
       "site": "fed.wiki.org",
       "date": 1358732351906
     },
-    {
-      "type": "fork",
-      "date": 1358732385734
-    },
     {
       "item": {
         "type": "paragraph",
@@ -1420,7 +892,7 @@
     {
       "type": "fork",
       "site": "fed.wiki.org",
-      "date": 1490577179025
+      "date": 1488473254245
     }
   ]
 }

package/lib/defaultargs.coffee

@@ -28,6 +28,7 @@ module.exports = (argv) ->
   argv.status or= path.join(argv.data, 'status')
   argv.assets or= path.join(argv.data, 'assets')
   argv.recycler or= path.join(argv.data, 'recycle')
+  argv.commons or= path.join(argv.data, 'commons')
   argv.url or= 'http://localhost' + (if argv.port is 80 then '' else ':' + argv.port)
   argv.id or= path.join(argv.status, 'owner.json')
   argv.uploadLimit or= '5mb'
@@ -50,7 +51,7 @@ module.exports = (argv) ->
 
   argv.security_type or= './security'
   if argv.security_type is './security'
-    console.log "\n\nWARNING: Using default security module."
+    console.log "\n\nINFORMATION: Using default security module."
   else
     argv.security_type = 'wiki-security-' + argv.security_type
   argv.security_legacy or= false
@@ -64,6 +65,7 @@ module.exports = (argv) ->
   argv.status = path.resolve(argv.status)
   argv.assets = path.resolve(argv.assets)
   argv.recycler = path.resolve(argv.recycler)
+  argv.commons = path.resolve(argv.commons)
   argv.id = path.resolve(argv.id)
 
   if /node_modules/.test(argv.data)

package/lib/search.coffee

@@ -37,9 +37,9 @@ module.exports = exports = (argv) ->
   working = false
 
   touch = (file, cb) ->
-    fs.stat indexUpdateFlag, (err, stats) ->
+    fs.stat file, (err, stats) ->
       return cb() if err is null
-      fs.open indexUpdateFlag, 'w', (err,fd) ->
+      fs.open file, 'w', (err,fd) ->
         cb(err) if err
         fs.close fd, (err) ->
           cb(err)
@@ -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,28 @@ 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)
+                catch err
+                  testIndex = {}
+                if testIndex.serializationVersion != 2
+                  console.log "+++ SITE INDEX #{wikiName} : updating to latest version."
+                  itself.createIndex pagehandler
+                  # remove the update flag once the index has been created
+                  itself.once 'indexed', ->
+                    fs.unlink indexUpdateFlag, (err) ->
+                      console.log "+++ SITE INDEX #{wikiName} : unable to delete update flag" if err
+              else
+                console.log "+++ SITE INDEX #{wikiName} : error reading index - attempting creating"
+                itself.createIndex pagehandler
+                # remove the update flag once the index has been created
+                itself.once 'indexed', ->
+                  fs.unlink indexUpdateFlag, (err) ->
+                    console.log "+++ SITE INDEX #{wikiName} : unable to delete update flag" if err
       else
         # index does not exist, so create it
         itself.createIndex pagehandler

package/lib/server.coffee

@@ -583,7 +583,7 @@ module.exports = exports = (argv) ->
     remoteResource = pathParts.join('/')
     requestURL = 'http://' + remoteHost + '/' + remoteResource
     console.log("PROXY Request: ", requestURL)
-    if requestURL.endsWith('.json') or requestURL.endsWith('.png') or pathParts[0] is "plugin"
+    if requestURL.endsWith('.json') or requestURL.endsWith('.png') or requestURL.endsWith('.jpg') or pathParts[0] is "plugin"
       requestOptions = {
         host: remoteHost
         port: 80

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.21.0-rc1",
+  "version": "0.21.0",
   "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": "^2.1.3",
+    "minisearch": "^5.0.0",
     "mkdirp": "^0.5.5",
     "morgan": "^1.9.1",
     "node-fetch": "^2.6.1",
@@ -50,10 +50,10 @@
     "grunt-git-authors": "^3.2.0",
     "grunt-mocha-test": "^0.13.2",
     "grunt-retire": "^1.0.8",
-    "mocha": "^8.0.1",
+    "mocha": "^9.2.2",
     "should": "^13.2.3",
     "supertest": "^4.0.2",
-    "wiki-client": "^0.23.0",
+    "wiki-client": "^0.24.0",
     "wiki-plugin-activity": "^0.4.6",
     "wiki-plugin-video": "^0.2.10"
   },