Skip to content

Commit

Permalink
Contribs rename (#993)
Browse files Browse the repository at this point in the history
Moving files to new location
And update code systems and language translations
  • Loading branch information
aethelwulffe authored and Tony McCormick committed Feb 8, 2018
1 parent d2919cf commit 9ffe562
Show file tree
Hide file tree
Showing 39 changed files with 22 additions and 296 deletions.
29 changes: 0 additions & 29 deletions contrib/util/undelete_from_log/README.TXT

This file was deleted.

243 changes: 0 additions & 243 deletions contrib/util/undelete_from_log/convert_logcomments.pl

This file was deleted.

9 changes: 4 additions & 5 deletions interface/code_systems/dataloads_ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@
<script type="text/javascript" src="../../library/js/jquery-ui-1.8.21.custom.min.js"></script>
<script>

// placemaker for when support DSMIV
// var db_list = [ "DSMIV", "ICD10", "RXNORM", "SNOMED"];

var db_list = [ "ICD10", "RXNORM", "SNOMED"];
var accOpts = {
header: "h3",
Expand Down Expand Up @@ -102,23 +101,23 @@ function() {
);
$("#" + $(ui.newContent).attr('id') + "_unsupportedmsg").hover(
function() {
$(this).append('<div class="tooltip"><p><?php echo xla("LibreEHR does not recognize the incoming file in the contrib directory. This is most likely because you need to configure the release in the supported_external_dataloads table in the MySQL database."); ?></p></div>');
$(this).append('<div class="tooltip"><p><?php echo xla("LibreEHR does not recognize the incoming file in the modules/medical_code_sets directory. This is most likely because you need to configure the release in the supported_external_dataloads table in the MySQL database."); ?></p></div>');
},
function() {
$("div.tooltip").remove();
}
);
$("#" + $(ui.newContent).attr('id') + "_dirmsg").hover(
function() {
$(this).append('<div class="tooltip"><p><?php echo xla("Please create the following directory before proceeding"); ?>' + ': contrib/' + $(ui.newContent).attr('id').toLowerCase() + '</p></div>');
$(this).append('<div class="tooltip"><p><?php echo xla("Please create the following directory before proceeding"); ?>' + ': modules/medical_code_sets/' + $(ui.newContent).attr('id').toLowerCase() + '</p></div>');
},
function() {
$("div.tooltip").remove();
}
);
$("#" + $(ui.newContent).attr('id') + "_msg").hover(
function() {
$(this).append('<div class="tooltip"><p><?php echo xla("Please place your install files in following directory"); ?>' + ': contrib/' + $(ui.newContent).attr('id').toLowerCase() + '</p></div>');
$(this).append('<div class="tooltip"><p><?php echo xla("Please place your install files in following directory"); ?>' + ': modules/medical_code_sets/' + $(ui.newContent).attr('id').toLowerCase() + '</p></div>');
},
function() {
$("div.tooltip").remove();
Expand Down
2 changes: 1 addition & 1 deletion interface/code_systems/icd10_howto.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<?php echo xlt("Steps to install the ICD 10 database"); ?>:
<ol>
<li><?php echo xlt("The raw data feed release can be obtained from"); ?> <b><a href="https://www.cms.gov/Medicare/Coding/ICD10"><?php echo xlt("this location"); ?></a></b>
<li><?php echo xlt("Place the downloaded ICD 10 database zip files into the following directory"); ?>: contrib/icd10
<li><?php echo xlt("Place the downloaded ICD 10 database zip files into the following directory"); ?>: modules/medical_code_sets/icd10
</li>
<li><?php echo xlt("Return to this page and you will be able to complete the ICD10 installation process by clicking on the ICD10 section header"); ?>
</li>
Expand Down
2 changes: 1 addition & 1 deletion interface/code_systems/list_staged.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}

$db = isset($_GET['db']) ? $_GET['db'] : '0';
$mainPATH = $GLOBALS['fileroot']."/contrib/".strtolower($db);
$mainPATH = $GLOBALS['fileroot']."/modules/medical_code_sets/".strtolower($db);
$file_checksum = "";

//
Expand Down
2 changes: 1 addition & 1 deletion interface/code_systems/rxnorm_howto.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ol>
<li><?php echo xlt("The first step is to open an account with the Unified Medical Language System web site"); ?> <b><a href="https://utslogin.nlm.nih.gov/cas/login"><?php echo xlt("here"); ?></a></b></li>
<li><?php echo xlt("Then the raw data feed release can be obtained from"); ?> <b><a href="http://www.nlm.nih.gov/research/umls/rxnorm/docs/rxnormfiles.html"><?php echo xlt("this location"); ?></a></b>
<li><?php echo xlt("Place the downloaded RxNorm database zip file into the following directory"); ?>: contrib/rxnorm.
<li><?php echo xlt("Place the downloaded RxNorm database zip file into the following directory"); ?>: modules/medical_code_sets/rxnorm.
</li>
<li><?php echo xlt("Return to this page and you will be able to complete the RxNorm installation process by clicking on the RXNORM section header"); ?>
</li>
Expand Down
4 changes: 2 additions & 2 deletions interface/code_systems/snomed_howto.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
<li><?php echo xlt("The first step is to download the SNOMED CT release. Access to SNOMED CT is provided by IHTSDO and their member countries. For more information see") .
" <a href='http://www.ihtsdo.org/snomed-ct/get-snomed-ct'>http://www.ihtsdo.org/snomed-ct/get-snomed-ct</a>."; ?>
</li>
<li><?php echo xlt("Place the downloaded Snomed database zip file into the following directory"); ?>: contrib/snomed
<li><?php echo xlt("Place the downloaded Snomed database zip file into the following directory"); ?>: modules/medical_code_sets/snomed
</li>
<li><?php echo xlt("Return to this page and you will be able to complete the Snomed installation process by clicking on the SNOMED section header"); ?>
</li>
</ol>
<h5 class="error_msg"><?php echo xlt("NOTE: Only the Biannual International Snomed Release is currently supported"); ?></h5>
<h5 class="error_msg"><?php echo xlt("The following International Snomed Release languages are supported"); ?>: <?php echo xlt("English"); ?>, <?php echo xlt("Spanish"); ?></h5>
<h5 class="error_msg"><?php echo "(" . xlt("Additionally, the corresponding US Snomed Extension Package can be imported separately after installing the International (English version) Snomed Release") . ")"; ?></h5>
<h5 class="error_msg"><?php echo xlt("WARNING: If you are using the 2012-10-31 Spanish version, then note you need to unzip it once before placing it in the contrib/snomed (this is because the released file was \"double-zipped\")."); ?></h5>
<h5 class="error_msg"><?php echo xlt("WARNING: If you are using the 2012-10-31 Spanish version, then note you need to unzip it once before placing it in the modules/medical_code_sets/snomed (this is because the released file was \"double-zipped\")."); ?></h5>
</p>
</div>
2 changes: 1 addition & 1 deletion interface/code_systems/standard_tables_manage.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
$file_revision_date = isset($_GET['file_revision_date']) ? $_GET['file_revision_date'] : '0';
$file_checksum = isset($_GET['file_checksum']) ? $_GET['file_checksum'] : '0';
$newInstall = isset($_GET['newInstall']) ? $_GET['newInstall'] : '0';
$mainPATH = $GLOBALS['fileroot']."/contrib/".strtolower($db);
$mainPATH = $GLOBALS['fileroot']."/modules/medical_code_sets/".strtolower($db);

$files_array = scandir($mainPATH);
array_shift($files_array); // get rid of "."
Expand Down
3 changes: 1 addition & 2 deletions interface/fax/fax_dispatch.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ function mergeTiffs() {
}

if (!$info_msg) {
// The following is cloned from contrib/forms/scanned_notes/new.php:
//
// scanned notes must be installed, and does not natively exist.
$query = "INSERT INTO form_scanned_notes ( " .
"notes " .
") VALUES ( " .
Expand Down
4 changes: 1 addition & 3 deletions library/classes/Installer.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ class Installer
public function __construct( $cgi_variables )
{
// Installation variables
// For a good explanation of these variables, see documentation in
// the contrib/util/installScripts/InstallerAuto.php file.
$this->iuser = $cgi_variables['iuser'];
$this->iuserpass = $cgi_variables['iuserpass'];
$this->iuname = $cgi_variables['iuname'];
Expand Down Expand Up @@ -40,7 +38,7 @@ public function __construct( $cgi_variables )

// Record names of sql table files
$this->main_sql = dirname(__FILE__) . '/../../sql/database.sql';
$this->translation_sql = dirname(__FILE__) . '/../../contrib/util/language_translations/currentLanguage_utf8.sql';
$this->translation_sql = dirname(__FILE__) . '/../../modules/language_translations/currentLanguage_utf8.sql';
$this->devel_translation_sql = "http://opensourceemr.com/cvs/languageTranslations_utf8.sql";
$this->ippf_sql = dirname(__FILE__) . "/../../sql/ippf_layout.sql";
$this->icd9 = dirname(__FILE__) . "/../../sql/icd9.sql";
Expand Down
Loading

0 comments on commit 9ffe562

Please sign in to comment.