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

Update android distribution

This commit is contained in:
James Agnew 2015-11-06 18:53:54 -05:00
parent 6fd5aecec7
commit 65c4250ed3
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/src/main/java/example/GenericClientExample.java
View File

@ -96,7 +96,7 @@ public class GenericClientExample {
.where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001"))
.execute();
// This will return true if the server responded with an HTTP 201 created,
// This will return Boolean.TRUE if the server responded with an HTTP 201 created,
// otherwise it will return null.
Boolean created = outcome.getCreated();

3
hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
View File

@ -16,9 +16,10 @@
<directory>${project.basedir}/../hapi-fhir-android/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>hapi-fhir-android-${project.version}.jar</include>
<include>hapi-fhir-android-${project.version}-dstu.jar</include>
<include>hapi-fhir-android-${project.version}-dstu-sources.jar</include>
<include>hapi-fhir-android-${project.version}-dstu2.jar</include>
<include>hapi-fhir-android-${project.version}-dstu2-sources.jar</include>
</includes>
</fileSet>
</fileSets>

5
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSearchDao.java
View File

@ -237,9 +237,6 @@ public class FhirSearchDao extends BaseHapiFhirDao<IBaseResource> implements ISe
Set<String> terms = Sets.newHashSet();
for (Iterator<Suggestion> iter = suggestions.iterator(); iter.hasNext(); ) {
String nextTerm = iter.next().getTerm().toLowerCase();
// if (nextTerm.contains("\n")) {
// iter.remove();
// } else
if (!terms.add(nextTerm)) {
iter.remove();
}
@ -311,7 +308,7 @@ public class FhirSearchDao extends BaseHapiFhirDao<IBaseResource> implements ISe
@Override
public String highlightTerm(String theOriginalText, TokenGroup theTokenGroup) {
ourLog.info("{} Found {} with score {}", new Object[] {myAnalyzer, theOriginalText, theTokenGroup.getTotalScore()});
ourLog.debug("{} Found {} with score {}", new Object[] {myAnalyzer, theOriginalText, theTokenGroup.getTotalScore()});
if (theTokenGroup.getTotalScore() > 0) {
float score = theTokenGroup.getTotalScore();
if (theOriginalText.equalsIgnoreCase(myOriginalSearch)) {

20
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ReindexFailureException.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.util;
/*
* #%L
* HAPI FHIR JPA Server
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
public class ReindexFailureException extends RuntimeException {
private static final long serialVersionUID = 1L;

2
src/site/xdoc/doc_rest_client.xml
View File

@ -285,7 +285,7 @@
FHIR specification for more information on conditional creation.
</p>
<macro name="snippet">
<param name="id" value="updateConditional"/>
<param name="id" value="createConditional"/>
<param name="file"
value="examples/src/main/java/example/GenericClientExample.java"/>
</macro>