Browse Source

Move inigrep prefix setting to saturnin-www

Alois Mahdal 9 years ago
parent
commit
04dfabd117
2 changed files with 14 additions and 2 deletions
  1. 11
    2
      src/ffoo/saturnin_urimagic.sh
  2. 3
    0
      src/libexec/saturnin-www

+ 11
- 2
src/ffoo/saturnin_urimagic.sh View File

4
 ffoo import pretty
4
 ffoo import pretty
5
 
5
 
6
 
6
 
7
+#
8
+# Prefix for inigrep path for 1 and 2-arg queries
9
+#
10
+saturnin_urimagic__inipfx0="${saturnin_urimagic__inipfx0:-}"
11
+saturnin_urimagic__inipfxN="${saturnin_urimagic__inipfxN:-}"
12
+
13
+
7
 saturnin_urimagic__scan() {
14
 saturnin_urimagic__scan() {
8
     #
15
     #
9
     # Scan stdin for what looks like URI, ID or keyword
16
     # Scan stdin for what looks like URI, ID or keyword
58
     local line      # input line,   eg. "g hello dolly" or "bug 1234"
65
     local line      # input line,   eg. "g hello dolly" or "bug 1234"
59
     local kw        # keyword part, eg. "g"             or "bug"
66
     local kw        # keyword part, eg. "g"             or "bug"
60
     local query     # query part,   eg. "hello dolly"   or "1234"
67
     local query     # query part,   eg. "hello dolly"   or "1234"
68
+    local pfx0=$saturnin_urimagic__inipfx0
69
+    local pfxN=$saturnin_urimagic__inipfxN
61
     while read line;
70
     while read line;
62
     do
71
     do
63
         line="$line "
72
         line="$line "
66
         debug -v kw query
75
         debug -v kw query
67
         if test -n "$query";
76
         if test -n "$query";
68
         then
77
         then
69
-            local fmt=$(inigrep -j -1 -p www.query.${kw,,})
78
+            local fmt=$(inigrep -j -1 -p $pfxN.${kw,,})
70
             debug -v fmt
79
             debug -v fmt
71
             printf "$fmt\n" "$query"
80
             printf "$fmt\n" "$query"
72
         else
81
         else
73
-            inigrep -j -1 -p www.bookmark.$kw
82
+            inigrep -j -1 -p $pfx0.$kw
74
         fi
83
         fi
75
     done
84
     done
76
 }
85
 }

+ 3
- 0
src/libexec/saturnin-www View File

7
 
7
 
8
 ffoo import saturnin_urimagic
8
 ffoo import saturnin_urimagic
9
 
9
 
10
+saturnin_urimagic__inipfx0="www.bookmark"
11
+saturnin_urimagic__inipfxN="www.query"
12
+
10
 #
13
 #
11
 # On clipboards:
14
 # On clipboards:
12
 #
15
 #