Update script

4 files changed, 79 insertions, 122 deletions

diff --git a/config.mk b/config.mk
index 5bbea6f..21470a9 100644
--- a/config.mk
+++ b/config.mk
@@ -11,15 +11,15 @@ $(DOCUMENTS_DIR): $(RESOURCES_DIR) $(MANUAL_FILE)
 	mkdir -p $@
 	tar -x -z -f $(MANUAL_FILE) -C $@
 
-$(INDEX_FILE): $(SOURCE_DIR)/src/index.sh $(DOCUMENTS_DIR)
+$(INDEX_FILE): $(SOURCE_DIR)/src/index-pages.sh $(SOURCE_DIR)/src/index-terms.sh $(DOCUMENTS_DIR)
 	rm -f $@
-	$(SOURCE_DIR)/src/index.sh $@ $(DOCUMENTS_DIR)/*.html
-	$(SOURCE_DIR)/src/index.sh -i "Entry" $@ $(DOCUMENTS_DIR)/Concept-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Macro" $@ $(DOCUMENTS_DIR)/M4-Macro-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Macro" $@ $(DOCUMENTS_DIR)/Autoconf-Macro-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Macro" $@ $(DOCUMENTS_DIR)/Autotest-Macro-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Variable" $@ $(DOCUMENTS_DIR)/Cache-Variable-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Variable" $@ $(DOCUMENTS_DIR)/Output-Variable-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Function" $@ $(DOCUMENTS_DIR)/Program-_0026-Function-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Entry" $@ $(DOCUMENTS_DIR)/Preprocessor-Symbol-Index.html
-	$(SOURCE_DIR)/src/index.sh -i "Variable" $@ $(DOCUMENTS_DIR)/Environment-Variable-Index.html
+	$(SOURCE_DIR)/src/index-pages.sh $@ $(DOCUMENTS_DIR)/*.html
+	$(SOURCE_DIR)/src/index-terms.sh "Entry" $@ $(DOCUMENTS_DIR)/Concept-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Macro" $@ $(DOCUMENTS_DIR)/M4-Macro-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Macro" $@ $(DOCUMENTS_DIR)/Autoconf-Macro-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Macro" $@ $(DOCUMENTS_DIR)/Autotest-Macro-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Variable" $@ $(DOCUMENTS_DIR)/Cache-Variable-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Variable" $@ $(DOCUMENTS_DIR)/Output-Variable-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Function" $@ $(DOCUMENTS_DIR)/Program-_0026-Function-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Entry" $@ $(DOCUMENTS_DIR)/Preprocessor-Symbol-Index.html
+	$(SOURCE_DIR)/src/index-terms.sh "Variable" $@ $(DOCUMENTS_DIR)/Environment-Variable-Index.html
diff --git a/src/index-pages.sh b/src/index-pages.sh
new file mode 100755
index 0000000..92d4e19
--- /dev/null
+++ b/src/index-pages.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# shellcheck source=../../../scripts/create_table.sh
+. "$(dirname "$0")"/../../../scripts/create_table.sh
+# shellcheck source=../../../scripts/insert.sh
+. "$(dirname "$0")"/../../../scripts/insert.sh
+
+DB_PATH="$1"
+shift
+
+get_title() {
+	FILE="$1"
+
+	pup -p -f "$FILE" 'title text{}' | \
+		tr -d \\n | \
+		sed 's/ (Autoconf)//g' | \
+		sed 's/\"/\"\"/g'
+}
+
+insert_pages() {
+	# Get title and insert into table for each html file
+	while [ -n "$1" ]; do
+		unset PAGE_NAME
+		unset PAGE_TYPE
+		PAGE_NAME="$(get_title "$1")"
+		PAGE_TYPE="Guide"
+		if [ -n "$PAGE_NAME" ]; then
+			insert "$DB_PATH" "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")"
+		fi
+		shift
+	done
+}
+
+create_table "$DB_PATH"
+insert_pages "$@"
diff --git a/src/index-terms.sh b/src/index-terms.sh
new file mode 100755
index 0000000..c9344d4
--- /dev/null
+++ b/src/index-terms.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# shellcheck source=../../../scripts/create_table.sh
+. "$(dirname "$0")"/../../../scripts/create_table.sh
+# shellcheck source=../../../scripts/insert.sh
+. "$(dirname "$0")"/../../../scripts/insert.sh
+
+TYPE="$1"
+shift
+DB_PATH="$1"
+shift
+
+insert_index_terms() {
+	# Get each term from an index page and insert
+	while [ -n "$1" ]; do
+		grep -Eo "<a href.*</a>:" "$1" | while read -r line; do
+			insert_term "$line"
+		done
+
+		shift
+	done
+}
+
+insert_term() {
+	LINK="$1"
+	NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/\"\"//g' | tr -d \\n)"
+	PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')"
+
+	insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH"
+}
+
+create_table "$DB_PATH"
+insert_index_terms "$@"
diff --git a/src/index.sh b/src/index.sh
deleted file mode 100755
index 819f228..0000000
--- a/src/index.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env sh
-
-# Remove duplicate Macros
-clean_table() {
-	sqlite3 "$DB_PATH" "DELETE FROM searchIndex WHERE EXISTS (SELECT 1 FROM searchIndex s2 WHERE searchIndex.name = s2.name AND searchIndex.type = s2.type AND searchIndex.type = \"Macro\" AND searchIndex.rowid > s2.rowid)"
-}
-
-create_table() {
-	sqlite3 "$DB_PATH" "CREATE TABLE IF NOT EXISTS searchIndex(id INTEGER PRIMARY KEY, name TEXT, type TEXT, path TEXT);"
-	sqlite3 "$DB_PATH" "CREATE UNIQUE INDEX IF NOT EXISTS anchor ON searchIndex (name, type, path);"
-}
-
-get_title() {
-	FILE="$1"
-
-	pup -p -f "$FILE" 'title text{}' | \
-		sed 's/ (Autoconf)//g' | \
-		sed 's/\"/\"\"/g'
-}
-
-get_type() {
-	FILE="$1"
-	PATTERN="The node you are looking for is at.*Limitations-of-.*\.html;Builtin
-	The node you are looking for is at;Macro"
-
-	echo "$PATTERN" | while read -r line; do
-		#echo "$line"
-		if grep -Eq "$(echo "$line" | cut -d ';' -f 1)" "$FILE"; then
-			echo "$line" | cut -d ';' -f 2
-			break
-		fi
-	done
-}
-
-insert() {
-	NAME="$1"
-	TYPE="$2"
-	PAGE_PATH="$3"
-
-	sqlite3 "$DB_PATH" "INSERT INTO searchIndex(name, type, path) VALUES (\"$NAME\",\"$TYPE\",\"$PAGE_PATH\");"
-}
-
-insert_index_terms() {
-	# Get each term from an index page and insert
-	while [ -n "$1" ]; do
-		grep -Eo "<a href.*></a>" "$1" | while read -r line; do
-			insert_term "$line"
-		done
-
-		shift
-	done
-}
-
-
-insert_pages() {
-	# Get title and insert into table for each html file
-	while [ -n "$1" ]; do
-		unset PAGE_NAME
-		unset PAGE_TYPE
-		PAGE_NAME="$(get_title "$1")"
-		if [ -n "$PAGE_NAME" ]; then
-			PAGE_TYPE="$(get_type "$1")"
-			#get_type "$1"
-			if [ -z "$PAGE_TYPE" ]; then
-				PAGE_TYPE="Guide"
-			fi
-			#echo "$PAGE_TYPE"
-			insert "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")"
-		fi
-		shift
-	done
-}
-
-insert_term() {
-	LINK="$1"
-	NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)"
-	TYPE="$INDEX_TYPE"
-	PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')"
-
-	insert "$NAME" "$TYPE" "$PAGE_PATH"
-}
-
-TYPE="PAGES"
-
-# Check flags
-while true; do
-	case "$1" in
-		-i|--index)
-			TYPE="INDEX"
-			shift
-			INDEX_TYPE="$1"
-			shift
-			;;
-		*)
-			break
-	esac
-done
-
-DB_PATH="$1"
-shift
-
-create_table
-case "$TYPE" in
-	PAGES)
-		insert_pages "$@"
-		;;
-	INDEX)
-		insert_index_terms "$@"
-		clean_table
-		;;
-esac