merge converters into filters

src/ffoo/saturnin_urimagic.sh

@@ -12,7 +12,9 @@ __saturnin_urimagic__flt_exps() {
       | perl -ne '
             next unless m/\b([a-zA-Z]\w*\s*=\s*\w+)\b/;
             print "$1\n";
-        '
+        ' \
+      | sed -re 's/\s*=\s*/ /' \
+      | tr '[:upper:]' '[:lower:]'
 }
 
 
@@ -24,7 +26,8 @@ __saturnin_urimagic__flt_ids() {
       | perl -ne '
             next unless m/\b([a-zA-Z]\w*#\w+)\b/;
             print "$1\n";
-        '
+        ' \
+      | tr '#' ' '
 }
 
 
@@ -33,10 +36,10 @@ __saturnin_urimagic__flt_tags() {
     # Hack "tags" like bug123 out of the text
     #
     tr ' ' '\n' \
-      | grep -E '^[a-zA-Z]+[0-9]+$'
+      | grep -E '^[a-zA-Z]+[0-9]+$' \
+      | sed -r 's/([a-zA-Z]+)([0-9])/\1 \2/'
 }
 
-
 __saturnin_urimagic__flt_kws() {
     #
     # Hack out lines that look like kw expressions
@@ -85,11 +88,11 @@ saturnin_urimagic__scan() {
         ##
         # process each pipe *async* by different filter
         #
-        < 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 &
+        < maybe_uris ${p}flt_uris             > uris &
+        < maybe_ids  ${p}flt_ids  | ${p}deref > uris_from_ids &
+        < maybe_exps ${p}flt_exps | ${p}deref > uris_from_exps &
+        < maybe_tags ${p}flt_tags | ${p}deref > uris_from_tags &
+        < maybe_kws  ${p}flt_kws  | ${p}deref > uris_from_kws &
         ##
         # print result *sync* in correct order
         #
@@ -105,30 +108,6 @@ saturnin_urimagic__scan() {
 }
 
 
-__saturnin_urimagic__conv_id() {
-    #
-    # Convert doer-like ID to kw expression
-    #
-    tr '#' ' '
-}
-
-
-__saturnin_urimagic__conv_tag() {
-    #
-    # Convert tag to kw expression
-    #
-    sed -r 's/([a-zA-Z]+)([0-9])/\1 \2/'
-}
-
-
-__saturnin_urimagic__conv_exp() {
-    #
-    # Convert equal sign expression to kw expression
-    #
-    sed -re 's/\s*=\s*/ /' | tr '[:upper:]' '[:lower:]'
-}
-
-
 __saturnin_urimagic__deref() {
     #
     # Turn keyword or query (like "g hello" for google) to URI