offline.html

@@ -139,17 +139,6 @@
         <label>Details<span class="red">*</span><a class="label-button maximize-button">Maximize</a><br>
           <textarea id="wordDetails" placeholder="Markdown formatting allowed"></textarea>
         </label>
-        <label>
-          <a id="expandAdvancedForm" class="small button expand-advanced-form">Show Advanced Fields</a>
-        </label>
-        <div id="advancedForm" class="advanced-word-form" style="display:none;">
-          <label>Etymology / Root Words<br>
-            <input id="wordEtymology" maxlength="2500" placeholder="comma,separated,root,words">
-          </label>
-          <label>Related Words<br>
-            <input id="wordRelated" maxlength="2500" placeholder="comma,separated,related,words">
-          </label>
-        </div>
         <div id="wordErrorMessage"></div>
         <a class="button" id="addWordButton">Add Word</a>
       </form>

src/constants.js

@@ -36,8 +36,6 @@ export const DEFAULT_DICTIONARY = {
       definition: '',
       details: '',
       etymology: [],
-      related: [],
-      principalParts: [],
       wordId: 0
     }, */
   ],

src/js/render/words.js

@@ -9,7 +9,7 @@ import {
   setupWordEditFormButtons,
 } from '../setupListeners/words';
 import { getPaginationData } from '../pagination';
-import { getOpenEditForms, translateOrthography, parseReferences, getWordReferenceMarkdown } from '../wordManagement';
+import { getOpenEditForms, translateOrthography, parseReferences } from '../wordManagement';
 import { renderAd } from '../ads';
 import { getPublicLink } from '../account/utilities';
 import { renderPartsOfSpeech } from './details';
@@ -60,12 +60,6 @@ export function renderWords() {
         partOfSpeech: removeTags(originalWord.partOfSpeech),
         definition: removeTags(originalWord.definition),
         details: parseReferences(removeTags(originalWord.details)),
-        etymology: typeof originalWord.etymology === 'undefined' || originalWord.etymology.length < 1 ? null
-          : originalWord.etymology.map(root => getWordReferenceMarkdown(removeTags(root))).join(', '),
-        related: typeof originalWord.related === 'undefined' || originalWord.related.length < 1 ? null
-          : originalWord.related.map(relatedWord => getWordReferenceMarkdown(removeTags(relatedWord))).join(', '),
-        principalParts: typeof originalWord.principalParts === 'undefined' || originalWord.principalParts.length < 1 ? null
-          : originalWord.principalParts.join(', '),
         wordId: originalWord.wordId,
       });
       const homonymnNumber = getHomonymnNumber(originalWord);
