Update conver_links

Author: gtjoseph

utils/initial_import/convert_links.sh

@@ -9,45 +9,72 @@ PROGDIR=$(dirname $PROGNAME)
 # link to include the target's full path relative to the
 # document root.
 
-files=$(grep -rl "](/" docs/*)
+dir=${1:-docs/}
+
+files=$(grep -rlE "\]\(/[^/()]+\)" $dir | grep -E ".md$")
+#files=$(grep -rl "](/" docs/*)
 prefix="/"
 IFS=$' \n'
-for f in $files ; do
-	sed -n -r -e "s@.*\]\(${prefix}([^)]+)\).*@\1@gip" $f | while read URL ; do
-		if [ -f site/$URL ] || [ -d site/$URL ] ; then
-			echo "found: $URL"
+declare -ix fixed_count=0
+
+fixfile() {
+	f="$1"
+	declare -i fixed_count=0
+	while read URL ; do
+		if [ -z "$URL" ] ; then
+			echo "   no issues"
+			break;			
+		fi
+		search="temp/build-20/site/$URL"
+#		echo "Search: '$search'"
+		if [ -f "$search" ] || [ -d "$search" ] ; then
+#			echo "   found: $URL"
 			continue
 		fi
 
 		if [ -z "${URL%%#*}" ] ; then
-			newurl=$($PROGDIR/slugify.py "${URL}")
+			newurl=$($PROGDIR/../slugify.py "${URL}")
 		else
-			newurl=$($PROGDIR/slugify.py "${URL%%#*}")
+			newurl=$($PROGDIR/../slugify.py "${URL%%#*}")
 		fi
 		[[ "$newurl" =~ Asterisk-[0-9][0-9] ]] && continue
 
+		echo "   not found: $URL"
 		if [ "$URL" == "Home" ] ; then
 			newpage="/"
 		else
-			newpage=$(cd site ; find -iname "${newurl}" | tr -d '\n')
-			newpage=${newpage/.\//}
+			newpage=$(cd temp/build-20/site ; find -iname "${newurl}" | tr -d '\n')
+			newpage="${newpage/.\//}"
 			if [ -z "$newpage" ] ; then
-				newpage=$(cd site ; find -iname "${newurl}.html" | tr -d '\n')
-				newpage=${newpage/.\//}
+				newpage=$(cd temp/build-20/site ; find -iname "${newurl}.html" | tr -d '\n')
+				newpage="${newpage/.\//}"
 			fi
 		fi
 		if [ -n "$newpage" ] ; then
-			fixed=$(sed -n -r -e "s@\(${prefix}${URL//+/\\+}\)@\(/${newpage}\)@gip" $f)
+#			echo $newpage
+			newsearch=${URL//+/\\+}
+			newsearch=${newsearch//\?/\\?}
+
+			fixed=$(sed -n -r -e "s@\]\(/${newsearch}\)@](/${newpage})@gip" $f)
 			if [ -z "$fixed" ] ; then
-				echo -e "$f Unable to fix: ${prefix}${URL} -> ${newurl}"
+				echo -e "      Unable to fix: ${newsearch} -> ${newpage}"
 			else
-#				echo "(${prefix}${URL//+/\\+}) -> (/${newpage})"
-				sed -i -r -e "s@\(${prefix}${URL//+/\\+}\)@\(/${newpage}\)@gi" $f
+				fixed_count=$(( fixed_count + 1 ))
+				echo "      fixed: /${newpage}"
+				sed -i -r -e "s@\]\(/${newsearch}\)@](/${newpage})@gi" $f
 			fi
 		else
 			if [[ ! "${newurl}" =~ .*REST.* ]] ; then
-				echo "$f: Page not found: ${prefix}${URL} -> ${newurl}"
+				echo "      Page not found: ${newurl}"
 			fi
 		fi
+	done < <(sed -n -r -e "s/.*\]\(\/([^/)]+)\).*/\1/gp" $f )
+	return $fixed_count
+}
+
+for f in $files ; do
+	echo $f
+	while true ; do
+		fixfile $f && break;
 	done
 done