diff --git a/workflow/qhtcp-workflow b/workflow/qhtcp-workflow index 6bc80f0d..8f6d47d7 100755 --- a/workflow/qhtcp-workflow +++ b/workflow/qhtcp-workflow @@ -1307,24 +1307,24 @@ qhtcp() { # Replacing ExpFrontend.m - choose_easy_results_dir + # choose_easy_results_dir - # Create studies archive file if missing - if ! [[ -d $STUDIES_ARCHIVE_FILE ]]; then - header=(StudyDate tStudyName StudyPath ExpNum ExpDate ExpPath ResultFile) - printf "%s\t" "${header[@]}" > "$STUDIES_ARCHIVE_FILE" - fi - # TODO Add them all to StudiesDataArchive? - # Probably better to always add and remove dupes later since each invocation "counts"? - for f in "${EASY_RESULTS_FILES[@]}"; do - for s in "${STUDIES_NUMS[@]}"; do - # Trying to match old ExpFrontend formatting - printf "%s\t" \ - "${DATE//_/}" "$PROJECT_NAME" "$QHTCP_PROJECT_DIR" "Exp$s" \ - "$PROJECT_DATE" "$PROJECT_SCANS_DIR" "$EASY_RESULTS_DIR" "${f##*/}" \ - >> "$STUDIES_ARCHIVE_FILE" - done - done + # # Create studies archive file if missing + # if ! [[ -d $STUDIES_ARCHIVE_FILE ]]; then + # header=(StudyDate tStudyName StudyPath ExpNum ExpDate ExpPath ResultFile) + # printf "%s\t" "${header[@]}" > "$STUDIES_ARCHIVE_FILE" + # fi + # # TODO Add them all to StudiesDataArchive? + # # Probably better to always add and remove dupes later since each invocation "counts"? + # for f in "${EASY_RESULTS_FILES[@]}"; do + # for s in "${STUDIES_NUMS[@]}"; do + # # Trying to match old ExpFrontend formatting + # printf "%s\t" \ + # "${DATE//_/}" "$PROJECT_NAME" "$QHTCP_PROJECT_DIR" "Exp$s" \ + # "$PROJECT_DATE" "$PROJECT_SCANS_DIR" "$EASY_RESULTS_DIR" "${f##*/}" \ + # >> "$STUDIES_ARCHIVE_FILE" + # done + # done # Run R interactions script on all studies for s in "${STUDIES_NUMS[@]}"; do @@ -1998,13 +1998,12 @@ get_studies() { if ! ((YES)); then for ((i=1; i<2; i++)); do cat <<-EOF - "Next entry suggestion: $next_study_entry" + Next entry suggestion: "$next_study_entry" - "Would you like to: + Would you like to: * (a)dd the suggested entry * (e)dit the StudyInfo.csv file manually in nano * (c)ontinue?" - EOF read -r -p "(c): " response echo ""