Skip to content

Commit 0eb3cc8

Browse files
bert-githubbert-github
committed
[css2] Updated to use explicit ientry number, and to sort before generating
HTML. Sorting is on resolved date in reverse, followed by entry date in reverse. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40830
1 parent 3cbd7da commit 0eb3cc8

2 files changed

Lines changed: 90 additions & 72 deletions

File tree

‎css2/bin/Attic/issues‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
ISSUES=`dirname $0`/../issues.db
1717
HTML=`dirname $0`/../issues.srb
18-
DATEFRM="+%d %b %Y"
18+
#DATEFRM="+%d %b %Y"
19+
DATEFRM="+%Y-%m-%d"
1920
TMP=${TMPDIR:-/tmp}/issue.$$
2021
ARCH=`uname`
2122
PAGER=${PAGER:-more}
@@ -63,9 +64,9 @@ list_issues ()
6364
{
6465
(
6566
IFS=' '
66-
num=0
67-
while read desc res ref date1 date2 spec; do
68-
num=`expr $num + 1`
67+
#num=0
68+
while read desc res ref date1 date2 spec num; do
69+
#num=`expr $num + 1`
6970
pr "Number : $num"
7071
pr "Description : $desc"
7172
pr "Resolution : $res"
@@ -82,9 +83,9 @@ list_unresolved ()
8283
{
8384
(
8485
IFS=' '
85-
num=0
86-
while read desc res ref date1 date2 spec; do
87-
num=`expr $num + 1`
86+
#num=0
87+
while read desc res ref date1 date2 spec num; do
88+
#num=`expr $num + 1`
8889
if [ "$res" = "-" ]; then
8990
pr "Number : $num"
9091
pr "Description : $desc"
@@ -103,9 +104,9 @@ list_to_be_updated ()
103104
{
104105
(
105106
IFS=' '
106-
num=0
107-
while read desc res ref date1 date2 spec; do
108-
num=`expr $num + 1`
107+
#num=0
108+
while read desc res ref date1 date2 spec num; do
109+
#num=`expr $num + 1`
109110
if [ "$spec" = "no" ]; then
110111
pr "Number : $num"
111112
pr "Description : $desc"
@@ -122,21 +123,27 @@ list_to_be_updated ()
122123

123124
generate_html ()
124125
{
125-
pr "<table border>"
126-
echo "<tr>"
127-
echo " <th>#"
128-
echo " <th>Description"
129-
echo " <th>Resolution"
130-
echo " <th>Reference"
131-
echo " <th>Archived&nbsp;on"
132-
echo " <th>Resolved&nbsp;on"
133-
echo " <th>Spec up-to-date?"
126+
echo "<table border>"
127+
echo "<tr>"
128+
echo " <th>#"
129+
echo " <th>Description"
130+
echo " <th>Resolution"
131+
echo " <th>Reference"
132+
echo " <th>Archived&nbsp;on"
133+
echo " <th>Resolved&nbsp;on"
134+
echo " <th>Spec up-to-date?"
135+
sort -r -t ' ' -k 5,6 -k 4,5 $ISSUES |
134136
(
135137
IFS=' '
136-
i=0
137-
while read desc res ref date1 date2 spec; do
138-
i=`expr $i + 1`
139-
echo "<tr valign=baseline>"
138+
#i=0
139+
while read desc res ref date1 date2 spec i; do
140+
#i=`expr $i + 1`
141+
if [ "$res" = "-" ]; then
142+
class=unresolved
143+
else
144+
class=resolved
145+
fi
146+
echo "<tr valign=baseline class=$class>"
140147
echo " <td>$i"
141148
echo " <td>$desc"
142149
echo " <td>$res"
@@ -148,7 +155,7 @@ generate_html ()
148155
echo " <td>$date1"
149156
echo " <td>$date2"
150157
echo " <td>$spec"
151-
done < $ISSUES
158+
done
152159
)
153160
pr "</table>"
154161
pr "<p>Last update: "`ls -l $ISSUES | cut -c 42-47`\
@@ -168,7 +175,9 @@ add_issue ()
168175
fi
169176
ref=`echo $ref | tr "& " " "`
170177
desc=`echo $desc | tr "& " " "`
171-
pr "$desc - $ref "`date "$DATEFRM"`" - no" >>$ISSUES
178+
num=`wc -l $ISSUES|cut -c -8`
179+
num=`expr $num + 1`
180+
pr "$desc - $ref "`date "$DATEFRM"`" not yet no $num" >>$ISSUES
172181
generate_html >$HTML
173182
}
174183

@@ -190,13 +199,13 @@ resolve_issue ()
190199
date=`date "$DATEFRM"`
191200
(
192201
IFS=' '
193-
i=0
194-
while read desc h1 ref date1 h2 spec; do
195-
i=`expr $i + 1`
202+
#i=0
203+
while read desc h1 ref date1 h2 spec i; do
204+
#i=`expr $i + 1`
196205
if [ $i = "$num" ]; then
197-
echo "$desc $res $ref $date1 $date $spec"
206+
echo "$desc $res $ref $date1 $date $spec $i"
198207
else
199-
echo "$desc $h1 $ref $date1 $h2 $spec"
208+
echo "$desc $h1 $ref $date1 $h2 $spec $i"
200209
fi
201210
done < $ISSUES >$TMP
202211
)
@@ -216,16 +225,16 @@ update_issue ()
216225
esac
217226
(
218227
IFS=' '
219-
i=0
220-
while read desc res ref date1 date2 spec; do
221-
i=`expr $i + 1`
228+
#i=0
229+
while read desc res ref date1 date2 spec i; do
230+
#i=`expr $i + 1`
222231
if [ $i != "$num" ]; then
223-
echo "$desc $res $ref $date1 $date2 $spec"
232+
echo "$desc $res $ref $date1 $date2 $spec $i"
224233
elif [ "$res" = "-" ]; then
225234
pr "Error: cannot update; the issue must be resolved first" >&2
226-
echo "$desc $res $ref $date1 $date2 $spec"
235+
echo "$desc $res $ref $date1 $date2 $spec $i"
227236
else
228-
echo "$desc $res $ref $date1 $date2 yes"
237+
echo "$desc $res $ref $date1 $date2 yes $i"
229238
fi
230239
done < $ISSUES >$TMP
231240
)

‎css2/bin/issues‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
ISSUES=`dirname $0`/../issues.db
1717
HTML=`dirname $0`/../issues.srb
18-
DATEFRM="+%d %b %Y"
18+
#DATEFRM="+%d %b %Y"
19+
DATEFRM="+%Y-%m-%d"
1920
TMP=${TMPDIR:-/tmp}/issue.$$
2021
ARCH=`uname`
2122
PAGER=${PAGER:-more}
@@ -63,9 +64,9 @@ list_issues ()
6364
{
6465
(
6566
IFS=' '
66-
num=0
67-
while read desc res ref date1 date2 spec; do
68-
num=`expr $num + 1`
67+
#num=0
68+
while read desc res ref date1 date2 spec num; do
69+
#num=`expr $num + 1`
6970
pr "Number : $num"
7071
pr "Description : $desc"
7172
pr "Resolution : $res"
@@ -82,9 +83,9 @@ list_unresolved ()
8283
{
8384
(
8485
IFS=' '
85-
num=0
86-
while read desc res ref date1 date2 spec; do
87-
num=`expr $num + 1`
86+
#num=0
87+
while read desc res ref date1 date2 spec num; do
88+
#num=`expr $num + 1`
8889
if [ "$res" = "-" ]; then
8990
pr "Number : $num"
9091
pr "Description : $desc"
@@ -103,9 +104,9 @@ list_to_be_updated ()
103104
{
104105
(
105106
IFS=' '
106-
num=0
107-
while read desc res ref date1 date2 spec; do
108-
num=`expr $num + 1`
107+
#num=0
108+
while read desc res ref date1 date2 spec num; do
109+
#num=`expr $num + 1`
109110
if [ "$spec" = "no" ]; then
110111
pr "Number : $num"
111112
pr "Description : $desc"
@@ -122,21 +123,27 @@ list_to_be_updated ()
122123

123124
generate_html ()
124125
{
125-
pr "<table border>"
126-
echo "<tr>"
127-
echo " <th>#"
128-
echo " <th>Description"
129-
echo " <th>Resolution"
130-
echo " <th>Reference"
131-
echo " <th>Archived&nbsp;on"
132-
echo " <th>Resolved&nbsp;on"
133-
echo " <th>Spec up-to-date?"
126+
echo "<table border>"
127+
echo "<tr>"
128+
echo " <th>#"
129+
echo " <th>Description"
130+
echo " <th>Resolution"
131+
echo " <th>Reference"
132+
echo " <th>Archived&nbsp;on"
133+
echo " <th>Resolved&nbsp;on"
134+
echo " <th>Spec up-to-date?"
135+
sort -r -t ' ' -k 5,6 -k 4,5 $ISSUES |
134136
(
135137
IFS=' '
136-
i=0
137-
while read desc res ref date1 date2 spec; do
138-
i=`expr $i + 1`
139-
echo "<tr valign=baseline>"
138+
#i=0
139+
while read desc res ref date1 date2 spec i; do
140+
#i=`expr $i + 1`
141+
if [ "$res" = "-" ]; then
142+
class=unresolved
143+
else
144+
class=resolved
145+
fi
146+
echo "<tr valign=baseline class=$class>"
140147
echo " <td>$i"
141148
echo " <td>$desc"
142149
echo " <td>$res"
@@ -148,7 +155,7 @@ generate_html ()
148155
echo " <td>$date1"
149156
echo " <td>$date2"
150157
echo " <td>$spec"
151-
done < $ISSUES
158+
done
152159
)
153160
pr "</table>"
154161
pr "<p>Last update: "`ls -l $ISSUES | cut -c 42-47`\
@@ -168,7 +175,9 @@ add_issue ()
168175
fi
169176
ref=`echo $ref | tr "& " " "`
170177
desc=`echo $desc | tr "& " " "`
171-
pr "$desc - $ref "`date "$DATEFRM"`" - no" >>$ISSUES
178+
num=`wc -l $ISSUES|cut -c -8`
179+
num=`expr $num + 1`
180+
pr "$desc - $ref "`date "$DATEFRM"`" not yet no $num" >>$ISSUES
172181
generate_html >$HTML
173182
}
174183

@@ -190,13 +199,13 @@ resolve_issue ()
190199
date=`date "$DATEFRM"`
191200
(
192201
IFS=' '
193-
i=0
194-
while read desc h1 ref date1 h2 spec; do
195-
i=`expr $i + 1`
202+
#i=0
203+
while read desc h1 ref date1 h2 spec i; do
204+
#i=`expr $i + 1`
196205
if [ $i = "$num" ]; then
197-
echo "$desc $res $ref $date1 $date $spec"
206+
echo "$desc $res $ref $date1 $date $spec $i"
198207
else
199-
echo "$desc $h1 $ref $date1 $h2 $spec"
208+
echo "$desc $h1 $ref $date1 $h2 $spec $i"
200209
fi
201210
done < $ISSUES >$TMP
202211
)
@@ -216,16 +225,16 @@ update_issue ()
216225
esac
217226
(
218227
IFS=' '
219-
i=0
220-
while read desc res ref date1 date2 spec; do
221-
i=`expr $i + 1`
228+
#i=0
229+
while read desc res ref date1 date2 spec i; do
230+
#i=`expr $i + 1`
222231
if [ $i != "$num" ]; then
223-
echo "$desc $res $ref $date1 $date2 $spec"
232+
echo "$desc $res $ref $date1 $date2 $spec $i"
224233
elif [ "$res" = "-" ]; then
225234
pr "Error: cannot update; the issue must be resolved first" >&2
226-
echo "$desc $res $ref $date1 $date2 $spec"
235+
echo "$desc $res $ref $date1 $date2 $spec $i"
227236
else
228-
echo "$desc $res $ref $date1 $date2 yes"
237+
echo "$desc $res $ref $date1 $date2 yes $i"
229238
fi
230239
done < $ISSUES >$TMP
231240
)

0 commit comments

Comments
 (0)