Skip to content

Commit

Permalink
Fixes to get things working for the 2.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesagnew committed Jun 11, 2017
1 parent 5807cb5 commit 056d260
Show file tree
Hide file tree
Showing 152 changed files with 3,925 additions and 287 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
hapi-db/
target/
bin/
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
87 changes: 87 additions & 0 deletions buildall.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/bin/bash

set -o xtrace
set -e

mvn -P ALLMODULES,ACCESS clean

cd hapi-base
mvn -P ALLMODULES,ACCESS clean install
cd ..

cd hapi-sourcegen
mvn -P ALLMODULES,ACCESS clean install
cd ..

cd hapi-structures-v21
mvn -P ALLMODULES,ACCESS clean install
cd ..

cd hapi-structures-v22
mvn -P ALLMODULES,ACCESS clean install
cd ..

cd hapi-structures-v23
mvn -P ALLMODULES,ACCESS clean install
cd ..

cd hapi-structures-v231
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
cd ..

cd hapi-structures-v24
pwd
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
pwd
cd ..

cd hapi-structures-v25
pwd
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
pwd
cd ..

cd hapi-structures-v251
pwd
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
pwd
cd ..

cd hapi-structures-v26
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
cd ..

cd hapi-structures-v27
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
cd ..

#cd hapi-structures-v271
#set +e
#mvn -P ALLMODULES,ACCESS clean install
#set -e
#cd ..

cd hapi-structures-v28
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
cd ..

cd hapi-structures-v281
set +e
mvn -P ALLMODULES,ACCESS clean install
set -e
cd ..

2 changes: 1 addition & 1 deletion hapi-base/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
4 changes: 4 additions & 0 deletions hapi-base/.settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
62 changes: 62 additions & 0 deletions hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DT.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/**
* The contents of this file are subject to the Mozilla Public License Version 1.1
* (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.mozilla.org/MPL/
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
* specific language governing rights and limitations under the License.
*
* The Original Code is "DT.java". Description:
* "Note: The class description below has been excerpted from the Hl7 2.4 documentation"
*
* The Initial Developer of the Original Code is University Health Network. Copyright (C)
* 2001. All Rights Reserved.
*
* Contributor(s): ______________________________________.
*
* Alternatively, the contents of this file may be used under the terms of the
* GNU General Public License (the �GPL�), in which case the provisions of the GPL are
* applicable instead of those above. If you wish to allow use of your version of this
* file only under the terms of the GPL and not to allow others to use your version
* of this file under the MPL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by the GPL License.
* If you do not delete the provisions above, a recipient may use your version of
* this file under either the MPL or the GPL.
*
*/

package ca.uhn.hl7v2.model.v27.datatype;

import ca.uhn.hl7v2.model.Message;

/**
*
* Note: The class description below has been excerpted from the Hl7 2.4 documentation. Sectional
* references made below also refer to the same documentation.
*
* Format: YYYY[MM[DD]]
* In prior versions of HL7, this data type was always specified to be in the format YYYYMMDD. In the current and future
* versions, the precision of a date may be expressed by limiting the number of digits used with the format specification
* YYYY[MM[DD]]. Thus, YYYY is used to specify a precision of "year," YYYYMM specifies a precision of "month,"
* and YYYYMMDD specifies a precision of "day."
* By site-specific agreement, YYYYMMDD may be used where backward compatibility must be maintained.
* Examples: |19880704| |199503|
* @author Neal Acharya
*/

public class DT extends ca.uhn.hl7v2.model.primitive.DT {

/**
* @param theMessage message to which this Type belongs
*/
public DT(Message theMessage) {
super(theMessage);
}

/**
* @return "2.7"
*/
public String getVersion() {
return "2.7";
}
}
95 changes: 95 additions & 0 deletions hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DTM.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/**
* The contents of this file are subject to the Mozilla Public License Version 1.1
* (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.mozilla.org/MPL/
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
* specific language governing rights and limitations under the License.
*
* The Original Code is "DTM.java". Description:
*
*
* The Initial Developer of the Original Code is University Health Network. Copyright (C)
* 2001. All Rights Reserved.
*
* Contributor(s): ______________________________________.
*
* Alternatively, the contents of this file may be used under the terms of the
* GNU General Public License (the �GPL�), in which case the provisions of the GPL are
* applicable instead of those above. If you wish to allow use of your version of this
* file only under the terms of the GPL and not to allow others to use your version
* of this file under the MPL, indicate your decision by deleting the provisions above
* and replace them with the notice and other provisions required by the GPL License.
* If you do not delete the provisions above, a recipient may use your version of
* this file under either the MPL or the GPL.
*
*/

package ca.uhn.hl7v2.model.v27.datatype;

import ca.uhn.hl7v2.model.Message;

