single tassk display

[busy] / Tasks.page

diff --git a/Tasks.page b/Tasks.page
index 6274be8a44cafdf7ae9d5f821589d2ccdcd17f36..7ca263d5b08cf9901e8630af5bac2d3bb149493d 100644 (file)
--- a/Tasks.page
+++ b/Tasks.page
@@ -1,11 +1,11 @@
 #!/bin/zsh
 
-info="$(egrep -o '(^|&)(i=)[0-9]{10}_[0-9]{3}(&|$)' <<<"${QUERY_STRING}" |tr -d '&i=')"
-edit="$(egrep -o '(^|&)(e=)[0-9]{10}_[0-9]{3}(&|$)' <<<"${QUERY_STRING}" |tr -d '&e=')"
-search="$(egrep -o '(^|&)(s=).+(&|$)' <<<"${QUERY_STRING}" |sed -r 's:^&?s=::;s:\+: :g;s:%:\\x:g')"
-search="$(echo -e "${search}" |sed 's:\t: :g;s:\r::g;s:\\:\\\\:g' |head -n1)"
-new="$(egrep -o '(^|&)(n=).+(&|$)' <<<"${QUERY_STRING}" |sed -r 's:^&?n=::;s:\+: :g;s:%:\\x:g')"
-new="$(echo -e "${new}" |sed 's:\t: :g;s:\r::g;s:\\:\\\\:g' |head -n1)"
+info="$(sed -r 's:(^|.*&)i=([0-9]{10}_[0-9]{3}).*|.*:\2:;s:&.*::' <<<"${QUERY_STRING}")"
+edit="$(sed -r 's:(^|.*&)e=([0-9]{10}_[0-9]{3}).*|.*:\2:;s:&.*::' <<<"${QUERY_STRING}")"
+search="$(sed -r 's:(^|.*&)s=(.*)|.*:\2:;s:&.*::;s:\+: :g;s:%:\\x:g' <<<"${QUERY_STRING}")"
+search="$(echo -e "${search}" |sed -rn '1{s:\t: :g;s:\r::g;s:\\:\\\\:g;p}')"
+new="$(sed -r 's:(^|.*&)n=(.*)|.*:\2:;s:&.*::;s:\+: :g;s:%:\\x:g' <<<"${QUERY_STRING}")"
+new="$(echo -e "${new}" |sed -rn '1{s:\t: :g;s:\r::g;s:\\:\\\\:g;p}')"
 
 cat <<TasksEND
   <div id="LEFT">
@@ -18,9 +18,9 @@ cat <<TasksEND
 TasksEND
 if [ -n "$search" ]; then
   echo "<h1>Tasks search results for: $search</h1>"
-  for each in $(grep -ile "$search" Tasks/<0000000000-9999999999>_<000-999>.task); do
+  for each in $(grep -ile "$search" Tasks/<0000000000-9999999999>_<000-999>); do
     id=$(sed -r 's:^.*/::;s:.task$::' <<<$each)
-    echo "<div class='search'><a href='#task_$id'><h2>$(date -d @$(cut -d_ -f1 <<<"$id"))</h2></a>"
+    echo "<div class='search'><a href='${SCRIPTNAME}?p=Tasks&amp;i=$id'><h2>$(date -d @$(cut -d_ -f1 <<<"$id"))</h2></a>"
     grep -C1 -ie "$search" "$each" |sed "s:$search:<b>&</b>:g;s:$:<br>:g"
     echo '</div>'
   done
@@ -28,7 +28,34 @@ if [ -n "$search" ]; then
 fi
 echo '</div><div id="MAIN">'
 
-[ -n "$new" ] && cat <<TaskEnd
+if [ -n "$info" -a -r "Tasks/$info" -a -r "Tasks/$info.meta" ]; then
+  datafile="Tasks/$info"
+  metafile="Tasks/$info.meta"
+  headline="$(sed -rn '/^headline=/{s:^[a-z]+=(.+)$:\1:p;q}' "$metafile")"
+  taskstatus="$(sed -rn '/^status=/{s:^[a-z]+=(.+)$:\1:p;q}' "$metafile")"
+  section="$(sed -rn '/^section=/{s:^[a-z]+=(.+)$:\1:p;q}' "$metafile")"
+  attendant="$(sed -rn '/^attendant=/{s:^[a-z]+=(.+)$:\1:p;q}' "$metafile")"
+  [ -z "$section" ] && section='(none)'
+  [ -z "$attendant" ] && attendant='(none)'
+  cat <<TasksEND
+    <div class="Task">
+      <div class="wikitext">
+       <h1>$headline</h1>
+       $(_wiki "$datafile")
+      </div>
+      <table><tr>
+       <td><b>Status</b><br>
+       $taskstatus</td>
+       <td><b>Section</b><br>
+       $section</td>
+       <td><b>Attendant</b><br>
+       $attendant</td>
+      </tr></table>
+    </div>
+TasksEND
+fi
+
+[ -z "$info" -a -n "$new" ] && cat <<TaskEnd
 <form class="Task" style="height:20em;" method="post" action="write/taskmeta.cgi" accept-charset="UTF-8">
   <h1>$new</h1>
   <input type="hidden" name="headline" value="$new">
@@ -50,16 +77,19 @@ echo '</div><div id="MAIN">'
 </form>
 TaskEnd
 
-[ -z "$new" ] && stat -c '' Tasks/<0000000000-9999999999>_<000-999>.meta && for each in Tasks/<0000000000-9999999999>_<000-999>.meta(.om); do
-  headline="$(egrep -x 'headline=.+' "$each" |sed 's:headline=::')"
-  status="$(egrep -x 'status=.+' "$each" |sed 's:status=::')"
-  section="$(egrep -x 'section=.+' "$each" |sed 's:section=::')"
-  attendant="$(egrep -x 'attendant=.+' "$each" |sed 's:attendant=::')"
+[ -z "$info" -a -z "$new" ] && stat -c '' Tasks/<0000000000-9999999999>_<000-999>.meta && for each in Tasks/<0000000000-9999999999>_<000-999>.meta(.om); do
+  info="$(basename "$each" |sed 's:.meta$::')"
+  headline="$(sed -rn '/^headline=/{s:^[a-z]+=(.+)$:\1:p;q}' "$each")"
+  taskstatus="$(sed -rn '/^status=/{s:^[a-z]+=(.+)$:\1:p;q}' "$each")"
+  section="$(sed -rn '/^section=/{s:^[a-z]+=(.+)$:\1:p;q}' "$each")"
+  attendant="$(sed -rn '/^attendant=/{s:^[a-z]+=(.+)$:\1:p;q}' "$each")"
+  [ -z "$section" ] && section='(none)'
+  [ -z "$attendant" ] && attendant='(none)'
   cat <<TasksEND
    <div class="Task">
-     <b>$headline</b><br>
-     <span><b>Status:</b> $status</span>
-     <span><b>Section:</b> $Section</span>
+     <a href="${SCRIPTNAME}?p=Tasks&amp;i=${info}"><b>$headline</b></a><br>
+     <span><b>Status:</b> $taskstatus</span>
+     <span><b>Section:</b> $section</span>
      <span><b>Attendant:</b> $attendant</span>
    </div>
 TasksEND