Unverified Commit 2e699eb8 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

ensure vx.y is not mistaken with vx.<ext>

parent 5b69bc4b

src/main/java/fr/mines_stetienne/ci/saref/managers/SiteManager.java

+4 −4
Original line number Diff line number Diff line
@@ -251,8 +251,8 @@ public class SiteManager extends SAREFErrorLogger { 
						String.format("RewriteRule ^%s/v%s$ %%1%s/ [R=302]\n", project.getPath(), major, lastCompatibleVersion.getVersionName()));

				// redirects core/v3.ttl to core/v1.1.1.ttl

				writer.write(HTACCESS_PATH);

				writer.write(String.format("RewriteRule ^%s/v%s\\.([^\\./]+)$ %%1%s/%s.$1 [R=302]\n\n", project.getPath(), major,

					lastCompatibleVersion.getVersionPath(), project.getOntologyFileName()));

				writer.write(String.format("RewriteRule ^%s/v%s\\.([a-z][^\\./]*)$ %%1%s.$1 [R=302]\n\n", project.getPath(), major,

					project.getOntologyFileName()));

			}

			int minor = versionName.getMinor();

			SAREFVersionName partialVersionNameMinor = new SAREFVersionName(major, minor, Integer.MAX_VALUE);
@@ -265,8 +265,8 @@ public class SiteManager extends SAREFErrorLogger { 
						String.format("RewriteRule ^%s/v%s.%s$ %%1%s/ [R=302]\n", project.getPath(), major, minor, lastCompatibleVersion.getVersionName()));

				// redirects core/v3.1.ttl to core/v1.1.1.ttl

				writer.write(HTACCESS_PATH);

				writer.write(String.format("RewriteRule ^%s/v%s.%s\\.([^\\./]+)$ %%1%s/%s.$1 [R=302]\n\n", project.getPath(), major, minor,

					lastCompatibleVersion.getVersionPath(), project.getOntologyFileName()));

				writer.write(String.format("RewriteRule ^%s/v%s.%s\\.([a-z][^\\./]*)$ %%1%s.$1 [R=302]\n\n", project.getPath(), major, minor,

					project.getOntologyFileName()));

			}

		}

		for (SAREFVersion version : repository.getVersions().values()) {