/**
* Note: The class description below has been excerpted from the Hl7 2.4 documentation. Sectional
* references made below also refer to the same documentation.
*
* Format: YYYY[MM[DD[HHMM[SS[.S[S[S[S]]]]]]]][+/-ZZZZ]^<degree of precision>
* Contains the exact time of an event, including the date and time. The date portion of a time stamp follows the rules of a
* date field and the time portion follows the rules of a time field. The time zone (+/-ZZZZ) is represented as +/-HHMM
* offset from UTC (formerly Greenwich Mean Time (GMT)), where +0000 or -0000 both represent UTC (without offset).
* The specific data representations used in the HL7 encoding rules are compatible with ISO 8824-1987(E).
* In prior versions of HL7, an optional second component indicates the degree of precision of the time stamp (Y = year, L
* = month, D = day, H = hour, M = minute, S = second). This optional second component is retained only for purposes of
* backward compatibility.
* By site-specific agreement, YYYYMMDD[HHMM[SS[.S[S[S[S]]]]]][+/-ZZZZ]^<degree of precision> may be used
* where backward compatibility must be maintained.
* In the current and future versions of HL7, the precision is indicated by limiting the number of digits used, unless the
* optional second component is present. Thus, YYYY is used to specify a precision of "year," YYYYMM specifies a
* precision of "month," YYYYMMDD specifies a precision of "day," YYYYMMDDHH is used to specify a precision of
* "hour," YYYYMMDDHHMM is used to specify a precision of "minute," YYYYMMDDHHMMSS is used to specify a
* precision of seconds, and YYYYMMDDHHMMSS.SSSS is used to specify a precision of ten thousandths of a second.
* In each of these cases, the time zone is an optional component. Note that if the time zone is not included, the timezone
* defaults to that of the local time zone of the sender. Also note that a TS valued field with the HHMM part set to "0000"
* represents midnight of the night extending from the previous day to the day given by the YYYYMMDD part (see example
* below). Maximum length of the time stamp is 26. Examples:
* |19760704010159-0500|
* 1:01:59 on July 4, 1976 in the Eastern Standard Time zone (USA).
* |19760704010159-0400|
* 1:01:59 on July 4, 1976 in the Eastern Daylight Saving Time zone (USA).
* |198807050000|
* Midnight of the night extending from July 4 to July 5, 1988 in the local time zone of the sender.
* |19880705|
* Same as prior example, but precision extends only to the day. Could be used for a birthdate, if the time of birth is
* unknown.
* |19981004010159+0100|
* 1:01:59 on October 4, 1998 in Amsterdam, NL. (Time zone=+0100).
* The HL7 Standard strongly recommends that all systems routinely send the time zone offset but does not require it. All
* HL7 systems are required to accept the time zone offset, but its implementation is application specific. For many
* applications the time of interest is the local time of the sender. For example, an application in the Eastern Standard Time
* zone receiving notification of an admission that takes place at 11:00 PM in San Francisco on December 11 would prefer
* to treat the admission as having occurred on December 11 rather than advancing the date to December 12.
* Note: The time zone [+/-ZZZZ], when used, is restricted to legally-defined time zones and is represented in HHMM
* format.
* One exception to this rule would be a clinical system that processed patient data collected in a clinic and a nearby hospital
* that happens to be in a different time zone. Such applications may choose to convert the data to a common
* representation. Similar concerns apply to the transitions to and from daylight saving time. HL7 supports such requirements
* by requiring that the time zone information be present when the information is sent. It does not, however, specify which of
* the treatments discussed here will be applied by the receiving system.
* @author Neal Acharya
*/
public class DTM extends ca.uhn.hl7v2.model.primitive.TSComponentOne {

/**
* @param theMessage message to which this Type belongs
*/
public DTM(Message theMessage) {
super(theMessage);
}

/**
* @return "2.7"
*/
public String getVersion() {
return "2.7";
}
}
83 changes: 83 additions & 0 deletions hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/ID.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/**
The contents of this file are subject to the Mozilla Public License Version 1.1
(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.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
specific language governing rights and limitations under the License.
The Original Code is "ID.java". Description:
"Note: The class description below has been excerpted from the Hl7 2.4 documentation"
The Initial Developer of the Original Code is University Health Network. Copyright (C)
2001. All Rights Reserved.
Contributor(s): ______________________________________.
Alternatively, the contents of this file may be used under the terms of the
GNU General Public License (the �GPL�), in which case the provisions of the GPL are
applicable instead of those above. If you wish to allow use of your version of this
file only under the terms of the GPL and not to allow others to use your version
of this file under the MPL, indicate your decision by deleting the provisions above
and replace them with the notice and other provisions required by the GPL License.
If you do not delete the provisions above, a recipient may use your version of
this file under either the MPL or the GPL.
*/

package ca.uhn.hl7v2.model.v27.datatype;

import ca.uhn.hl7v2.model.Message;

/**
*
*
* Note: The class description below has been excerpted from the Hl7 2.4 documentation.
* Sectional references made below also refer to the same documentation.
*
* The value of such a field follows the formatting rules for an ST field except
* that it is drawn from a table of legal values. There shall be an HL7 table number
* associated with ID data types. An example of an ID field is OBR-25-result status.
* This data type should be used only for HL7 tables (see Section 2.7.6, "Table").
* The reverse is not true, since in some circumstances it is more appropriate to use
* the CE data type for HL7 tables.
*
* Note: validation of the input string value will only be initiated if the
* corresponding HL7 tableid has been set. Basically if the object is created
* without a tableid and the table id is not subsequently set, then then the input string value
* will be subjected to a length check (<= 200 chars) and then stored into the object.
* @author Neal Acharya
*/

public class ID extends ca.uhn.hl7v2.model.primitive.ID {

/**
* @param theMessage message to which this Type belongs
*/
public ID(Message theMessage) {
super(theMessage);
}

/**
* @param theMessage message to which this Type belongs
* @param theTable HL7 table from which values are to be drawn
*/
public ID(Message theMessage, int theTable) {
super(theMessage, theTable);
}

/**
* @param theMessage message to which this Type belongs
* @param theTable HL7 table from which values are to be drawn
*/
public ID(Message theMessage, Integer theTable) {
super(theMessage, theTable);
}

/**
* @return "2.7"
*/
public String getVersion() {
return "2.7";
}
}
Loading

0 comments on commit 056d260

Please sign in to comment.