Merge pull request #686 from coral-erm/sirsidynix

ERM-93 Fix to view archive for file import
coral-erm · Jul 15, 2021 · c388297 · c388297
2 parents 7d5a118 + a856bf8
commit c388297
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/usage/uploadComplete.php b/usage/uploadComplete.php
@@ -888,16 +888,16 @@ function sumCounts($counts, $year) {
 include 'templates/header.php';
 
 //Log import in database
-if ($importLogID != ""){
+if ($fromSushi){
 	$importLog = new ImportLog(new NamedArguments(array('primaryKey' => $importLogID)));
 	$importLog->fileName = $importLog->fileName;
 	$importLog->archiveFileURL = $importLog->fileName;
 	$importLog->details = $importLog->details . "\n" . $rownumber . _(" rows processed.") . $logSummary;
 	$archvieFileName = $importLog->fileName;
 }else{
   // copy the uploaded file to the archive
-  $archvieFileName = 'archive/' . $fileInfo['filename'] . '_' .strtotime('now') . '.' . $fileInfo['extension'];
-  copy($file, BASE_DIR . $archvieFileName);
+  $archvieFileName = 'archive/' . $fileInfo['filename'] . '_' .strtotime('now') . '.txt';
+  copy(BASE_DIR . 'counterstore/' . $fileInfo['filename'], BASE_DIR . $archvieFileName);
 	$importLog = new ImportLog();
 	$importLog->importLogID = '';
 	$importLog->fileName = $fileInfo['basename'];