bootstrap: TP urls changed

[Sergey Poznyakoff]

Hello,

The get_translations function in bootstrap stopped working after the TP
had changed its URLs. The enclosed patch fixes this.

OK to install?

Regards,
Sergey

2007-06-28  Sergey Poznyakoff  <address@hidden>

        * build-aux/bootstrap: Reflect the change of the TP URL:
        (tp_url): New function.
        (get_translations): Do not depend on hardcoded TP_PO_URL value.
        

Index: build-aux/bootstrap
===================================================================
RCS file: /cvsroot/gnulib/gnulib/build-aux/bootstrap,v
retrieving revision 1.8
diff -p -u -r1.8 bootstrap
--- build-aux/bootstrap 20 Jun 2007 11:56:14 -0000      1.8
+++ build-aux/bootstrap 28 Jun 2007 17:25:50 -0000
@@ -69,8 +69,9 @@ gnulib_files=
 
 # Translation Project URL, for the registry of all projects
 # and for the translation-team master directory.
-TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain='
-TP_PO_URL='http://www.iro.umontreal.ca/translation/teams/PO/'
+tp_url() {
+       echo "http://translationproject.org/domain/$1.html";
+}
 
 extract_package_name='
   /^AC_INIT(/{
@@ -244,29 +245,32 @@ get_translations() {
   '')
     echo "$0: wget not available; skipping translations";;
   ?*)
+    url=`tp_url $domain`
+    baseurl=`expr "$url" : '\(.*\)/.*'`
     echo "$0: getting translations into $subdir for $domain..." &&
 
     (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
-    $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" &&
+    $WGET_COMMAND -O "$subdir/$domain.html" "$url" &&
 
-    sed -n 
's|.*"http://[^"]*/translation/teams/PO/\([^/"]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\1.\2|p'
 <"$subdir/$domain.html" |
-    sort -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
-    awk -F. '
-      { if (lang && $1 != lang) print lang, ver }
-      { lang = $1; ver = substr($0, index($0, ".") + 1) }
-      END { if (lang) print lang, ver }
-    ' | awk -v domain="$domain" -v subdir="$subdir" '
+    sed -n 
's|.*href="\(.*\)/\([^/][^/]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\2:\3:\1|p'
 <"$subdir/$domain.html" |
+    sort -t: -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
+    awk -F: '
+      { if (lang && $1 != lang) print lang, ver, $3 }
+      { lang = $1; ver = $2 }
+      END { if (lang) print lang, ver, $3 }
+    ' | awk -v domain="$domain" -v baseurl="$baseurl" -v subdir="$subdir" '
       {
        lang = $1
        ver = $2
        urlfmt = ""
-       printf "{ $WGET_COMMAND -O %s/%s.po '\'"$TP_PO_URL"'/%s/%s-%s.%s.po'\'' 
&&\n", subdir, lang, lang, domain, ver, lang
+       printf "{ $WGET_COMMAND -O %s/%s.po %s/%s/%s/%s-%s.%s.po &&\n", subdir, 
lang, baseurl, $3, lang, domain, ver, lang
        printf "  msgfmt -c -o /dev/null %s/%s.po || {\n", subdir, lang
        printf "    echo >&2 '\'"$0"': omitting translation for %s'\''\n", lang
        printf "    rm -f %s/%s.po; }; } &&\n", subdir, lang
       }
       END { print ":" }
-    ' | WGET_COMMAND="$WGET_COMMAND" sh;;
+    ' | WGET_COMMAND="$WGET_COMMAND" sh 
+    ;;
   esac &&
   ls "$subdir"/*.po 2>/dev/null |
     sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&