diff --git a/.gitignore b/.gitignore index f573067b..ee700d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,9 @@ fsh-generated www # macos -.DS_Store \ No newline at end of file +.DS_Store +/_genonce.sh +/_updatePublisher.sh +/_gencontinuous.bat +/_gencontinuous.sh +/_genonce.bat diff --git a/README.md b/README.md index b690d0f2..6148ee8c 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ Advanced work on converting mCSD to an IG build. This is NOT normative or approv Currently conformance resources have been created, but no text has been migrated. Mobile Care Services Discovery -* https://profiles.ihe.net/ITI/ -* https://www.ihe.net/uploadedFiles/Documents/ITI/IHE_ITI_Suppl_mCSD.pdf +* https://profiles.ihe.net/ITI/mCSD +* historic https://www.ihe.net/uploadedFiles/Documents/ITI/IHE_ITI_Suppl_mCSD.pdf * continuous build https://build.fhir.org/ig/IHE/ITI.mCSD/branches/main/ diff --git a/_gencontinuous.bat b/_gencontinuous.bat deleted file mode 100644 index ca2867a5..00000000 --- a/_gencontinuous.bat +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -CALL ./_genonce.bat -watch \ No newline at end of file diff --git a/_gencontinuous.sh b/_gencontinuous.sh deleted file mode 100644 index b9ac5933..00000000 --- a/_gencontinuous.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./_genonce.sh -watch diff --git a/_genonce.bat b/_genonce.bat deleted file mode 100644 index a9864ef1..00000000 --- a/_genonce.bat +++ /dev/null @@ -1,27 +0,0 @@ -@ECHO OFF -SET publisher_jar=publisher.jar -SET input_cache_path=%CD%\input-cache - -ECHO Checking internet connection... -PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline -ECHO We're offline... -SET txoption=-tx n/a -GOTO igpublish - -:isonline -ECHO We're online -SET txoption= - -:igpublish - -SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 - -IF EXIST "%input_cache_path%\%publisher_jar%" ( - JAVA -jar "%input_cache_path%\%publisher_jar%" -ig . %txoption% %* -) ELSE If exist "..\%publisher_jar%" ( - JAVA -jar "..\%publisher_jar%" -ig . %txoption% %* -) ELSE ( - ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting... -) - -PAUSE diff --git a/_genonce.sh b/_genonce.sh deleted file mode 100755 index 38efcb44..00000000 --- a/_genonce.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -publisher_jar=publisher.jar -input_cache_path=./input-cache/ -echo Checking internet connection... -curl -sSf tx.fhir.org > /dev/null - -if [ $? -eq 0 ]; then - echo "Online" - txoption="" -else - echo "Offline" - txoption="-tx n/a" -fi - -echo "$txoption" - -publisher=$input_cache_path/$publisher_jar -if test -f "$publisher"; then - java -jar $publisher -ig . $txoption $* - -else - publisher=../$publisher_jar - if test -f "$publisher"; then - java -jar $publisher -ig . $txoption $* - else - echo IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting... - fi -fi diff --git a/_updatePublisher.sh b/_updatePublisher.sh deleted file mode 100755 index f127f661..00000000 --- a/_updatePublisher.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -pubsource=https://github.com/HL7/fhir-ig-publisher/releases/latest/download/ -publisher_jar=publisher.jar -dlurl=$pubsource$publisher_jar - -input_cache_path=$PWD/input-cache/ - -scriptdlroot=https://raw.githubusercontent.com/HL7/ig-publisher-scripts/main -update_bat_url=$scriptdlroot/_updatePublisher.bat -gen_bat_url=$scriptdlroot/_genonce.bat -gencont_bat_url=$scriptdlroot/_gencontinuous.bat -gencont_sh_url=$scriptdlroot/_gencontinuous.sh -gen_sh_url=$scriptdlroot/_genonce.sh -update_sh_url=$scriptdlroot/_updatePublisher.sh - -skipPrompts=false -FORCE=false - -if ! type "curl" > /dev/null; then - echo "ERROR: Script needs curl to download latest IG Publisher. Please install curl." - exit 1 -fi - -while [ "$#" -gt 0 ]; do - case $1 in - -f|--force) FORCE=true ;; - -y|--yes) skipPrompts=true ; FORCE=true ;; - *) echo "Unknown parameter passed: $1. Exiting"; exit 1 ;; - esac - shift -done - -echo "Checking internet connection" -curl -sSf tx.fhir.org > /dev/null - -if [ $? -ne 0 ] ; then - echo "Offline (or the terminology server is down), unable to update. Exiting" - exit 1 -fi - -if [ ! -d "$input_cache_path" ] ; then - if [ $FORCE != true ]; then - echo "$input_cache_path does not exist" - message="create it?" - read -r -p "$message" response - else - response=y - fi -fi - -if [[ $response =~ ^[yY].*$ ]] ; then - mkdir ./input-cache -fi - -publisher="$input_cache_path$publisher_jar" - -if test -f "$publisher" ; then - echo "IG Publisher FOUND in input-cache" - jarlocation="$publisher" - jarlocationname="Input Cache" - upgrade=true -else - publisher="../$publisher_jar" - upgrade=true - if test -f "$publisher"; then - echo "IG Publisher FOUND in parent folder" - jarlocation="$publisher" - jarlocationname="Parent Folder" - upgrade=true - else - echo "IG Publisher NOT FOUND in input-cache or parent folder" - jarlocation=$input_cache_path$publisher_jar - jarlocationname="Input Cache" - upgrade=false - fi -fi - -if [[ $skipPrompts == false ]]; then - - if [[ $upgrade == true ]]; then - message="Overwrite $jarlocation? (Y/N) " - else - echo Will place publisher jar here: "$jarlocation" - message="Ok (enter 'y' or 'Y' to continue, any other key to cancel)?" - fi - read -r -p "$message" response -else - response=y -fi -if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then - - echo "Downloading most recent publisher to $jarlocationname - it's ~100 MB, so this may take a bit" - curl -L $dlurl -o "$jarlocation" --create-dirs -else - echo cancelled publisher update -fi - -if [[ $skipPrompts != true ]]; then - message="Update scripts? (enter 'y' or 'Y' to continue, any other key to cancel)?" - read -r -p "$message" response - fi - -if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then - echo "Downloading most recent scripts " - - curl -L $update_bat_url -o /tmp/_updatePublisher.new - cp /tmp/_updatePublisher.new _updatePublisher.bat - rm /tmp/_updatePublisher.new - - curl -L $gen_bat_url -o /tmp/_genonce.new - cp /tmp/_genonce.new _genonce.bat - rm /tmp/_genonce.new - - curl -L $gencont_bat_url -o /tmp/_gencontinuous.new - cp /tmp/_gencontinuous.new _gencontinuous.bat - rm /tmp/_gencontinuous.new - - curl -L $gencont_sh_url -o /tmp/_gencontinuous.new - cp /tmp/_gencontinuous.new _gencontinuous.sh - rm /tmp/_gencontinuous.new - - curl -L $gen_sh_url -o /tmp/_genonce.new - cp /tmp/_genonce.new _genonce.sh - rm /tmp/_genonce.new - - curl -L $update_sh_url -o /tmp/_updatePublisher.new - cp /tmp/_updatePublisher.new _updatePublisher.sh - rm /tmp/_updatePublisher.new -fi diff --git a/ig.ini b/ig.ini index 1995516b..e9ae069c 100644 --- a/ig.ini +++ b/ig.ini @@ -1,4 +1,4 @@ [IG] ig = fsh-generated\resources\ImplementationGuide-ihe.iti.mcsd.json template = #ihe-template-no-numbers -usage-stats-opt-out = false + diff --git a/package-list.json b/package-list.json index 5acc31a0..6dadd6fc 100644 --- a/package-list.json +++ b/package-list.json @@ -1,7 +1,7 @@ { "package-id" : "ihe.iti.mcsd", "title" : "IHE ITI Mobile Care Services Discovery", - "canonical" : "http://profiles.ihe.net/ITI/mCSD", + "canonical" : "https://profiles.ihe.net/ITI/mCSD", "introduction" : "## The IHE Mobile Care Services Discovery (mCSD)\r\nThis IG provides a transaction for mobile and lightweight browser-based applications to find and update care services resources.", "category": "Administration", "list" : [{ @@ -12,20 +12,20 @@ "current" : true }, { - "version" : "3.4.1", - "date" : "2022-01-12", - "desc" : "Public Comment - Converted to IG publisher", - "path" : "http://profiles.ihe.net/ITI/mCSD/3.4.0", - "status" : "ballot", + "version" : "3.5.0", + "date" : "2022-03-01", + "desc" : "Normative release for Trial Implementation - Converted to IG publisher and google analytics", + "path" : "https://profiles.ihe.net/ITI/mCSD/3.5.0", + "status" : "trial-use", "fhirversion": "4.0.1", - "sequence" : "Public-Comment", + "sequence" : "Trial Implementation", "current": true }, { "version" : "3.4.0", "date" : "2022-01-12", "desc" : "Public Comment - Converted to IG publisher", - "path" : "http://profiles.ihe.net/ITI/mCSD/3.4.0", + "path" : "https://profiles.ihe.net/ITI/mCSD/3.4.0", "status" : "ballot", "fhirversion": "4.0.1", "sequence" : "Public-Comment", @@ -35,7 +35,7 @@ "version" : "3.3.0", "date" : "2021-07-02", "desc" : "Last PDF Trial Implementation", - "path" : "https://www.ihe.net/uploadedFiles/Documents/ITI/IHE_ITI_Suppl_mCSD.pdf", + "path" : "https://www.ihe.net/uploadedFiles/Documents/ITI/IHE_ITI_Suppl_mCSD_Rev3-3_TI_2021-07-02.pdf", "status" : "trial-use", "fhirversion" : "4.0.1", "sequence" : "Trial Implementation", diff --git a/publish.ini b/publish.ini deleted file mode 100644 index e99c9839..00000000 --- a/publish.ini +++ /dev/null @@ -1,10 +0,0 @@ -[website] -style=fhir.layout -server=apache -url=http://profiles.ihe.net/ITI/mCSD -org=IHE -no-registry=1 - -[feeds] -package=package-feed.xml -publication=publication-feed.xml \ No newline at end of file diff --git a/sushi-config.yaml b/sushi-config.yaml index f3553048..1dc59266 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -1,10 +1,11 @@ id: ihe.iti.mcsd -canonical: http://profiles.ihe.net/ITI/mCSD -version: 3.4.1 -name: IHE_mCSD +canonical: https://profiles.ihe.net/ITI/mCSD +version: 3.5.0 +name: IHE_ITI_mCSD title: "Mobile Care Services Discovery (mCSD)" -releaseLabel: ci-build -#date: 2022-01-12 +#releaseLabel: ci-build +releaseLabel: Trial-Implementation +date: 2022-03-01 status: active publisher: - name: IHE IT Infrastructure Technical Committee