www/server/staging/proprietary/rec propr-gen

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 18/09/17 15:43:36

Modified files:
        server/staging/proprietary/rec: propr-gen 

Log message:
        Tag <li> with Id.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/rec/propr-gen?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: propr-gen
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/rec/propr-gen,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- propr-gen   16 Sep 2018 19:04:32 -0000      1.3
+++ propr-gen   17 Sep 2018 19:43:36 -0000      1.4
@@ -10,11 +10,12 @@
 # Convert the blurbs to HTML.
 function rec2html () {
   sed -i -e '1i<ul>' \
+         -e 's,Id:,  <li,' \
+         -e 's,<li *-\([0-9]\{9\}\),<li id="M\1">,' \
          -e 's,^$, </li>\n,' \
-         -e 's,^Blurb:, <li>,' \
-         -e 's,<li>[ \t]*<p[ \t]\+\(id="[^"]\+"\)>,<li \1>\n  <p>,' \
+         -e 's,^Blurb:[ \t]*,,' \
          -e 's,^+[ \t]*,,' \
-         -e 's,[ \t]*<p>,  <p>,' \
+         -e 's,[ \t]*<p,    <p,' \
          -e 's,<dl>,  <dl>,' \
          -e 's,<dt>,   <dt>,' \
          -e 's,<dd>,    <dd>,' \
@@ -53,7 +54,7 @@
     for key2 in $keys2; do
       # extract blurbs corresponding to key1 and key2,
       expr="Section ~ '$key2'"
-      recsel --print=Blurb -e "$expr" temp.rec > temp
+      recsel -p Id,Blurb -e "$expr" temp.rec > temp
       # convert to HTML, and
       rec2html
       # insert the list in the page stub.
@@ -62,7 +63,7 @@
 
   # Otherwise, extract blurbs corresponding to key1, and process them.
   else
-    recsel --print=Blurb temp.rec > temp
+    recsel -p Id,Blurb temp.rec > temp
     rec2html
     sed -i "/<!-- INSERT $key1.list -->/r temp" $key1.html 
   fi
@@ -75,7 +76,7 @@
 # List the recently added items on proprietary.html
 key1=recent
 cp proprietary-stub.html ../proprietary.html
-recsel -p Blurb -e "Added > 20180900" propr-blurbs.rec > temp
+recsel -p Id,Blurb -e "Added > 20180900" propr-blurbs.rec > temp
 rec2html
 sed -i "/<!-- INSERT latest.list -->/r temp" ../proprietary.html
 sed -i 's/<!-- INSERT .*\.list -->//' ../proprietary.html