@@ -78,7 +72,6 @@ export function renderWords() {
       wordsHTML += `<article class="entry" id="${word.wordId}">
         <header>
           <h4 class="word"><span class="orthographic-translation">${wordNameDisplay}</span>${homonymnNumber > 0 ? ' <sub>' + homonymnNumber.toString() + '</sub>' : ''}</h4>
-          ${word.principalParts === null ? '' : `<span class="principalParts">(${word.principalParts})</span>`}
           <span class="pronunciation">${word.pronunciation}</span>
           <span class="part-of-speech">${word.partOfSpeech}</span>
           ${isPublic ? `<a class="small button share-link" href="${shareLink}" target="_blank" title="Public Link to Word">&#10150;</a>` : ''}
@@ -93,15 +86,6 @@ export function renderWords() {
           <dd class="details">
             ${md(word.details)}
           </dd>
-          ${word.etymology === null && word.related === null ? '' : `<hr>`}
-          ${word.etymology === null ? '' : `<dt>Etymology <small>(Root Word${originalWord.etymology.length !== 1 ? 's' : ''})</small></dt>
-          <dd class="etymology">
-            ${md(word.etymology).replace(/<\/?p>/g, '')}
-          </dd>`}
-          ${word.related === null ? '' : `<dt>Related Word${originalWord.related.length !== 1 ? 's' : ''}</dt>
-          <dd class="related">
-            ${md(word.related).replace(/<\/?p>/g, '')}
-          </dd>`}
         </dl>
       </article>`;
     });
@@ -183,12 +167,6 @@ export function renderEditForm(wordId = false) {
         <label>Etymology / Root Words<br>
           <input id="wordEtymology_${wordId}" maxlength="2500" placeholder="comma,separated,root,words" value="${word.hasOwnProperty('etymology') ? word.etymology : ''}">
         </label>
-        <label>Related Words<br>
-          <input id="wordRelated_${wordId}" maxlength="2500" placeholder="comma,separated,related,words" value="${word.hasOwnProperty('related') ? word.related : ''}">
-        </label>
-        <label>Principal Parts<a href="https://en.wikipedia.org/wiki/Principal_parts" target="_blank" class="label-button">What's This?</a><br>
-          <input id="wordPrincipalParts_${wordId}" maxlength="2500" placeholder="comma,separated,principal,parts" value="${word.hasOwnProperty('principalParts') ? word.principalParts : ''}">
-        </label>
       </div>
       <div id="wordErrorMessage_${wordId}"></div>
       <a class="button edit-save-changes" id="editWordButton_${wordId}">Save Changes</a>

src/js/search.js

@@ -63,25 +63,15 @@ export function getMatchingSearchWords() {
       let details = filters.orthography ? parseReferences(word.details) : word.details;
       details = filters.ignoreDiacritics ? removeDiacritics(details) : details;
       details = filters.caseSensitive ? details : details.toLowerCase();
-      let principalParts = typeof word.principalParts === 'undefined' ? [] : word.principalParts;
-      principalParts = filters.orthography ? principalParts.map(part => translateOrthography(part)) : principalParts;
-      principalParts = filters.ignoreDiacritics ? principalParts.map(part => removeDiacritics(part)) : principalParts;
-      principalParts = filters.caseSensitive ? principalParts : principalParts.map(part => part.toLowerCase());
 
       const isInName = filters.name && (filters.exact
-        ? searchTerm == name
+          ? searchTerm == name
-        : new RegExp(searchTerm, 'g').test(name)
+          : new RegExp(searchTerm, 'g').test(name));
-      );
       const isInDefinition = filters.definition && (filters.exact
-        ? searchTerm == definition
+          ? searchTerm == definition
-        : new RegExp(searchTerm, 'g').test(definition)
+          : new RegExp(searchTerm, 'g').test(definition));
-      );
       const isInDetails = filters.details && new RegExp(searchTerm, 'g').test(details);
-      const isInPrincipalParts = filters.name && (filters.exact
+      return searchTerm === '' || isInName || isInDefinition || isInDetails;
-        ? principalParts.includes(searchTerm)
-        : principalParts.some(part => new RegExp(searchTerm, 'g').test(part))
-      );
-      return searchTerm === '' || isInName || isInDefinition || isInDetails || isInPrincipalParts;
     });
     return matchingWords;
   }
@@ -109,16 +99,6 @@ export function highlightSearchTerm(word) {
             + '<mark>' + markedUpWord.name.substr(wordIndex, searchTermLength) + '</mark>'
             + markedUpWord.name.substr(wordIndex + searchTermLength);
         });
-
-        if (markedUpWord.principalParts !== null) {
-          const part = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.principalParts), filters.caseSensitive);
-          part.forEach((wordIndex, i) => {
-            wordIndex += '<mark></mark>'.length * i;
-            markedUpWord.principalParts = markedUpWord.principalParts.substring(0, wordIndex)
-              + '<mark>' + markedUpWord.principalParts.substr(wordIndex, searchTermLength) + '</mark>'
-              + markedUpWord.principalParts.substr(wordIndex + searchTermLength);
-          });
-        }
       }
       if (filters.definition) {
         const definitionMatches = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.definition), filters.caseSensitive);
@@ -142,10 +122,6 @@ export function highlightSearchTerm(word) {
       const regexMethod = 'g' + (filters.caseSensitive ? '' : 'i');
       if (filters.name) {
         markedUpWord.name = markedUpWord.name.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
-        
-        if (markedUpWord.principalParts !== null) {
-          markedUpWord.principalParts = markedUpWord.principalParts.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
-        }
       }
       if (filters.definition) {
         markedUpWord.definition = markedUpWord.definition.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);

src/js/view/render.js

@@ -182,12 +182,6 @@ export function renderWords() {
         partOfSpeech: removeTags(originalWord.partOfSpeech),
         definition: removeTags(originalWord.definition),
         details: originalWord.details,
-        etymology: typeof originalWord.etymology === 'undefined' || originalWord.etymology.length < 1 ? null
-          : originalWord.etymology.join(', '),
-        related: typeof originalWord.related === 'undefined' || originalWord.related.length < 1 ? null
-          : originalWord.related.join(', '),
-        principalParts: typeof originalWord.principalParts === 'undefined' || originalWord.principalParts.length < 1 ? null
-          : originalWord.principalParts.join(', '),
         wordId: originalWord.wordId,
       });
 
@@ -199,7 +193,6 @@ export function renderWords() {
       wordsHTML += `<article class="entry" id="${word.wordId}">
         <header>
           <h4 class="word"><span class="orthographic-translation">${word.name}</span>${homonymnNumber > 0 ? ' <sub>' + homonymnNumber.toString() + '</sub>' : ''}</h4>
-          ${word.principalParts === null ? '' : `<span class="principalParts">(${word.principalParts})</span>`}
           <span class="pronunciation">${word.pronunciation}</span>
           <span class="part-of-speech">${word.partOfSpeech}</span>
           <a href="${shareLink}" target="_blank" class="small button word-option-button" title="Link to Word">&#10150;</a>
@@ -209,15 +202,6 @@ export function renderWords() {
           <dd class="details">
             ${md(word.details)}
           </dd>
-          ${word.etymology === null && word.related === null ? '' : `<hr>`}
-          ${word.etymology === null ? '' : `<dt>Etymology <small>(Root Word${originalWord.etymology.length !== 1 ? 's' : ''})</small></dt>
-          <dd class="etymology">
-            ${md(word.etymology).replace(/<\/?p>/g, '')}
-          </dd>`}
-          ${word.related === null ? '' : `<dt>Related Word${originalWord.related.length !== 1 ? 's' : ''}</dt>
-          <dd class="related">
-            ${md(word.related).replace(/<\/?p>/g, '')}
-          </dd>`}
         </dl>
       </article>`;
     });

src/js/view/search.js

@@ -22,7 +22,7 @@ export function getSearchFilters() {
     caseSensitive: document.getElementById('searchCaseSensitive').checked,
     ignoreDiacritics: document.getElementById('searchIgnoreDiacritics').checked,
     exact: document.getElementById('searchExactWords').checked,
-    // orthography is removed my default because it is already rendered on the backend.
+    orthography: document.getElementById('searchOrthography').checked,
     name: document.getElementById('searchIncludeName').checked,
     definition: document.getElementById('searchIncludeDefinition').checked,
     details: document.getElementById('searchIncludeDetails').checked,
@@ -54,30 +54,23 @@ export function getMatchingSearchWords() {
     }).filter(word => {
       searchTerm = filters.ignoreDiacritics ? removeDiacritics(searchTerm) : searchTerm;
       searchTerm = filters.caseSensitive ? searchTerm : searchTerm.toLowerCase();
-      let name = filters.ignoreDiacritics ? removeDiacritics(word.name) : word.name;
+      let name = filters.orthography ? translateOrthography(word.name) : word.name;
+      name = filters.ignoreDiacritics ? removeDiacritics(name) : name;
       name = filters.caseSensitive ? name : name.toLowerCase();
       let definition = filters.ignoreDiacritics ? removeDiacritics(word.definition) : word.definition;
       definition = filters.caseSensitive ? definition : definition.toLowerCase();
-      let details = filters.ignoreDiacritics ? removeDiacritics(word.details) : word.details;
+      let details = filters.orthography ? parseReferences(word.details) : word.details;
+      details = filters.ignoreDiacritics ? removeDiacritics(details) : details;
       details = filters.caseSensitive ? details : details.toLowerCase();
-      let principalParts = typeof word.principalParts === 'undefined' ? [] : word.principalParts;
-      principalParts = filters.ignoreDiacritics ? principalParts.map(part => removeDiacritics(part)) : principalParts;
-      principalParts = filters.caseSensitive ? principalParts : principalParts.map(part => part.toLowerCase());
 
       const isInName = filters.name && (filters.exact
-        ? searchTerm == name
+          ? searchTerm == name
-        : new RegExp(searchTerm, 'g').test(name)
+          : new RegExp(searchTerm, 'g').test(name));
-      );
       const isInDefinition = filters.definition && (filters.exact
-        ? searchTerm == definition
+          ? searchTerm == definition
-        : new RegExp(searchTerm, 'g').test(definition)
+          : new RegExp(searchTerm, 'g').test(definition));
-      );
       const isInDetails = filters.details && new RegExp(searchTerm, 'g').test(details);
-      const isInPrincipalParts = filters.name && (filters.exact
+      return searchTerm === '' || isInName || isInDefinition || isInDetails;
-        ? principalParts.includes(searchTerm)
-        : principalParts.some(part => new RegExp(searchTerm, 'g').test(part))
-      );
-      return searchTerm === '' || isInName || isInDefinition || isInDetails || isInPrincipalParts;
     });
     return matchingWords;
   }
@@ -90,6 +83,10 @@ export function highlightSearchTerm(word) {
   if (searchTerm) {
     const filters = getSearchFilters();
     const markedUpWord = cloneObject(word);
+    if (filters.orthography) {
+      markedUpWord.name = translateOrthography(markedUpWord.name);
+      markedUpWord.details = parseReferences(markedUpWord.details);
+    }
     if (filters.ignoreDiacritics) {
       const searchTermLength = searchTerm.length;
       searchTerm = removeDiacritics(searchTerm);
@@ -101,16 +98,6 @@ export function highlightSearchTerm(word) {
             + '<mark>' + markedUpWord.name.substr(wordIndex, searchTermLength) + '</mark>'
             + markedUpWord.name.substr(wordIndex + searchTermLength);
         });
-
-        if (markedUpWord.principalParts !== null) {
-          const part = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.principalParts), filters.caseSensitive);
-          part.forEach((wordIndex, i) => {
-            wordIndex += '<mark></mark>'.length * i;
-            markedUpWord.principalParts = markedUpWord.principalParts.substring(0, wordIndex)
-              + '<mark>' + markedUpWord.principalParts.substr(wordIndex, searchTermLength) + '</mark>'
-              + markedUpWord.principalParts.substr(wordIndex + searchTermLength);
-          });
-        }
       }
       if (filters.definition) {
         const definitionMatches = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.definition), filters.caseSensitive);
@@ -134,10 +121,6 @@ export function highlightSearchTerm(word) {
       const regexMethod = 'g' + (filters.caseSensitive ? '' : 'i');
       if (filters.name) {
         markedUpWord.name = markedUpWord.name.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
-        
-        if (markedUpWord.principalParts !== null) {
-          markedUpWord.principalParts = markedUpWord.principalParts.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
-        }
       }
       if (filters.definition) {
         markedUpWord.definition = markedUpWord.definition.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);

src/js/view/wordManagement.js

@@ -1,3 +1,4 @@
+import { wordExists, getHomonymnIndexes } from "./utilities";
 import removeDiacritics from "../StackOverflow/removeDiacritics";
 
 export function sortWords() {
@@ -9,3 +10,46 @@ export function sortWords() {
     return removeDiacritics(wordA[sortBy]).toLowerCase() > removeDiacritics(wordB[sortBy]).toLowerCase() ? 1 : -1;
   });
 }
+
+export function parseReferences(detailsMarkdown) {
+  const references = detailsMarkdown.match(/\{\{.+?\}\}/g);
+  if (references && Array.isArray(references)) {
+    new Set(references).forEach(reference => {
+      let wordToFind = reference.replace(/\{\{|\}\}/g, '');
+      let homonymn = 0;
+      
+      if (wordToFind.includes(':')) {
+        const separator = wordToFind.indexOf(':');
+        homonymn = wordToFind.substr(separator + 1);
+        wordToFind = wordToFind.substring(0, separator);
+        if (homonymn && homonymn.trim()
+          && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
+          homonymn = parseInt(homonymn.trim());
+        } else {
+          homonymn = false;
+        }
+      }
+
+      let existingWordId = false;
+      const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
+
+      if (homonymn !== false && homonymn > 0) {
+        if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
+          existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
+        }
+      } else if (homonymn !== false) {
+        existingWordId = wordExists(wordToFind, true);
+      }
+
+      if (existingWordId !== false) {
+        if (homonymn < 1 && homonymnIndexes.length > 0) {
+          homonymn = 1;
+        }
+        const homonymnSubHTML = homonymn > 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
+        const wordMarkdownLink = `[${wordToFind}${homonymnSubHTML}](#${existingWordId})`;
+        detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
+      }
+    });
+  }
+  return detailsMarkdown;
+}

