litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1229 Add revisionInfo steps to the build files. Tweak the response parser in the utility.

Browse source
This commit is contained in:
jeb228 2010-10-22 15:13:06 +00:00
parent 8263bd9cf1
commit fe5a4f12cd
3 changed files with 88 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java
View file

@ -87,7 +87,7 @@ public class InfoResponseParser {
}
private boolean isTrunkPath() {
return path.equals(TRUNK_PREFIX);
return path.startsWith(TRUNK_PREFIX);
}
private boolean isTagPath() {
@ -95,7 +95,7 @@ public class InfoResponseParser {
}
private String getTagName() {
return path.substring(TAGS_PREFIX.length());
return getFirstLevel(discardPrefix(path, TAGS_PREFIX));
}
private boolean isBranchPath() {
@ -103,7 +103,24 @@ public class InfoResponseParser {
}
private String getBranchName() {
return path.substring(BRANCHES_PREFIX.length());
return getFirstLevel(discardPrefix(path, BRANCHES_PREFIX));
}
private String discardPrefix(String string, String prefix) {
if (string.length() < prefix.length()) {
return "";
} else {
return string.substring(prefix.length());
}
}
private String getFirstLevel(String string) {
int slashHere = string.indexOf('/');
if (slashHere == -1) {
return string;
} else {
return string.substring(0, slashHere);
}
}
}