honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix return url

This commit is contained in:
petervanhoute 2015-10-29 15:55:37 +01:00
parent a262bf64d0
commit 367163c46a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java
View File

@ -62,6 +62,10 @@ public abstract class RequestDetails {
return myCompleteUrl;
}
/**
* The fhir server base url, independant of the query being executed
* @return the fhir server base url
*/
public String getFhirServerBase() {
return myFhirServerBase;
}

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
View File

@ -657,7 +657,7 @@ public class RestfulServerUtils {
}
static Integer tryToExtractNamedParameter(RequestDetails theRequest, String name) {
public static Integer tryToExtractNamedParameter(RequestDetails theRequest, String name) {
String[] countString = theRequest.getParameters().get(name);
Integer count = null;
if (countString != null && countString.length > 0 && isNotBlank(countString[0])) {

1
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java
View File

@ -382,6 +382,7 @@ public class Dstu2BundleFactory implements IVersionSpecificBundleFactory {
addRootPropertiesToBundle(null, theServerBase, theCompleteUrl, theResult.size(), theBundleType, theResult.getPublished());
if (theServer.getPagingProvider() != null) {
theServerBase = theCompleteUrl.contains("?") ? theCompleteUrl.substring(0, theCompleteUrl.indexOf("?")) : theCompleteUrl;
int limit;
limit = theLimit != null ? theLimit : theServer.getPagingProvider().getDefaultPageSize();
limit = Math.min(limit, theServer.getPagingProvider().getMaximumPageSize());