src/js/wordManagement.js

@@ -116,8 +116,38 @@ export function parseReferences(detailsMarkdown) {
   const references = detailsMarkdown.match(/\{\{.+?\}\}/g);
   if (references && Array.isArray(references)) {
     new Set(references).forEach(reference => {
-      const wordMarkdownLink = getWordReferenceMarkdown(reference);
+      let wordToFind = reference.replace(/\{\{|\}\}/g, '');
-      if (wordMarkdownLink !== reference) {
+      let homonymn = 0;
+      
+      if (wordToFind.includes(':')) {
+        const separator = wordToFind.indexOf(':');
+        homonymn = wordToFind.substr(separator + 1);
+        wordToFind = wordToFind.substring(0, separator);
+        if (homonymn && homonymn.trim()
+          && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
+          homonymn = parseInt(homonymn.trim());
+        } else {
+          homonymn = false;
+        }
+      }
+
+      let existingWordId = false;
+      const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
+
+      if (homonymn !== false && homonymn > 0) {
+        if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
+          existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
+        }
+      } else if (homonymn !== false) {
+        existingWordId = wordExists(wordToFind, true);
+      }
+
+      if (existingWordId !== false) {
+        if (homonymn < 1 && homonymnIndexes.length > 0) {
+          homonymn = 1;
+        }
+        const homonymnSubHTML = homonymnIndexes.length > 1 && homonymn - 1 >= 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
+        const wordMarkdownLink = `<span class="word-reference">[<span class="orthographic-translation">${translateOrthography(wordToFind)}</span>${homonymnSubHTML}](#${existingWordId})</span>`;
         detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
       }
     });
@@ -125,44 +155,6 @@ export function parseReferences(detailsMarkdown) {
   return detailsMarkdown;
 }
 
-export function getWordReferenceMarkdown(reference) {
-  const wordToFind = reference.replace(/\{\{|\}\}/g, '');
-  let homonymn = 0;
-
-  if (wordToFind.includes(':')) {
-    const separator = wordToFind.indexOf(':');
-    homonymn = wordToFind.substr(separator + 1);
-    wordToFind = wordToFind.substring(0, separator);
-    if (homonymn && homonymn.trim()
-      && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
-      homonymn = parseInt(homonymn.trim());
-    } else {
-      homonymn = false;
-    }
-  }
-
-  let existingWordId = false;
-  const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
-
-  if (homonymn !== false && homonymn > 0) {
-    if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
-      existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
-    }
-  } else if (homonymn !== false) {
-    existingWordId = wordExists(wordToFind, true);
-  }
-
-  if (existingWordId !== false) {
-    if (homonymn < 1 && homonymnIndexes.length > 0) {
-      homonymn = 1;
-    }
-    const homonymnSubHTML = homonymnIndexes.length > 1 && homonymn - 1 >= 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
-    return `<span class="word-reference">[<span class="orthographic-translation">${translateOrthography(wordToFind)}</span>${homonymnSubHTML}](#${existingWordId})</span>`;
-  }
-
-  return reference;
-}
-
 export function expandAdvancedForm(id = false) {
   const wordId = typeof id.target !== 'undefined' ? this.id.replace('expandAdvancedForm', '') : id;
   const button = typeof id.target !== 'undefined' ? this : document.getElementById('expandAdvancedForm' + (!wordId ? '' : wordId)),
@@ -182,9 +174,7 @@ export function submitWordForm() {
     partOfSpeech = document.getElementById('wordPartOfSpeech').value,
     definition = document.getElementById('wordDefinition').value,
     details = document.getElementById('wordDetails').value,
-    etymology = document.getElementById('wordEtymology').value,
+    etymology = document.getElementById('wordEtymology').value;
-    related = document.getElementById('wordRelated').value,
-    principalParts = document.getElementById('wordPrincipalParts').value;
 
   const word = {
     name: removeTags(name).trim(),
@@ -199,14 +189,6 @@ export function submitWordForm() {
     word.etymology = removeTags(etymology).split(',').map(w => w.trim()).filter(w => w.length > 0);
   }
 
-  if (removeTags(related).trim() !== '') {
-    word.related = removeTags(related).split(',').map(w => w.trim()).filter(w => w.length > 0);
-  }
-
-  if (removeTags(principalParts).trim() !== '') {
-    word.principalParts = removeTags(principalParts).split(',').map(w => w.trim()).filter(w => w.length > 0);
-  }
-
   if (validateWord(word)) {
     addWord(word);
     sortWords(true);
@@ -290,9 +272,7 @@ export function confirmEditWord(id) {
     partOfSpeech = document.getElementById('wordPartOfSpeech_' + wordId).value,
     definition = document.getElementById('wordDefinition_' + wordId).value,
     details = document.getElementById('wordDetails_' + wordId).value,
-    etymology = document.getElementById('wordEtymology_' + wordId).value,
+    etymology = document.getElementById('wordEtymology_' + wordId).value;
-    related = document.getElementById('wordRelated_' + wordId).value,
-    principalParts = document.getElementById('wordPrincipalParts_' + wordId).value;
 
   const word = {
     name: removeTags(name).trim(),
@@ -307,14 +287,6 @@ export function confirmEditWord(id) {
     word.etymology = removeTags(etymology).split(',').map(w => w.trim()).filter(w => w.length > 0);
   }
 
-  if (removeTags(related).trim() !== '') {
-    word.related = removeTags(related).split(',').map(w => w.trim()).filter(w => w.length > 0);
-  }
-
-  if (removeTags(principalParts).trim() !== '') {
-    word.principalParts = removeTags(principalParts).split(',').map(w => w.trim()).filter(w => w.length > 0);
-  }
-
   if (validateWord(word, wordId)) {
     if (confirm(`Are you sure you want to save changes to "${word.name}"?`)) {
       document.getElementById('editForm_' + wordId).classList.add('done');

src/php/api/Dictionary.php

@@ -215,8 +215,8 @@ WHERE dictionary=$dictionary";
   }
 
   public function getWords ($user, $dictionary) {
-    $query = "SELECT words.*, wa.etymology, wa.related, wa.principal_parts FROM words
+    $query = "SELECT words.*, words_advanced.etymology FROM words
-LEFT JOIN words_advanced wa ON wa.dictionary = words.dictionary AND wa.word_id = words.word_id
+LEFT JOIN words_advanced ON words_advanced.dictionary = words.dictionary AND words_advanced.word_id = words.word_id
 JOIN dictionaries ON dictionaries.id = words.dictionary
 WHERE words.dictionary=$dictionary AND dictionaries.user=$user";
     $results = $this->db->query($query)->fetchAll();
@@ -233,18 +233,10 @@ WHERE words.dictionary=$dictionary AND dictionaries.user=$user";
           'wordId' => intval($row['word_id']),
         );
 
-        if (!is_null($row['etymology']) && $row['etymology'] !== '') {
+        if (!is_null($row['etymology'])) {
           $word['etymology'] = explode(',', $row['etymology']);
         }
 
-        if (!is_null($row['related']) && $row['related'] !== '') {
-          $word['related'] = explode(',', $row['related']);
-        }
-
-        if (!is_null($row['principal_parts']) && $row['principal_parts'] !== '') {
-          $word['principalParts'] = explode(',', $row['principal_parts']);
-        }
-
         return $word;
       }, $results);
     }
@@ -271,7 +263,7 @@ WHERE words.dictionary=$dictionary AND dictionaries.user=$user";
     }
 
     $query1 = 'INSERT INTO words (dictionary, word_id, name, pronunciation, part_of_speech, definition, details, last_updated, created_on) VALUES ';
-    $query2 = 'INSERT INTO words_advanced (dictionary, word_id, etymology, related, principal_parts) VALUES ';
+    $query2 = 'INSERT INTO words_advanced (dictionary, word_id, etymology) VALUES ';
     $params1 = array();
     $params2 = array();
     $word_ids = array();
@@ -293,12 +285,10 @@ WHERE words.dictionary=$dictionary AND dictionaries.user=$user";
       $params1[] = $last_updated;
       $params1[] = $word['createdOn'];
 
-      $query2 .= "(?, ?, ?, ?, ?), ";
+      $query2 .= "(?, ?, ?), ";
       $params2[] = $dictionary;
       $params2[] = $word['wordId'];
-      $params2[] = isset($word['etymology']) ? implode(',', $word['etymology']) : '';
+      $params2[] = isset($word['etymology']) ? implode(',', $word['etymology']) : null;
-      $params2[] = isset($word['related']) ? implode(',', $word['related']) : '';
-      $params2[] = isset($word['principalParts']) ? implode(',', $word['principalParts']) : '';
     }
     $query1 = trim($query1, ', ') . ' ON DUPLICATE KEY UPDATE
 name=VALUES(name),
@@ -309,9 +299,7 @@ details=VALUES(details),
 last_updated=VALUES(last_updated),
 created_on=VALUES(created_on)';
     $query2 = trim($query2, ', ') . ' ON DUPLICATE KEY UPDATE
-etymology=VALUES(etymology),
+etymology=VALUES(etymology)';
-related=VALUES(related),
-principal_parts=VALUES(principal_parts)';
     
     $results1 = $this->db->execute($query1, $params1);
 

src/php/api/PublicDictionary.php

@@ -86,32 +86,14 @@ class PublicDictionary {
             'pronunciation' => $row['pronunciation'],
             'partOfSpeech' => $row['part_of_speech'],
             'definition' => $row['definition'],
-            'details' => $this->parseReferences(strip_tags($row['details']), $dictionary, false),
+            'details' => $this->parseReferences(strip_tags($row['details']), $dictionary),
             'lastUpdated' => is_null($row['last_updated']) ? intval($row['created_on']) : intval($row['last_updated']),
             'createdOn' => intval($row['created_on']),
             'wordId' => intval($row['word_id']),
           );
 
           if (!is_null($row['etymology'])) {
-            if (strlen($row['etymology']) > 0) {
+            $word['etymology'] = $row['etymology'];
-              $word['etymology'] = array_map(function ($root) use($dictionary) {
-                return $this->getWordReferenceHTML(strip_tags($root), $dictionary, false);
-              }, explode(',', $row['etymology']));
-            }
-          }
-
-          if (!is_null($row['related'])) {
-            if (strlen($row['related']) > 0) {
-              $word['related'] = array_map(function ($root) use($dictionary) {
-                return $this->getWordReferenceHTML(strip_tags($root), $dictionary, false);
-              }, explode(',', $row['related']));
-            }
-          }
-
-          if (!is_null($row['principal_parts'])) {
-            if (strlen($row['principal_parts']) > 0) {
-              $word['principalParts'] = explode(',', $row['principal_parts']);
-            }
           }
           
           return $word;
@@ -123,13 +105,10 @@ class PublicDictionary {
 
   public function getSpecificPublicDictionaryWord ($dictionary, $word) {
     if (is_numeric($dictionary) && is_numeric($word)) {
-      $query = "SELECT words.*, wa.etymology, wa.related, wa.principal_parts FROM words
+      $query = "SELECT words.* FROM words JOIN dictionaries ON id = dictionary WHERE dictionary=? AND word_id=? AND is_public=1";
-      LEFT JOIN words_advanced wa ON wa.dictionary = words.dictionary AND wa.word_id = words.word_id
-      JOIN dictionaries ON dictionaries.id = words.dictionary
-      WHERE words.dictionary=? AND words.word_id=? AND dictionaries.is_public=1";
       $result = $this->db->query($query, array($dictionary, $word))->fetch();
       if ($result) {
-        $word = array(
+        return array(
           'name' => $this->translateOrthography($result['name'], $dictionary),
           'pronunciation' => $result['pronunciation'],
           'partOfSpeech' => $result['part_of_speech'],
@@ -139,30 +118,6 @@ class PublicDictionary {
           'createdOn' => intval($result['created_on']),
           'wordId' => intval($result['word_id']),
         );
-
-        if (!is_null($result['etymology'])) {
-          if (strlen($result['etymology']) > 0) {
-            $word['etymology'] = array_map(function ($root) use($dictionary) {
-              return $this->getWordReferenceHTML(strip_tags($root), $dictionary);
-            }, explode(',', $result['etymology']));
-          }
-        }
-
-        if (!is_null($result['related'])) {
-          if (strlen($result['related']) > 0) {
-            $word['related'] = array_map(function ($root) use($dictionary) {
-              return $this->getWordReferenceHTML(strip_tags($root), $dictionary);
-            }, explode(',', $result['related']));
-          }
-        }
-
-        if (!is_null($result['principal_parts'])) {
-          if (strlen($result['principal_parts']) > 0) {
-            $word['principalParts'] = explode(',', $result['principal_parts']);
-          }
-        }
-
-        return $word;
       }
     }
     return false;
@@ -170,10 +125,7 @@ class PublicDictionary {
 
   private function getWordsAsEntered() {
     if (!isset($this->original_words)) {
-      $query = "SELECT words.*, wa.etymology, wa.related, wa.principal_parts FROM words
+      $query = "SELECT words.* FROM words JOIN dictionaries ON id = dictionary WHERE dictionary=? AND is_public=1";
-LEFT JOIN words_advanced wa ON wa.dictionary = words.dictionary AND wa.word_id = words.word_id
-JOIN dictionaries ON dictionaries.id = words.dictionary
-WHERE words.dictionary=? AND is_public=1";
       $this->original_words = $this->db->query($query, array($this->details['externalID']))->fetchAll();
     }
     return $this->original_words;
@@ -237,9 +189,43 @@ WHERE words.dictionary=? AND is_public=1";
     if (preg_match_all('/\{\{.+?\}\}/', $details, $references) !== false) {
       $references = array_unique($references[0]);
       foreach($references as $reference) {
-        $reference_link = $this->getWordReferenceHTML($reference, $dictionary_id);
+        $word_to_find = preg_replace('/\{\{|\}\}/', '', $reference);
-        if ($reference_link !== $reference) {
+        $homonymn = 0;
-          $details = str_replace($reference, $markdown_link, $details);
+      
+        if (strpos($word_to_find, ':') !== false) {
+          $separator = strpos($word_to_find, ':');
+          $homonymn = substr($word_to_find, $separator + 1);
+          $word_to_find = substr($word_to_find, 0, $separator);
+          if ($homonymn && trim($homonymn) && intval(trim($homonymn)) > 0) {
+            $homonymn = intval(trim($homonymn));
+          } else {
+            $homonymn = false;
+          }
+        }
+
+        $target_id = false;
+        $reference_ids = $this->getWordIdsWithName($dictionary_id, $word_to_find);
+
+        if (count($reference_ids) > 0) {
+          if ($homonymn !== false && $homonymn > 0) {
+            if (isset($reference_ids[$homonymn - 1])) {
+              $target_id = $reference_ids[$homonymn - 1];
+            }
+          } else if ($homonymn !== false) {
+            $target_id = $reference_ids[0];
+          }
+
+          if ($target_id !== false) {
+            if ($homonymn < 1) {
+              $homonymn = 1;
+            }
+            $homonymn_sub_html = count($reference_ids) > 1 && $homonymn - 1 >= 0 ? '<sub>' . $homonymn . '</sub>' : '';
+            $site_root = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], $dictionary_id));
+            $markdown_link = '<span class="word-reference"><a href="' . $site_root . $dictionary_id . '/' . $target_id .'" target="_blank" title="Link to Reference">'
+              . '<span class="orthographic-translation">' . $this->translateOrthography($word_to_find, $dictionary_id) . '</span>' . $homonymn_sub_html
+            . '</a></span>';
+            $details = str_replace($reference, $markdown_link, $details);
+          }
         }
       }
     }
@@ -247,50 +233,6 @@ WHERE words.dictionary=? AND is_public=1";
     return $details;
   }
 
-  private function getWordReferenceHTML($reference, $dictionary_id, $direct_link = true) {
-    $word_to_find = preg_replace('/\{\{|\}\}/', '', $reference);
-    $homonymn = 0;
-  
-    if (strpos($word_to_find, ':') !== false) {
-      $separator = strpos($word_to_find, ':');
-      $homonymn = substr($word_to_find, $separator + 1);
-      $word_to_find = substr($word_to_find, 0, $separator);
-      if ($homonymn && trim($homonymn) && intval(trim($homonymn)) > 0) {
-        $homonymn = intval(trim($homonymn));
-      } else {
-        $homonymn = false;
-      }
-    }
-
-    $target_id = false;
-    $reference_ids = $this->getWordIdsWithName($dictionary_id, $word_to_find);
-
-    if (count($reference_ids) > 0) {
-      if ($homonymn !== false && $homonymn > 0) {
-        if (isset($reference_ids[$homonymn - 1])) {
-          $target_id = $reference_ids[$homonymn - 1];
-        }
-      } else if ($homonymn !== false) {
-        $target_id = $reference_ids[0];
-      }
-
-      if ($target_id !== false) {
-        if ($homonymn < 1) {
-          $homonymn = 1;
-        }
-        $homonymn_sub_html = count($reference_ids) > 1 && $homonymn - 1 >= 0 ? '<sub>' . $homonymn . '</sub>' : '';
-        $site_root = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], $dictionary_id));
-        return '<span class="word-reference"><a href="'
-          . ($direct_link ? $site_root . $dictionary_id . '/' : '#') . $target_id .'" '
-          . ($direct_link ? 'target="_blank" ' : '') . 'title="Link to Reference">'
-          . '<span class="orthographic-translation">' . $this->translateOrthography($word_to_find, $dictionary_id) . '</span>' . $homonymn_sub_html
-        . '</a></span>';
-      }
-    }
-
-    return $reference;
-  }
-
   private function getWordIdsWithName($dictionary, $word_name) {
     if (is_numeric($dictionary)) {
       $query = "SELECT word_id FROM words WHERE dictionary=? AND name=?";

src/structure.sql

@@ -99,7 +99,5 @@ CREATE TABLE IF NOT EXISTS `words_advanced` (
   `dictionary` int(11) NOT NULL,
   `word_id` int(11) NOT NULL,
   `etymology` text NOT NULL COMMENT 'Comma-separated',
-  `related` text NOT NULL COMMENT 'Comma-separated',
-  `principal_parts` text NOT NULL COMMENT 'Comma-separated',
   UNIQUE KEY `dictionary_word_id` (`dictionary`,`word_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

template-index.html

@@ -146,12 +146,6 @@
           <label>Etymology / Root Words<br>
             <input id="wordEtymology" maxlength="2500" placeholder="comma,separated,root,words">
           </label>
-          <label>Related Words<br>
-            <input id="wordRelated" maxlength="2500" placeholder="comma,separated,related,words">
-          </label>
-          <label>Principal Parts<a href="https://en.wikipedia.org/wiki/Principal_parts" target="_blank" class="label-button">What's This?</a><br>
-            <input id="wordPrincipalParts" maxlength="2500" placeholder="comma,separated,principal,parts">
-          </label>
         </div>
         <div id="wordErrorMessage"></div>
         <a class="button" id="addWordButton">Add Word</a>

template-view.html

@@ -81,6 +81,9 @@
               <label>Exact Words
                 <input type="checkbox" id="searchExactWords">
               </label>
+              <label style="display:none;">Translations
+                <input type="checkbox" id="searchOrthography">
+              </label>
             </div>
           </div>
           <div class="split">