Mercurial > SimpleWebPresenter

changeset 131:6b882fb6ea46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not add '/' at end if we have encoded all params.
author Tom Fredrik Blenning <bfg@bfgconsult.no>
date Sat, 21 Jan 2023 16:43:41 +0100
parents ee5f98a0bc93
children 51b53cd01080
files Sitemap.inc common-functions.inc
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Sitemap.inc	Fri Jan 13 18:08:45 2023 +0100
+++ b/Sitemap.inc	Sat Jan 21 16:43:41 2023 +0100
@@ -101,7 +101,7 @@
 	      }
 
 	      $optstring = genUrl($opts, array(), array('lang', 'name'));
-	      $location = "${baseurl}${optstring}/";
+	      $location = "${baseurl}${optstring}";
 	      array_push($urls, $location);
 	    }
 	  }
--- a/common-functions.inc	Fri Jan 13 18:08:45 2023 +0100
+++ b/common-functions.inc	Sat Jan 21 16:43:41 2023 +0100
@@ -127,14 +127,19 @@
     $new_params[$param] = $val;
   }
 
+  $numEncParams=0;
   foreach($nonQueryParams as $nqp) {
     if (array_key_exists($nqp, $new_params)) {
+      ++$numEncParams;
       $val = $new_params[$nqp];
       if ($val)
 	$out .= "/${val}";
       unset($new_params[$nqp]);
     }
   }
+  if ($numEncParams<count($nonQueryParams)) {
+	$out .= '/';
+  }
 
   foreach($new_params as $param => $val) {
     if ($val) {