Use more convenient routine and file names

Make them shorter but also sortable (ie. 'conv' for converters, 'flt'
for filters.)

src/ffoo/saturnin_urimagic.sh

@@ -4,7 +4,7 @@ ffoo import inigrep
 ffoo import pretty
 
 
-__saturnin_urimagic__filter_exprs() {
+__saturnin_urimagic__flt_exps() {
     #
     # Hack expressions like bug = 123 out of the text
     #
@@ -16,7 +16,7 @@ __saturnin_urimagic__filter_exprs() {
 }
 
 
-__saturnin_urimagic__filter_ids() {
+__saturnin_urimagic__flt_ids() {
     #
     # Hack doer-like id's (ID#123) out of the text
     #
@@ -28,7 +28,7 @@ __saturnin_urimagic__filter_ids() {
 }
 
 
-__saturnin_urimagic__filter_tags() {
+__saturnin_urimagic__flt_tags() {
     #
     # Hack "tags" like bug123 out of the text
     #
@@ -37,7 +37,7 @@ __saturnin_urimagic__filter_tags() {
 }
 
 
-__saturnin_urimagic__filter_kws() {
+__saturnin_urimagic__flt_kws() {
     #
     # Hack out lines that look like kw expressions
     #
@@ -45,7 +45,7 @@ __saturnin_urimagic__filter_kws() {
 }
 
 
-__saturnin_urimagic__filter_uris() {
+__saturnin_urimagic__flt_uris() {
     #
     # Hack URIs out of the text.
     #
@@ -78,24 +78,25 @@ saturnin_urimagic__scan() {
         ##
         # heat up and fill pipes
         #
-        mkfifo maybe_uris maybe_ids maybe_exprs maybe_tags maybe_kws \
-               uris uris_from_ids uris_from_exprs uris_from_tags uris_from_kws
-        cat | tee maybe_uris maybe_ids maybe_exprs maybe_tags maybe_kws >/dev/null &
+        mkfifo maybe_uris maybe_ids maybe_exps maybe_tags maybe_kws \
+               uris uris_from_ids uris_from_exps uris_from_tags uris_from_kws
+        cat | tee maybe_uris maybe_ids maybe_exps maybe_tags maybe_kws \
+            >/dev/null &
         ##
         # process each pipe *async* by different filter
         #
-        < maybe_uris  ${p}filter_uris                     > uris &
-        < maybe_ids   ${p}filter_ids   | ${p}id2kw   | ${p}kw2uri > uris_from_ids &
-        < maybe_exprs ${p}filter_exprs | ${p}expr2kw | ${p}kw2uri > uris_from_exprs &
-        < maybe_tags  ${p}filter_tags  | ${p}tag2kw  | ${p}kw2uri > uris_from_tags &
-        < maybe_kws   ${p}filter_kws   |               ${p}kw2uri > uris_from_kws &
+        < maybe_uris ${p}flt_uris                            > uris &
+        < maybe_ids  ${p}flt_ids  | ${p}conv_id  | ${p}deref > uris_from_ids &
+        < maybe_exps ${p}flt_exps | ${p}conv_exp | ${p}deref > uris_from_exps &
+        < maybe_tags ${p}flt_tags | ${p}conv_tag | ${p}deref > uris_from_tags &
+        < maybe_kws  ${p}flt_kws  |                ${p}deref > uris_from_kws &
         ##
         # print result *sync* in correct order
         #
         {
             cat uris
             cat uris_from_ids
-            cat uris_from_exprs
+            cat uris_from_exps
             cat uris_from_tags
             cat uris_from_kws
         } | grep .  # throw away empties; add missing LF
@@ -104,7 +105,7 @@ saturnin_urimagic__scan() {
 }
 
 
-__saturnin_urimagic__id2kw() {
+__saturnin_urimagic__conv_id() {
     #
     # Convert doer-like ID to kw expression
     #
@@ -112,7 +113,7 @@ __saturnin_urimagic__id2kw() {
 }
 
 
-__saturnin_urimagic__tag2kw() {
+__saturnin_urimagic__conv_tag() {
     #
     # Convert tag to kw expression
     #
@@ -120,7 +121,7 @@ __saturnin_urimagic__tag2kw() {
 }
 
 
-__saturnin_urimagic__expr2kw() {
+__saturnin_urimagic__conv_exp() {
     #
     # Convert equal sign expression to kw expression
     #
@@ -128,7 +129,7 @@ __saturnin_urimagic__expr2kw() {
 }
 
 
-__saturnin_urimagic__kw2uri() {
+__saturnin_urimagic__deref() {
     #
     # Turn keyword or query (like "g hello" for google) to URI
     #

src/libexec/saturnin-www

@@ -52,14 +52,14 @@ debug "\$@='$@'"
 debug -v src
 
 case "$src" in
-    args) uri="$(echo "$@" | find_uri)" ;;
-    file) uri="$(cat "$file" | find_uri)" ;;
-    xpri) uri="$(clipln pri | find_uri)" ;;
-    xsec) uri="$(clipln sec | find_uri)" ;;
-    xclp) uri="$(clipln clp | find_uri)" ;;
-    xall) uri="$(clipln pri | find_uri)"
-          uri="$(clipln sec | find_uri)"
-          uri="$(clipln clp | find_uri)"
+    args) uri="$(echo "$@" | saturnin_urimagic__scan)" ;;
+    file) uri="$(cat "$file" | saturnin_urimagic__scan)" ;;
+    xpri) uri="$(clipln pri | saturnin_urimagic__scan)" ;;
+    xsec) uri="$(clipln sec | saturnin_urimagic__scan)" ;;
+    xclp) uri="$(clipln clp | saturnin_urimagic__scan)" ;;
+    xall) uri="$(clipln pri | saturnin_urimagic__scan)"
+          uri="$(clipln sec | saturnin_urimagic__scan)"
+          uri="$(clipln clp | saturnin_urimagic__scan)"
           ;;
 esac
 debug -v uri